Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/spreed.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/css
diff options
context:
space:
mode:
authorDaniel Calviño Sánchez <danxuliu@gmail.com>2019-12-19 12:31:19 +0300
committerGitHub <noreply@github.com>2019-12-19 12:31:19 +0300
commit60fbec336522c0245188a0008ff774deef036a96 (patch)
tree60bd7439abb6510fa4da9db637ba1fedf12fd925 /css
parent4c528b0cd81a7ecc33230165ace7eaa2d8c4ceec (diff)
parentca03cff331ea759368e8ec2d44b35bb4bffdbeac (diff)
Merge pull request #2597 from nextcloud/unify-new-loadsidebarlistener-with-previous-templateloader
Unify new LoadSidebarListener with previous TemplateLoader
Diffstat (limited to 'css')
-rw-r--r--css/merged-files.scss6
-rw-r--r--css/merged-public-share.scss5
-rw-r--r--css/merged-share-auth.scss7
3 files changed, 3 insertions, 15 deletions
diff --git a/css/merged-files.scss b/css/merged-files.scss
index 1bff9a606..04a24cced 100644
--- a/css/merged-files.scss
+++ b/css/merged-files.scss
@@ -1,5 +1 @@
-@import 'files.scss';
-@import 'chatview.scss';
-@import 'autocomplete.scss';
-@import 'video.scss';
-@import 'icons.scss'; \ No newline at end of file
+@import 'icons.scss';
diff --git a/css/merged-public-share.scss b/css/merged-public-share.scss
index 4b1d62a9b..04a24cced 100644
--- a/css/merged-public-share.scss
+++ b/css/merged-public-share.scss
@@ -1,4 +1 @@
-@import 'chatview.scss';
-@import 'autocomplete.scss';
-@import 'video.scss';
-@import 'publicshare.scss';
+@import 'icons.scss';
diff --git a/css/merged-share-auth.scss b/css/merged-share-auth.scss
index b7acb420d..04a24cced 100644
--- a/css/merged-share-auth.scss
+++ b/css/merged-share-auth.scss
@@ -1,6 +1 @@
-@import 'publicshareauth.scss';
-@import 'style.scss';
-@import 'chatview.scss';
-@import 'autocomplete.scss';
-@import 'video.scss';
-@import 'icons.scss'; \ No newline at end of file
+@import 'icons.scss';