Download as
Browse Code »

Commit 52fbcd45a4df8e93b04791fe25ff39c58f524bfa

Authored by Dmitriy Zaporozhets
1 parent c0160d00
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Better organization of styles

Showing 3 changed files with 38 additions and 128 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap.scss 0 → 100644
  Diff comments   View file @52fbcd4
@@ -0,0 +1,26 @@ @@ -0,0 +1,26 @@
  1 +/** Override bootstrap variables **/
  2 +$baseFontSize: 13px !default;
  3 +$baseLineHeight: 18px !default;
  4 +
  5 +// BOOTSTRAP
  6 +@import "bootstrap";
  7 +@import "bootstrap/responsive-utilities";
  8 +@import "bootstrap/responsive-1200px-min";
  9 +
  10 +@import "font-awesome";
  11 +@import "variables.scss";
  12 +@import "fonts.scss";
  13 +@import "mixins.scss";
  14 +
  15 +/**
  16 + * GitLab bootstrap.
  17 + * Overrides some styles of twitter bootstrap.
  18 + * Also give some common classes for GitLab app
  19 + */
  20 +@import "gitlab_bootstrap/common.scss";
  21 +@import "gitlab_bootstrap/typography.scss";
  22 +@import "gitlab_bootstrap/buttons.scss";
  23 +@import "gitlab_bootstrap/blocks.scss";
  24 +@import "gitlab_bootstrap/files.scss";
  25 +@import "gitlab_bootstrap/tables.scss";
  26 +@import "gitlab_bootstrap/lists.scss";
app/assets/stylesheets/main.scss
  Diff comments   View file @52fbcd4
1 -/** Override bootstrap variables **/  
2 -$baseFontSize: 13px !default;  
3 -$baseLineHeight: 18px !default;  
4 -  
5 -// BOOTSTRAP  
6 -@import "bootstrap";  
7 -@import "bootstrap/responsive-utilities";  
8 -@import "bootstrap/responsive-1200px-min";  
9 -  
10 -// FONT AWESOME  
11 -@import "font-awesome";  
12 -  
13 /** 1 /**
14 - * Variables  
15 - * Contains colors 2 + * GitLab bootstrap:
16 */ 3 */
17 -@import "variables.scss"; 4 +@import "gitlab_bootstrap.scss";
18 5
19 -/**  
20 - * Custom fonts  
21 - * Contains @font-face font Korolev and default $monotype  
22 - */  
23 -@import "fonts.scss";  
24 -  
25 -/**  
26 - * General mixins.  
27 - * Contains rounded borders, gradients and shades  
28 - */  
29 -@import "mixins.scss"; 6 +@import "common.scss";
  7 +@import "ref_select.scss";
30 8
31 -/**  
32 - * Header of application.  
33 - * Contain application logo, search panel, profile icon  
34 - */  
35 @import "sections/header.scss"; 9 @import "sections/header.scss";
36 -  
37 -/**  
38 - * Navigation menu of application.  
39 - * Panel with links to pages depends on project, profile or admin area  
40 - */  
41 @import "sections/nav.scss"; 10 @import "sections/nav.scss";
42 -  
43 -/**  
44 - * This file represent some UI that can be changed  
45 - * during web app restyle or theme select.  
46 - *  
47 - * Next items should be placed there  
48 - * - link, button colors  
49 - * - header restyles  
50 - * - main menu restyles  
51 - *  
52 - */  
53 -@import "themes/ui_basic.scss";  
54 -  
55 -/**  
56 - * UI themes:  
57 - */  
58 -@import "themes/ui_mars.scss";  
59 -@import "themes/ui_modern.scss";  
60 -@import "themes/ui_gray.scss";  
61 -@import "themes/ui_color.scss";  
62 -  
63 -/**  
64 - * GitLab bootstrap.  
65 - * Overrides some styles of twitter bootstrap.  
66 - * Also give some common classes for GitLab app  
67 - */  
68 -@import "gitlab_bootstrap/common.scss";  
69 -@import "gitlab_bootstrap/typography.scss";  
70 -@import "gitlab_bootstrap/buttons.scss";  
71 -@import "gitlab_bootstrap/blocks.scss";  
72 -@import "gitlab_bootstrap/files.scss";  
73 -@import "gitlab_bootstrap/tables.scss";  
74 -@import "gitlab_bootstrap/lists.scss";  
75 -  
76 -  
77 -/**  
78 - * Most of application styles placed here.  
79 - * This file represent common UI that should not be changed between themes  
80 - * or project restyling like form width or user avatar class or commit title  
81 - *  
82 - * TODO: clean it  
83 - */  
84 -@import "common.scss";  
85 -  
86 -/**  
87 - * Styles related to specific part of app  
88 - */  
89 @import "sections/commits.scss"; 11 @import "sections/commits.scss";
90 @import "sections/issues.scss"; 12 @import "sections/issues.scss";
91 @import "sections/projects.scss"; 13 @import "sections/projects.scss";
@@ -95,47 +17,21 @@ $baseLineHeight: 18px !default; @@ -95,47 +17,21 @@ $baseLineHeight: 18px !default;
95 @import "sections/graph.scss"; 17 @import "sections/graph.scss";
96 @import "sections/events.scss"; 18 @import "sections/events.scss";
97 @import "sections/themes.scss"; 19 @import "sections/themes.scss";
98 -  
99 -/**  
100 - * This scss file redefine chozen selectbox styles for  
101 - * project Branch/Tag select element  
102 - */  
103 -@import "ref_select.scss";  
104 -  
105 -/**  
106 - * Code (files list) styles. Browsing project files there  
107 - */  
108 @import "sections/tree.scss"; 20 @import "sections/tree.scss";
109 -  
110 -/**  
111 - * This file represent notes(comments) styles  
112 - */  
113 @import "sections/notes.scss"; 21 @import "sections/notes.scss";
114 -  
115 -/**  
116 - * This file represent profile styles  
117 - */  
118 @import "sections/profile.scss"; 22 @import "sections/profile.scss";
119 -  
120 -/**  
121 - * Devise styles  
122 - */  
123 @import "sections/login.scss"; 23 @import "sections/login.scss";
  24 +@import "sections/editor.scss";
124 25
125 -/**  
126 - * CODE HIGHTLIGHT BASE  
127 - *  
128 - */  
129 @import "highlight/white.scss"; 26 @import "highlight/white.scss";
130 -  
131 -/**  
132 - * CODE HIGHTLIGHT DARK schema  
133 - *  
134 - */  
135 @import "highlight/dark.scss"; 27 @import "highlight/dark.scss";
136 28
137 /** 29 /**
138 - * File Editor styles  
139 - * 30 + * UI themes:
140 */ 31 */
141 -@import "sections/editor.scss"; 32 +@import "themes/ui_basic.scss";
  33 +@import "themes/ui_mars.scss";
  34 +@import "themes/ui_modern.scss";
  35 +@import "themes/ui_gray.scss";
  36 +@import "themes/ui_color.scss";
  37 +
app/assets/stylesheets/themes/ui_basic.scss
  Diff comments   View file @52fbcd4
@@ -4,18 +4,6 @@ @@ -4,18 +4,6 @@
4 * 4 *
5 */ 5 */
6 .ui_basic { 6 .ui_basic {
7 - /*  
8 - * Common styles  
9 - *  
10 - */  
11 - a {  
12 - color: $link_color;  
13 - &:hover {  
14 - text-decoration: none;  
15 - color: $primary_color;  
16 - }  
17 - }  
18 -  
19 .app_logo { 7 .app_logo {
20 .separator { 8 .separator {
21 margin-left: 0; 9 margin-left: 0;