Download as
Browse Code »

Commit da41efcfa5df54469805fa7bf1e178d5f8330bd0

Authored by Dmitriy Zaporozhets
1 parent fccd70c9
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

refactor scss pt2 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 5 changed files with 88 additions and 83 deletions   Show diff stats
app/assets/stylesheets/application.scss
  Diff comments   View file @da41efc
... ... @@ -28,33 +28,17 @@ $font-size-base: 13px !default;
28 28 */
29 29 @import "generic.scss";
30 30  
31   -
32   -
33 31 @import "common.scss";
34   -@import "selects.scss";
35 32  
36   -@import "sections/header.scss";
37   -@import "sections/nav.scss";
38   -@import "sections/commits.scss";
39   -@import "sections/issues.scss";
40   -@import "sections/projects.scss";
41   -@import "sections/snippets.scss";
42   -@import "sections/votes.scss";
43   -@import "sections/merge_requests.scss";
44   -@import "sections/graph.scss";
45   -@import "sections/events.scss";
46   -@import "sections/themes.scss";
47   -@import "sections/tree.scss";
48   -@import "sections/notes.scss";
49   -@import "sections/profile.scss";
50   -@import "sections/login.scss";
51   -@import "sections/editor.scss";
52   -@import "sections/admin.scss";
53   -@import "sections/wiki.scss";
54   -@import "sections/wall.scss";
55   -@import "sections/dashboard.scss";
56   -@import "sections/stat_graph.scss";
57 33  
  34 +/**
  35 + * Page specific styles (issues, projects etc):
  36 + */
  37 +@import "sections.scss";
  38 +
  39 +/**
  40 + * Code ighlight
  41 + */
58 42 @import "highlight/white.scss";
59 43 @import "highlight/dark.scss";
60 44 @import "highlight/solarized_dark.scss";
... ... @@ -73,4 +57,3 @@ $font-size-base: 13px !default;
73 57 * Styles for JS behaviors.
74 58 */
75 59 @import "behaviors.scss";
76   -
... ...
app/assets/stylesheets/generic.scss
  Diff comments   View file @da41efc
... ... @@ -12,3 +12,4 @@
12 12 @import "generic/files.scss";
13 13 @import "generic/lists.scss";
14 14 @import "generic/forms.scss";
  15 +@import "generic/selects.scss";
... ...
app/assets/stylesheets/generic/selects.scss 0 → 100644
  Diff comments   View file @da41efc
... ... @@ -0,0 +1,58 @@
  1 +/** Chosen.js selectbox style override **/
  2 +.chosen-container {
  3 + min-width: 100px;
  4 +
  5 + .chosen-single {
  6 + height: 26px;
  7 + background: #EEE !important;
  8 + border: 1px solid #DDD !important;
  9 + @include box-shadow(none !important);
  10 + @include border-radius(4px !important);
  11 + }
  12 +
  13 + .chosen-results li.highlighted {
  14 + background: #29b;
  15 + }
  16 +
  17 + .chosen-drop {
  18 + margin-top: 10px;
  19 + border: 1px solid #DDD !important;
  20 + @include border-radius(4px !important);
  21 + }
  22 +
  23 + .chosen-search input {
  24 + border: 1px solid #CCC !important;
  25 + @include box-shadow(none !important);
  26 + }
  27 +}
  28 +
  29 +/** Select2 styling **/
  30 +.select2-container .select2-choice {
  31 + @include bg-light-gray-gradient;
  32 +}
  33 +
  34 +.select2-container .select2-choice div {
  35 + border: none;
  36 + background: none;
  37 +}
  38 +
  39 +.select2-drop {
  40 + padding-top: 8px;
  41 +}
  42 +
  43 +.select2-no-results, .select2-searching {
  44 + padding: 7px;
  45 + color: #666;
  46 +}
  47 +
  48 +.chosen-container .chosen-single div b {
  49 + background-position-y: 0px !important;
  50 +}
  51 +
  52 +.chosen-container .chosen-drop .chosen-search input {
  53 + background-position-y: -24px !important;
  54 +}
  55 +
  56 +.chosen-compact {
  57 + max-width: 170px !important;
  58 +}
... ...
app/assets/stylesheets/sections.scss 0 → 100644
  Diff comments   View file @da41efc
... ... @@ -0,0 +1,21 @@
  1 +@import "sections/header.scss";
  2 +@import "sections/nav.scss";
  3 +@import "sections/commits.scss";
  4 +@import "sections/issues.scss";
  5 +@import "sections/projects.scss";
  6 +@import "sections/snippets.scss";
  7 +@import "sections/votes.scss";
  8 +@import "sections/merge_requests.scss";
  9 +@import "sections/graph.scss";
  10 +@import "sections/events.scss";
  11 +@import "sections/themes.scss";
  12 +@import "sections/tree.scss";
  13 +@import "sections/notes.scss";
  14 +@import "sections/profile.scss";
  15 +@import "sections/login.scss";
  16 +@import "sections/editor.scss";
  17 +@import "sections/admin.scss";
  18 +@import "sections/wiki.scss";
  19 +@import "sections/wall.scss";
  20 +@import "sections/dashboard.scss";
  21 +@import "sections/stat_graph.scss";
... ...
app/assets/stylesheets/selects.scss
View file @fccd70c
... ... @@ -1,58 +0,0 @@
1   -/** Chosen.js selectbox style override **/
2   -.chosen-container {
3   - min-width: 100px;
4   -
5   - .chosen-single {
6   - height: 26px;
7   - background: #EEE !important;
8   - border: 1px solid #DDD !important;
9   - @include box-shadow(none !important);
10   - @include border-radius(4px !important);
11   - }
12   -
13   - .chosen-results li.highlighted {
14   - background: #29b;
15   - }
16   -
17   - .chosen-drop {
18   - margin-top: 10px;
19   - border: 1px solid #DDD !important;
20   - @include border-radius(4px !important);
21   - }
22   -
23   - .chosen-search input {
24   - border: 1px solid #CCC !important;
25   - @include box-shadow(none !important);
26   - }
27   -}
28   -
29   -/** Select2 styling **/
30   -.select2-container .select2-choice {
31   - @include bg-light-gray-gradient;
32   -}
33   -
34   -.select2-container .select2-choice div {
35   - border: none;
36   - background: none;
37   -}
38   -
39   -.select2-drop {
40   - padding-top: 8px;
41   -}
42   -
43   -.select2-no-results, .select2-searching {
44   - padding: 7px;
45   - color: #666;
46   -}
47   -
48   -.chosen-container .chosen-single div b {
49   - background-position-y: 0px !important;
50   -}
51   -
52   -.chosen-container .chosen-drop .chosen-search input {
53   - background-position-y: -24px !important;
54   -}
55   -
56   -.chosen-compact {
57   - max-width: 170px !important;
58   -}