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

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteffen van Bergerem <svbergerem@online.de>2015-03-13 02:11:30 +0300
committerSteffen van Bergerem <svbergerem@online.de>2015-03-13 03:41:14 +0300
commit84a5992a42b159b091eafe1a5089cdd940282440 (patch)
tree4fe588334aa0deb18c331fa78fe6c9eae05f00e7 /app/assets/stylesheets/application.scss
parente6da51d9165f6636cca2229090d764b70e4c7df8 (diff)
Refactor css code, remove unused code
Diffstat (limited to 'app/assets/stylesheets/application.scss')
-rw-r--r--app/assets/stylesheets/application.scss15
1 files changed, 12 insertions, 3 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index e17d19d78..bf06babd6 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -5,16 +5,23 @@
@import "colors";
@import 'sizes';
@import 'mixins';
-@import 'new_styles/new_mixins';
/* core */
+@import 'media-box';
+@import 'autocomplete';
+@import 'entypo-fonts';
+@import 'entypo';
+@import 'mentions';
@import 'flash_messages';
@import 'sprites';
-
+@import 'hovercard';
@import 'new_styles/base';
@import 'new_styles/buttons';
@import 'new_styles/interactions';
@import 'new_styles/spinner';
+@import 'lightbox';
+@import 'vendor/fileuploader';
+@import 'vendor/autoSuggest';
/* font overrides */
@import 'new_styles/typography';
@@ -40,6 +47,7 @@
/* conversations */
@import 'conversations';
+@import 'vendor/facebox';
@import 'facebox';
/* publisher */
@@ -69,6 +77,7 @@
@import 'stream';
@import 'stream_element';
@import 'comments';
+@import 'diaspora_jsxc';
@import 'chat';
/* right bar */
@@ -82,4 +91,4 @@
@import 'new_styles/code';
/* statistics */
-@import 'new_styles/statistics'
+@import 'new_styles/statistics';