Browse Source
Merge pull request #275 from LN-Zap/fix/title-bar
fix(title-bar): new title bar
renovate/lint-staged-8.x
JimmyMow
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
12 additions and
1 deletions
-
app/main.dev.js
-
app/routes/app/components/App.js
-
app/routes/app/components/App.scss
-
app/variables.scss
|
|
@ -210,7 +210,7 @@ app.on('ready', async () => { |
|
|
|
console.log('icon: ', icon) |
|
|
|
mainWindow = new BrowserWindow({ |
|
|
|
show: false, |
|
|
|
frame: true, |
|
|
|
titleBarStyle: 'hidden', |
|
|
|
width: 700, |
|
|
|
height: 1100, |
|
|
|
minHeight: 700, |
|
|
|
|
|
@ -39,6 +39,7 @@ class App extends Component { |
|
|
|
|
|
|
|
return ( |
|
|
|
<div> |
|
|
|
<div className={styles.titleBar} /> |
|
|
|
<GlobalError error={error} clearError={clearError} /> |
|
|
|
<ModalRoot |
|
|
|
modalType={modalType} |
|
|
|
|
|
@ -1,3 +1,5 @@ |
|
|
|
@import '../../../variables.scss'; |
|
|
|
|
|
|
|
.content { |
|
|
|
position: relative; |
|
|
|
width: 85%; |
|
|
@ -6,3 +8,10 @@ |
|
|
|
vertical-align: top; |
|
|
|
overflow-y: scroll; |
|
|
|
} |
|
|
|
|
|
|
|
.titleBar { |
|
|
|
background: $spacegrey; |
|
|
|
height: 20px; |
|
|
|
-webkit-user-select: none; |
|
|
|
-webkit-app-region: drag; |
|
|
|
} |
|
|
@ -9,6 +9,7 @@ $lightgrey: #F7F7F7; |
|
|
|
$darkgrey: #EBEBEB; |
|
|
|
$darkestgrey: #999999; |
|
|
|
$bluegrey: #555459; |
|
|
|
$spacegrey: #222E2B; |
|
|
|
|
|
|
|
$green: #0bb634; |
|
|
|
$terminalgreen: #00FF00; |
|
|
|