diff options
author | 2021-08-13 00:45:01 +0530 | |
---|---|---|
committer | 2021-08-13 00:45:01 +0530 | |
commit | 2d27d5e66649d4f5baf127a53ee5ae524eae3a59 (patch) | |
tree | c592ea219ac8cd987fc367f57b54034c450ab2ab /src/styles/main.scss | |
parent | Ferdi v5.6.0 (diff) | |
parent | 5.6.1-nightly.24 [skip ci] (diff) | |
download | ferdium-app-2d27d5e66649d4f5baf127a53ee5ae524eae3a59.tar.gz ferdium-app-2d27d5e66649d4f5baf127a53ee5ae524eae3a59.tar.zst ferdium-app-2d27d5e66649d4f5baf127a53ee5ae524eae3a59.zip |
chore: merge from nightly branch into release branch in prep for next beta
Diffstat (limited to 'src/styles/main.scss')
-rw-r--r-- | src/styles/main.scss | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/styles/main.scss b/src/styles/main.scss index c57dc6fcd..b0815e086 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss | |||
@@ -1,9 +1,9 @@ | |||
1 | $mdi-font-path: '../node_modules/mdi/fonts'; | 1 | $mdi-font-path: '../node_modules/@mdi/font/fonts'; |
2 | @if $env == development { | 2 | @if $env == development { |
3 | $mdi-font-path: '../../node_modules/mdi/fonts'; | 3 | $mdi-font-path: '../../node_modules/@mdi/font/fonts'; |
4 | } | 4 | } |
5 | 5 | ||
6 | @import './node_modules/mdi/scss/materialdesignicons.scss'; | 6 | @import './node_modules/@mdi/font/scss/materialdesignicons.scss'; |
7 | @import './node_modules/electron-react-titlebar/assets/style'; | 7 | @import './node_modules/electron-react-titlebar/assets/style'; |
8 | 8 | ||
9 | // modules | 9 | // modules |
@@ -22,11 +22,8 @@ $mdi-font-path: '../node_modules/mdi/fonts'; | |||
22 | @import './tooltip.scss'; | 22 | @import './tooltip.scss'; |
23 | @import './info-bar.scss'; | 23 | @import './info-bar.scss'; |
24 | @import './status-bar-target-url.scss'; | 24 | @import './status-bar-target-url.scss'; |
25 | @import './animations.scss'; | ||
26 | @import './infobox.scss'; | 25 | @import './infobox.scss'; |
27 | @import './badge.scss'; | 26 | @import './badge.scss'; |
28 | @import './subscription.scss'; | ||
29 | @import './subscription-popup.scss'; | ||
30 | @import './content-tabs.scss'; | 27 | @import './content-tabs.scss'; |
31 | @import './invite.scss'; | 28 | @import './invite.scss'; |
32 | @import './title-bar.scss'; | 29 | @import './title-bar.scss'; |
@@ -40,4 +37,4 @@ $mdi-font-path: '../node_modules/mdi/fonts'; | |||
40 | @import './searchInput.scss'; | 37 | @import './searchInput.scss'; |
41 | @import './select.scss'; | 38 | @import './select.scss'; |
42 | @import './image-upload.scss'; | 39 | @import './image-upload.scss'; |
43 | @import './slider.scss'; \ No newline at end of file | 40 | @import './slider.scss'; |