diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-03-22 08:46:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-22 08:46:10 +0100 |
| commit | 16a0bccefa9d1252de61f816f96a0993857bb61b (patch) | |
| tree | 7832855ea1eb25bc6f4d04fc3e6efe7ee7ad908f /apps/files/css | |
| parent | c6c589647466b1e723af3a7cb0865b7186f06c45 (diff) | |
| parent | 1084cdb6135e90d48f511ee7d7141900bb769273 (diff) | |
| download | nextcloud-server-16a0bccefa9d1252de61f816f96a0993857bb61b.tar.gz nextcloud-server-16a0bccefa9d1252de61f816f96a0993857bb61b.zip | |
Merge pull request #3972 from nextcloud/merge-some-more-css
Merge some CSS files using our SCSS compiler
Diffstat (limited to 'apps/files/css')
| -rw-r--r-- | apps/files/css/detailsView.scss (renamed from apps/files/css/detailsView.css) | 0 | ||||
| -rw-r--r-- | apps/files/css/files.scss (renamed from apps/files/css/files.css) | 0 | ||||
| -rw-r--r-- | apps/files/css/merged.scss | 4 | ||||
| -rw-r--r-- | apps/files/css/mobile.scss (renamed from apps/files/css/mobile.css) | 0 | ||||
| -rw-r--r-- | apps/files/css/upload.scss (renamed from apps/files/css/upload.css) | 0 |
5 files changed, 4 insertions, 0 deletions
diff --git a/apps/files/css/detailsView.css b/apps/files/css/detailsView.scss index cab6a684042..cab6a684042 100644 --- a/apps/files/css/detailsView.css +++ b/apps/files/css/detailsView.scss diff --git a/apps/files/css/files.css b/apps/files/css/files.scss index 54ed05385fa..54ed05385fa 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.scss diff --git a/apps/files/css/merged.scss b/apps/files/css/merged.scss new file mode 100644 index 00000000000..d65bac512f1 --- /dev/null +++ b/apps/files/css/merged.scss @@ -0,0 +1,4 @@ +@import 'files.scss'; +@import 'upload.scss'; +@import 'mobile.scss'; +@import 'detailsView.scss'; diff --git a/apps/files/css/mobile.css b/apps/files/css/mobile.scss index 4a5abd2b73c..4a5abd2b73c 100644 --- a/apps/files/css/mobile.css +++ b/apps/files/css/mobile.scss diff --git a/apps/files/css/upload.css b/apps/files/css/upload.scss index 6f337a27578..6f337a27578 100644 --- a/apps/files/css/upload.css +++ b/apps/files/css/upload.scss |