diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index aa87ea7..2f732b2 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 0ebbbf2..4f77161 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/generic/selects.scss b/app/assets/stylesheets/generic/selects.scss new file mode 100644 index 0000000..8e63195 --- /dev/null +++ b/app/assets/stylesheets/generic/selects.scss @@ -0,0 +1,58 @@ +/** Chosen.js selectbox style override **/ +.chosen-container { + min-width: 100px; + + .chosen-single { + height: 26px; + background: #EEE !important; + border: 1px solid #DDD !important; + @include box-shadow(none !important); + @include border-radius(4px !important); + } + + .chosen-results li.highlighted { + background: #29b; + } + + .chosen-drop { + margin-top: 10px; + border: 1px solid #DDD !important; + @include border-radius(4px !important); + } + + .chosen-search input { + border: 1px solid #CCC !important; + @include box-shadow(none !important); + } +} + +/** Select2 styling **/ +.select2-container .select2-choice { + @include bg-light-gray-gradient; +} + +.select2-container .select2-choice div { + border: none; + background: none; +} + +.select2-drop { + padding-top: 8px; +} + +.select2-no-results, .select2-searching { + padding: 7px; + color: #666; +} + +.chosen-container .chosen-single div b { + background-position-y: 0px !important; +} + +.chosen-container .chosen-drop .chosen-search input { + background-position-y: -24px !important; +} + +.chosen-compact { + max-width: 170px !important; +} diff --git a/app/assets/stylesheets/sections.scss b/app/assets/stylesheets/sections.scss new file mode 100644 index 0000000..52bb449 --- /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"; diff --git a/app/assets/stylesheets/selects.scss b/app/assets/stylesheets/selects.scss deleted file mode 100644 index 8e63195..0000000 --- a/app/assets/stylesheets/selects.scss +++ /dev/null @@ -1,58 +0,0 @@ -/** Chosen.js selectbox style override **/ -.chosen-container { - min-width: 100px; - - .chosen-single { - height: 26px; - background: #EEE !important; - border: 1px solid #DDD !important; - @include box-shadow(none !important); - @include border-radius(4px !important); - } - - .chosen-results li.highlighted { - background: #29b; - } - - .chosen-drop { - margin-top: 10px; - border: 1px solid #DDD !important; - @include border-radius(4px !important); - } - - .chosen-search input { - border: 1px solid #CCC !important; - @include box-shadow(none !important); - } -} - -/** Select2 styling **/ -.select2-container .select2-choice { - @include bg-light-gray-gradient; -} - -.select2-container .select2-choice div { - border: none; - background: none; -} - -.select2-drop { - padding-top: 8px; -} - -.select2-no-results, .select2-searching { - padding: 7px; - color: #666; -} - -.chosen-container .chosen-single div b { - background-position-y: 0px !important; -} - -.chosen-container .chosen-drop .chosen-search input { - background-position-y: -24px !important; -} - -.chosen-compact { - max-width: 170px !important; -} -- libgit2 0.21.2