aboutsummaryrefslogtreecommitdiffstats
path: root/src/styles/main.scss
diff options
context:
space:
mode:
authorLibravatar haraldox <hnaumann+github@gmail.com>2018-02-20 16:10:00 +0100
committerLibravatar haraldox <hnaumann+github@gmail.com>2018-02-20 16:10:00 +0100
commit08536e7e0a8995c0a94c363f6c230ec422c4671b (patch)
treeb29658ba85e2ce868e1f04d960ba76affa3d3b17 /src/styles/main.scss
parentchoose platform with environment variable `FRANZ_PLATFORM` (diff)
downloadferdium-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/main.scss')
-rw-r--r--src/styles/main.scss2
1 files changed, 2 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';