From da41efcfa5df54469805fa7bf1e178d5f8330bd0 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 31 Dec 2013 14:42:32 +0200 Subject: [PATCH] refactor scss pt2 Signed-off-by: Dmitriy Zaporozhets --- app/assets/stylesheets/application.scss | 33 +++++-------------- app/assets/stylesheets/generic.scss | 1 + .../stylesheets/{ => generic}/selects.scss | 0 app/assets/stylesheets/sections.scss | 21 ++++++++++++ 4 files changed, 30 insertions(+), 25 deletions(-) rename app/assets/stylesheets/{ => generic}/selects.scss (100%) create mode 100644 app/assets/stylesheets/sections.scss diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index aa87ea7eca..2f732b2add 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -28,33 +28,17 @@ $font-size-base: 13px !default; */ @import "generic.scss"; - - @import "common.scss"; -@import "selects.scss"; -@import "sections/header.scss"; -@import "sections/nav.scss"; -@import "sections/commits.scss"; -@import "sections/issues.scss"; -@import "sections/projects.scss"; -@import "sections/snippets.scss"; -@import "sections/votes.scss"; -@import "sections/merge_requests.scss"; -@import "sections/graph.scss"; -@import "sections/events.scss"; -@import "sections/themes.scss"; -@import "sections/tree.scss"; -@import "sections/notes.scss"; -@import "sections/profile.scss"; -@import "sections/login.scss"; -@import "sections/editor.scss"; -@import "sections/admin.scss"; -@import "sections/wiki.scss"; -@import "sections/wall.scss"; -@import "sections/dashboard.scss"; -@import "sections/stat_graph.scss"; +/** + * Page specific styles (issues, projects etc): + */ +@import "sections.scss"; + +/** + * Code ighlight + */ @import "highlight/white.scss"; @import "highlight/dark.scss"; @import "highlight/solarized_dark.scss"; @@ -73,4 +57,3 @@ $font-size-base: 13px !default; * Styles for JS behaviors. */ @import "behaviors.scss"; - diff --git a/app/assets/stylesheets/generic.scss b/app/assets/stylesheets/generic.scss index 0ebbbf267c..4f7716113e 100644 --- a/app/assets/stylesheets/generic.scss +++ b/app/assets/stylesheets/generic.scss @@ -12,3 +12,4 @@ @import "generic/files.scss"; @import "generic/lists.scss"; @import "generic/forms.scss"; +@import "generic/selects.scss"; diff --git a/app/assets/stylesheets/selects.scss b/app/assets/stylesheets/generic/selects.scss similarity index 100% rename from app/assets/stylesheets/selects.scss rename to app/assets/stylesheets/generic/selects.scss diff --git a/app/assets/stylesheets/sections.scss b/app/assets/stylesheets/sections.scss new file mode 100644 index 0000000000..52bb449eb9 --- /dev/null +++ b/app/assets/stylesheets/sections.scss @@ -0,0 +1,21 @@ +@import "sections/header.scss"; +@import "sections/nav.scss"; +@import "sections/commits.scss"; +@import "sections/issues.scss"; +@import "sections/projects.scss"; +@import "sections/snippets.scss"; +@import "sections/votes.scss"; +@import "sections/merge_requests.scss"; +@import "sections/graph.scss"; +@import "sections/events.scss"; +@import "sections/themes.scss"; +@import "sections/tree.scss"; +@import "sections/notes.scss"; +@import "sections/profile.scss"; +@import "sections/login.scss"; +@import "sections/editor.scss"; +@import "sections/admin.scss"; +@import "sections/wiki.scss"; +@import "sections/wall.scss"; +@import "sections/dashboard.scss"; +@import "sections/stat_graph.scss";