diff options
author | haraldox <hnaumann+github@gmail.com> | 2018-02-20 16:10:00 +0100 |
---|---|---|
committer | haraldox <hnaumann+github@gmail.com> | 2018-02-20 16:10:00 +0100 |
commit | 08536e7e0a8995c0a94c363f6c230ec422c4671b (patch) | |
tree | b29658ba85e2ce868e1f04d960ba76affa3d3b17 /src/styles | |
parent | choose platform with environment variable `FRANZ_PLATFORM` (diff) | |
download | ferdium-app-08536e7e0a8995c0a94c363f6c230ec422c4671b.tar.gz ferdium-app-08536e7e0a8995c0a94c363f6c230ec422c4671b.tar.zst ferdium-app-08536e7e0a8995c0a94c363f6c230ec422c4671b.zip |
fix CSS conflicts
override `reset.scss` with `title-bar.scss`
Diffstat (limited to 'src/styles')
-rw-r--r-- | src/styles/main.scss | 2 | ||||
-rw-r--r-- | src/styles/title-bar.scss | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/styles/main.scss b/src/styles/main.scss index 446bdca14..388eb2f77 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss | |||
@@ -4,6 +4,7 @@ $mdi-font-path: '../node_modules/mdi/fonts'; | |||
4 | } | 4 | } |
5 | 5 | ||
6 | @import './node_modules/mdi/scss/materialdesignicons.scss'; | 6 | @import './node_modules/mdi/scss/materialdesignicons.scss'; |
7 | @import './node_modules/electron-react-titlebar/assets/style.scss'; | ||
7 | 8 | ||
8 | // modules | 9 | // modules |
9 | @import './reset.scss'; | 10 | @import './reset.scss'; |
@@ -28,6 +29,7 @@ $mdi-font-path: '../node_modules/mdi/fonts'; | |||
28 | @import './subscription-popup.scss'; | 29 | @import './subscription-popup.scss'; |
29 | @import './content-tabs.scss'; | 30 | @import './content-tabs.scss'; |
30 | @import './invite.scss'; | 31 | @import './invite.scss'; |
32 | @import './title-bar.scss'; | ||
31 | 33 | ||
32 | // form | 34 | // form |
33 | @import './input.scss'; | 35 | @import './input.scss'; |
diff --git a/src/styles/title-bar.scss b/src/styles/title-bar.scss new file mode 100644 index 000000000..67bf97008 --- /dev/null +++ b/src/styles/title-bar.scss | |||
@@ -0,0 +1,7 @@ | |||
1 | #electron-app-title-bar span { | ||
2 | line-height: normal; | ||
3 | } | ||
4 | |||
5 | #electron-app-title-bar div { | ||
6 | height: auto; | ||
7 | } | ||