diff options
author | Lukas Reschke <lukas@statuscode.ch> | 2017-03-09 23:25:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-09 23:25:17 +0100 |
commit | 6fd0e7e93995facfe75b26699ea462bb94fd03b9 (patch) | |
tree | 2584a8e55ceabcdc182df849d0c292041ab2c113 /core | |
parent | db5fc4d3cbff68055d338f91bef44572b6c44fa6 (diff) | |
parent | 0c22a6696703225baabd6a4afaad5759745da8c5 (diff) | |
download | nextcloud-server-6fd0e7e93995facfe75b26699ea462bb94fd03b9.tar.gz nextcloud-server-6fd0e7e93995facfe75b26699ea462bb94fd03b9.zip |
Merge pull request #3791 from nextcloud/combine_sass
Combine sass
Diffstat (limited to 'core')
-rw-r--r-- | core/css/fixes.scss (renamed from core/css/fixes.css) | 0 | ||||
-rw-r--r-- | core/css/fonts.scss (renamed from core/css/fonts.css) | 0 | ||||
-rw-r--r-- | core/css/global.scss (renamed from core/css/global.css) | 0 | ||||
-rw-r--r-- | core/css/mobile.scss (renamed from core/css/mobile.css) | 0 | ||||
-rw-r--r-- | core/css/server.scss | 11 |
5 files changed, 11 insertions, 0 deletions
diff --git a/core/css/fixes.css b/core/css/fixes.scss index 3cb89c6599f..3cb89c6599f 100644 --- a/core/css/fixes.css +++ b/core/css/fixes.scss diff --git a/core/css/fonts.css b/core/css/fonts.scss index f72aa2930cf..f72aa2930cf 100644 --- a/core/css/fonts.css +++ b/core/css/fonts.scss diff --git a/core/css/global.css b/core/css/global.scss index 9511d4324fa..9511d4324fa 100644 --- a/core/css/global.css +++ b/core/css/global.scss diff --git a/core/css/mobile.css b/core/css/mobile.scss index b0f8421345c..b0f8421345c 100644 --- a/core/css/mobile.css +++ b/core/css/mobile.scss diff --git a/core/css/server.scss b/core/css/server.scss new file mode 100644 index 00000000000..516220f2ad5 --- /dev/null +++ b/core/css/server.scss @@ -0,0 +1,11 @@ +@import 'styles.scss'; +@import 'inputs.scss'; +@import 'header.scss'; +@import 'icons.scss'; +@import 'fonts.scss'; +@import 'apps.scss'; +@import 'global.scss'; +@import 'fixes.scss'; +@import 'multiselect.scss'; +@import 'mobile.scss'; +@import 'tooltip.scss'; |