diff options
| author |  Stefan Malzner <stefan@adlk.io> | 2018-01-08 10:34:00 +0100 |
|---|---|---|
| committer | Stefan Malzner <stefan@adlk.io> | 2018-01-08 10:34:00 +0100 |
| commit | 91540e15eb2484a097587a38440b05897bb87638 (patch) | |
| tree | dba412401da044ba203fcacb56018bfd7ed193eb /src/styles/main.scss | |
| parent | Sort languages by name (diff) | |
| parent | Add color to service icons (diff) | |
| download | ferdium-app-91540e15eb2484a097587a38440b05897bb87638.tar.gz ferdium-app-91540e15eb2484a097587a38440b05897bb87638.tar.zst ferdium-app-91540e15eb2484a097587a38440b05897bb87638.zip | |
Merge branch 'develop' into i18n
# Conflicts:
# src/i18n/languages.js
Diffstat (limited to 'src/styles/main.scss')
| -rw-r--r-- | src/styles/main.scss | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/styles/main.scss b/src/styles/main.scss index 0a082729c..261396f6f 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss | |||
| @@ -35,3 +35,4 @@ $mdi-font-path: '../node_modules/mdi/fonts'; | |||
| 35 | @import './button.scss'; | 35 | @import './button.scss'; |
| 36 | @import './searchInput.scss'; | 36 | @import './searchInput.scss'; |
| 37 | @import './select.scss'; | 37 | @import './select.scss'; |
| 38 | @import './image-upload.scss'; | ||