Commit f1266765533105e94815829178869bddbc826901
1 parent
515ed775
Exists in
spb-stable
and in
3 other branches
Refactor scss
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
8 changed files
with
484 additions
and
495 deletions
Show diff stats
app/assets/stylesheets/application.scss
... | ... | @@ -12,6 +12,7 @@ |
12 | 12 | @import "main/variables.scss"; |
13 | 13 | @import "main/mixins.scss"; |
14 | 14 | @import "main/fonts.scss"; |
15 | +@import "main/layout.scss"; | |
15 | 16 | |
16 | 17 | /** |
17 | 18 | * Customized Twitter bootstrap |
... | ... | @@ -27,19 +28,42 @@ |
27 | 28 | /** |
28 | 29 | * Generic css (forms, nav etc): |
29 | 30 | */ |
30 | -@import "generic.scss"; | |
31 | - | |
32 | - | |
33 | -/** | |
34 | - * Unrefactored css | |
35 | - */ | |
36 | -@import "common.scss"; | |
37 | - | |
31 | +@import "generic/avatar.scss"; | |
32 | +@import "generic/common.scss"; | |
33 | +@import "generic/typography.scss"; | |
34 | +@import "generic/buttons.scss"; | |
35 | +@import "generic/blocks.scss"; | |
36 | +@import "generic/ui_box.scss"; | |
37 | +@import "generic/issue_box.scss"; | |
38 | +@import "generic/files.scss"; | |
39 | +@import "generic/lists.scss"; | |
40 | +@import "generic/forms.scss"; | |
41 | +@import "generic/selects.scss"; | |
38 | 42 | |
39 | 43 | /** |
40 | 44 | * Page specific styles (issues, projects etc): |
41 | 45 | */ |
42 | -@import "sections.scss"; | |
46 | +@import "sections/header.scss"; | |
47 | +@import "sections/nav.scss"; | |
48 | +@import "sections/commits.scss"; | |
49 | +@import "sections/issues.scss"; | |
50 | +@import "sections/projects.scss"; | |
51 | +@import "sections/snippets.scss"; | |
52 | +@import "sections/votes.scss"; | |
53 | +@import "sections/merge_requests.scss"; | |
54 | +@import "sections/graph.scss"; | |
55 | +@import "sections/events.scss"; | |
56 | +@import "sections/themes.scss"; | |
57 | +@import "sections/tree.scss"; | |
58 | +@import "sections/notes.scss"; | |
59 | +@import "sections/profile.scss"; | |
60 | +@import "sections/login.scss"; | |
61 | +@import "sections/editor.scss"; | |
62 | +@import "sections/admin.scss"; | |
63 | +@import "sections/wiki.scss"; | |
64 | +@import "sections/wall.scss"; | |
65 | +@import "sections/dashboard.scss"; | |
66 | +@import "sections/stat_graph.scss"; | |
43 | 67 | |
44 | 68 | /** |
45 | 69 | * Code ighlight | ... | ... |
app/assets/stylesheets/common.scss
... | ... | @@ -1,392 +0,0 @@ |
1 | -html { | |
2 | - overflow-y: scroll; | |
3 | -} | |
4 | - | |
5 | -/** LAYOUT **/ | |
6 | - | |
7 | -body { | |
8 | - -webkit-font-smoothing: antialiased; | |
9 | - -moz-osx-font-smoothing: grayscale; | |
10 | - margin-bottom: 20px; | |
11 | -} | |
12 | - | |
13 | -.container { | |
14 | - padding-top: 0; | |
15 | - z-index: 5; | |
16 | -} | |
17 | - | |
18 | -.container .content { | |
19 | - margin: 0 0; | |
20 | -} | |
21 | - | |
22 | -.author_link { | |
23 | - color: $link_color; | |
24 | -} | |
25 | - | |
26 | -.help li { color:$style_color; } | |
27 | - | |
28 | -.back-link { | |
29 | - font-size: 14px; | |
30 | -} | |
31 | - | |
32 | -table a code { | |
33 | - position: relative; | |
34 | - top: -2px; | |
35 | - margin-right: 3px; | |
36 | -} | |
37 | - | |
38 | -.loading { | |
39 | - margin: 20px auto; | |
40 | - background: url(ajax_loader.gif) no-repeat center center; | |
41 | - width: 40px; | |
42 | - height: 40px; | |
43 | - &.loading-gray { | |
44 | - background: url(ajax_loader_gray.gif) no-repeat center center; | |
45 | - } | |
46 | -} | |
47 | - | |
48 | -/** FLASH message **/ | |
49 | -.flash-container { | |
50 | - display: none; | |
51 | - cursor: pointer; | |
52 | - margin: 0; | |
53 | - text-align: center; | |
54 | - color: #fff; | |
55 | - font-size: 14px; | |
56 | - position: fixed; | |
57 | - bottom: 0; | |
58 | - width: 100%; | |
59 | - opacity: 0.8; | |
60 | - z-index: 100; | |
61 | - | |
62 | - .flash-notice { | |
63 | - background: #49C; | |
64 | - padding: 10px; | |
65 | - text-shadow: 0 1px 1px #178; | |
66 | - } | |
67 | - | |
68 | - .flash-alert { | |
69 | - background: #C67; | |
70 | - text-shadow: 0 1px 1px #945; | |
71 | - padding: 10px; | |
72 | - } | |
73 | -} | |
74 | - | |
75 | -span.update-author { | |
76 | - display: block; | |
77 | - color: #999; | |
78 | - font-weight: normal; | |
79 | - font-style: italic; | |
80 | - strong { | |
81 | - font-weight: bold; | |
82 | - font-style: normal; | |
83 | - } | |
84 | -} | |
85 | - | |
86 | -.user-mention { | |
87 | - color: #2FA0BB; | |
88 | - font-weight: bold; | |
89 | -} | |
90 | - | |
91 | -.field_with_errors { | |
92 | - display: inline; | |
93 | -} | |
94 | - | |
95 | -ul.breadcrumb { | |
96 | - background: white; | |
97 | - border: none; | |
98 | - li { | |
99 | - display: inline; | |
100 | - text-shadow: 0 1px 0 white | |
101 | - } | |
102 | - | |
103 | - a { | |
104 | - font-size: 16px; | |
105 | - } | |
106 | -} | |
107 | - | |
108 | -.line_holder { | |
109 | - &:hover { | |
110 | - td { | |
111 | - background: #FFFFCF !important; | |
112 | - } | |
113 | - } | |
114 | -} | |
115 | - | |
116 | -p.time { | |
117 | - color: #999; | |
118 | - font-size: 90%; | |
119 | - margin: 30px 3px 3px 2px; | |
120 | -} | |
121 | - | |
122 | -.highlight { | |
123 | - text-shadow: none; | |
124 | -} | |
125 | - | |
126 | -.highlight_word { | |
127 | - border-bottom: 2px solid #F90; | |
128 | -} | |
129 | - | |
130 | -.thin_area{ | |
131 | - height: 150px; | |
132 | -} | |
133 | - | |
134 | -// Fixes alignment on notes. | |
135 | -.new_note { | |
136 | - label { | |
137 | - text-align: left; | |
138 | - } | |
139 | -} | |
140 | - | |
141 | -// Fix issue with notes & lists creating a bunch of bottom borders. | |
142 | -li.note { | |
143 | - img { max-width:100% } | |
144 | - .note-title { | |
145 | - li { | |
146 | - border-bottom:none !important; | |
147 | - } | |
148 | - } | |
149 | -} | |
150 | - | |
151 | -.markdown { | |
152 | - img { | |
153 | - max-width: 100%; | |
154 | - } | |
155 | -} | |
156 | - | |
157 | -.wiki_content code, .readme code{ | |
158 | - background-color: inherit; | |
159 | -} | |
160 | - | |
161 | -.team_member_show { | |
162 | - td:first-child { | |
163 | - color: #aaa; | |
164 | - } | |
165 | -} | |
166 | - | |
167 | -.rss-icon { | |
168 | - img { | |
169 | - width: 24px; | |
170 | - vertical-align: top; | |
171 | - } | |
172 | - | |
173 | - strong { | |
174 | - line-height: 24px; | |
175 | - } | |
176 | -} | |
177 | - | |
178 | -.supp_diff_link, | |
179 | -.show-all-commits { | |
180 | - cursor: pointer; | |
181 | -} | |
182 | - | |
183 | -.merge-request, | |
184 | -.issue { | |
185 | - &.today{ | |
186 | - background: #EFE; | |
187 | - border-color: #CEC; | |
188 | - } | |
189 | - &.closed { | |
190 | - background: #F5f5f5; | |
191 | - border-color: #E5E5E5; | |
192 | - } | |
193 | - &.merged { | |
194 | - background: #F5f5f5; | |
195 | - border-color: #E5E5E5; | |
196 | - } | |
197 | -} | |
198 | - | |
199 | -.git_error_tips { | |
200 | - @extend .col-md-6; | |
201 | - text-align: left; | |
202 | - margin-top: 40px; | |
203 | - pre { | |
204 | - background: white; | |
205 | - border: none; | |
206 | - font-size: 12px; | |
207 | - } | |
208 | -} | |
209 | - | |
210 | -.error-message { | |
211 | - padding: 10px; | |
212 | - background: #C67; | |
213 | - margin: 0; | |
214 | - color: #FFF; | |
215 | - | |
216 | - a { | |
217 | - color: #fff; | |
218 | - text-decoration: underline; | |
219 | - } | |
220 | -} | |
221 | - | |
222 | -.no-ssh-key-message { | |
223 | - padding: 10px 0; | |
224 | - background: #C67; | |
225 | - margin: 0; | |
226 | - color: #FFF; | |
227 | - margin-top: -1px; | |
228 | - text-align: center; | |
229 | - | |
230 | - a { | |
231 | - color: #fff; | |
232 | - text-decoration: underline; | |
233 | - } | |
234 | -} | |
235 | - | |
236 | -.warning_message { | |
237 | - border-left: 4px solid #ed9; | |
238 | - color: #b90; | |
239 | - padding: 10px; | |
240 | - margin-bottom: 10px; | |
241 | - background: #ffffe6; | |
242 | - padding-left: 20px; | |
243 | - | |
244 | - &.centered { | |
245 | - text-align: center; | |
246 | - } | |
247 | -} | |
248 | - | |
249 | -.gitlab-promo { | |
250 | - a { | |
251 | - color: #aaa; | |
252 | - margin-right: 30px; | |
253 | - } | |
254 | -} | |
255 | - | |
256 | -pre { | |
257 | - &.clean { | |
258 | - background: none; | |
259 | - border: none; | |
260 | - margin: 0; | |
261 | - padding: 0; | |
262 | - } | |
263 | -} | |
264 | - | |
265 | -.milestone { | |
266 | - &.milestone-closed { | |
267 | - background: #eee; | |
268 | - } | |
269 | - .progress { | |
270 | - margin-bottom: 0; | |
271 | - margin-top: 4px; | |
272 | - } | |
273 | -} | |
274 | - | |
275 | -h1.http_status_code { | |
276 | - font-size: 56px; | |
277 | - line-height: 100px; | |
278 | - font-weight: normal; | |
279 | - color: #456; | |
280 | -} | |
281 | - | |
282 | -.control-group { | |
283 | - .controls { | |
284 | - span { | |
285 | - &.descr { | |
286 | - position: relative; | |
287 | - top: 2px; | |
288 | - left: 5px; | |
289 | - color: #666; | |
290 | - } | |
291 | - } | |
292 | - } | |
293 | -} | |
294 | - | |
295 | -img.emoji { | |
296 | - height: 20px; | |
297 | - vertical-align: middle; | |
298 | - width: 20px; | |
299 | -} | |
300 | - | |
301 | -.appear-data { | |
302 | - display: none; | |
303 | -} | |
304 | - | |
305 | -.chart { | |
306 | - overflow: hidden; | |
307 | - height: 220px; | |
308 | -} | |
309 | - | |
310 | -.navless-container { | |
311 | - margin-top: 20px; | |
312 | -} | |
313 | - | |
314 | -.description-block { | |
315 | - @extend .light-well; | |
316 | - @extend .light; | |
317 | - margin-bottom: 10px; | |
318 | -} | |
319 | - | |
320 | -table { | |
321 | - td.permission-x { | |
322 | - background: #D9EDF7 !important; | |
323 | - text-align: center; | |
324 | - } | |
325 | -} | |
326 | - | |
327 | -.dashboard-intro-icon { | |
328 | - float: left; | |
329 | - font-size: 32px; | |
330 | - color: #AAA; | |
331 | - padding: 5px 0; | |
332 | - width: 50px; | |
333 | - min-height: 100px; | |
334 | -} | |
335 | - | |
336 | -.broadcast-message { | |
337 | - padding: 10px; | |
338 | - text-align: center; | |
339 | - background: #555; | |
340 | - color: #BBB; | |
341 | -} | |
342 | - | |
343 | -.broadcast-message-preview { | |
344 | - @extend .broadcast-message; | |
345 | - margin-bottom: 20px; | |
346 | -} | |
347 | - | |
348 | -.ajax-users-select { | |
349 | - width: 400px; | |
350 | - | |
351 | - &.input-large { | |
352 | - width: 210px; | |
353 | - } | |
354 | - | |
355 | - &.input-clamp { | |
356 | - max-width: 100%; | |
357 | - } | |
358 | -} | |
359 | - | |
360 | -.user-result { | |
361 | - .user-image { | |
362 | - float: left; | |
363 | - } | |
364 | - .user-name { | |
365 | - } | |
366 | - .user-username { | |
367 | - color: #999; | |
368 | - } | |
369 | -} | |
370 | - | |
371 | -.namespace-result { | |
372 | - .namespace-kind { | |
373 | - color: #AAA; | |
374 | - font-weight: normal; | |
375 | - } | |
376 | - .namespace-path { | |
377 | - margin-left: 10px; | |
378 | - font-weight: bolder; | |
379 | - } | |
380 | -} | |
381 | - | |
382 | -.side-filters { | |
383 | - fieldset { | |
384 | - margin-bottom: 15px; | |
385 | - } | |
386 | -} | |
387 | - | |
388 | -.btn-sign-in { | |
389 | - margin-top: 7px; | |
390 | - text-shadow: none; | |
391 | -} | |
392 | - |
app/assets/stylesheets/generic.scss
... | ... | @@ -1,12 +0,0 @@ |
1 | -@import "generic/avatar.scss"; | |
2 | -@import "generic/nav.scss"; | |
3 | -@import "generic/common.scss"; | |
4 | -@import "generic/typography.scss"; | |
5 | -@import "generic/buttons.scss"; | |
6 | -@import "generic/blocks.scss"; | |
7 | -@import "generic/ui_box.scss"; | |
8 | -@import "generic/issue_box.scss"; | |
9 | -@import "generic/files.scss"; | |
10 | -@import "generic/lists.scss"; | |
11 | -@import "generic/forms.scss"; | |
12 | -@import "generic/selects.scss"; |
app/assets/stylesheets/generic/common.scss
... | ... | @@ -128,3 +128,360 @@ pre.well-pre { |
128 | 128 | white-space: nowrap; |
129 | 129 | max-width: 82%; |
130 | 130 | } |
131 | + | |
132 | +/** FLASH message **/ | |
133 | +.flash-container { | |
134 | + display: none; | |
135 | + cursor: pointer; | |
136 | + margin: 0; | |
137 | + text-align: center; | |
138 | + color: #fff; | |
139 | + font-size: 14px; | |
140 | + position: fixed; | |
141 | + bottom: 0; | |
142 | + width: 100%; | |
143 | + opacity: 0.8; | |
144 | + z-index: 100; | |
145 | + | |
146 | + .flash-notice { | |
147 | + background: #49C; | |
148 | + padding: 10px; | |
149 | + text-shadow: 0 1px 1px #178; | |
150 | + } | |
151 | + | |
152 | + .flash-alert { | |
153 | + background: #C67; | |
154 | + text-shadow: 0 1px 1px #945; | |
155 | + padding: 10px; | |
156 | + } | |
157 | +} | |
158 | +.author_link { | |
159 | + color: $link_color; | |
160 | +} | |
161 | + | |
162 | +.help li { color:$style_color; } | |
163 | + | |
164 | +.back-link { | |
165 | + font-size: 14px; | |
166 | +} | |
167 | + | |
168 | +table a code { | |
169 | + position: relative; | |
170 | + top: -2px; | |
171 | + margin-right: 3px; | |
172 | +} | |
173 | + | |
174 | +.loading { | |
175 | + margin: 20px auto; | |
176 | + background: url(ajax_loader.gif) no-repeat center center; | |
177 | + width: 40px; | |
178 | + height: 40px; | |
179 | + &.loading-gray { | |
180 | + background: url(ajax_loader_gray.gif) no-repeat center center; | |
181 | + } | |
182 | +} | |
183 | + | |
184 | +span.update-author { | |
185 | + display: block; | |
186 | + color: #999; | |
187 | + font-weight: normal; | |
188 | + font-style: italic; | |
189 | + strong { | |
190 | + font-weight: bold; | |
191 | + font-style: normal; | |
192 | + } | |
193 | +} | |
194 | + | |
195 | +.user-mention { | |
196 | + color: #2FA0BB; | |
197 | + font-weight: bold; | |
198 | +} | |
199 | + | |
200 | +.field_with_errors { | |
201 | + display: inline; | |
202 | +} | |
203 | + | |
204 | +.line_holder { | |
205 | + &:hover { | |
206 | + td { | |
207 | + background: #FFFFCF !important; | |
208 | + } | |
209 | + } | |
210 | +} | |
211 | + | |
212 | +p.time { | |
213 | + color: #999; | |
214 | + font-size: 90%; | |
215 | + margin: 30px 3px 3px 2px; | |
216 | +} | |
217 | + | |
218 | +.highlight { | |
219 | + text-shadow: none; | |
220 | +} | |
221 | + | |
222 | +.highlight_word { | |
223 | + border-bottom: 2px solid #F90; | |
224 | +} | |
225 | + | |
226 | +.thin_area{ | |
227 | + height: 150px; | |
228 | +} | |
229 | + | |
230 | +// Fixes alignment on notes. | |
231 | +.new_note { | |
232 | + label { | |
233 | + text-align: left; | |
234 | + } | |
235 | +} | |
236 | + | |
237 | +// Fix issue with notes & lists creating a bunch of bottom borders. | |
238 | +li.note { | |
239 | + img { max-width:100% } | |
240 | + .note-title { | |
241 | + li { | |
242 | + border-bottom:none !important; | |
243 | + } | |
244 | + } | |
245 | +} | |
246 | + | |
247 | +.markdown { | |
248 | + img { | |
249 | + max-width: 100%; | |
250 | + } | |
251 | +} | |
252 | + | |
253 | +.wiki_content code, .readme code{ | |
254 | + background-color: inherit; | |
255 | +} | |
256 | + | |
257 | +.team_member_show { | |
258 | + td:first-child { | |
259 | + color: #aaa; | |
260 | + } | |
261 | +} | |
262 | + | |
263 | +.rss-icon { | |
264 | + img { | |
265 | + width: 24px; | |
266 | + vertical-align: top; | |
267 | + } | |
268 | + | |
269 | + strong { | |
270 | + line-height: 24px; | |
271 | + } | |
272 | +} | |
273 | + | |
274 | +.supp_diff_link, | |
275 | +.show-all-commits { | |
276 | + cursor: pointer; | |
277 | +} | |
278 | + | |
279 | +.merge-request, | |
280 | +.issue { | |
281 | + &.today{ | |
282 | + background: #EFE; | |
283 | + border-color: #CEC; | |
284 | + } | |
285 | + &.closed { | |
286 | + background: #F5f5f5; | |
287 | + border-color: #E5E5E5; | |
288 | + } | |
289 | + &.merged { | |
290 | + background: #F5f5f5; | |
291 | + border-color: #E5E5E5; | |
292 | + } | |
293 | +} | |
294 | + | |
295 | +.git_error_tips { | |
296 | + @extend .col-md-6; | |
297 | + text-align: left; | |
298 | + margin-top: 40px; | |
299 | + pre { | |
300 | + background: white; | |
301 | + border: none; | |
302 | + font-size: 12px; | |
303 | + } | |
304 | +} | |
305 | + | |
306 | +.error-message { | |
307 | + padding: 10px; | |
308 | + background: #C67; | |
309 | + margin: 0; | |
310 | + color: #FFF; | |
311 | + | |
312 | + a { | |
313 | + color: #fff; | |
314 | + text-decoration: underline; | |
315 | + } | |
316 | +} | |
317 | + | |
318 | +.no-ssh-key-message { | |
319 | + padding: 10px 0; | |
320 | + background: #C67; | |
321 | + margin: 0; | |
322 | + color: #FFF; | |
323 | + margin-top: -1px; | |
324 | + text-align: center; | |
325 | + | |
326 | + a { | |
327 | + color: #fff; | |
328 | + text-decoration: underline; | |
329 | + } | |
330 | +} | |
331 | + | |
332 | +.warning_message { | |
333 | + border-left: 4px solid #ed9; | |
334 | + color: #b90; | |
335 | + padding: 10px; | |
336 | + margin-bottom: 10px; | |
337 | + background: #ffffe6; | |
338 | + padding-left: 20px; | |
339 | + | |
340 | + &.centered { | |
341 | + text-align: center; | |
342 | + } | |
343 | +} | |
344 | + | |
345 | +.gitlab-promo { | |
346 | + a { | |
347 | + color: #aaa; | |
348 | + margin-right: 30px; | |
349 | + } | |
350 | +} | |
351 | + | |
352 | +pre { | |
353 | + &.clean { | |
354 | + background: none; | |
355 | + border: none; | |
356 | + margin: 0; | |
357 | + padding: 0; | |
358 | + } | |
359 | +} | |
360 | + | |
361 | +.milestone { | |
362 | + &.milestone-closed { | |
363 | + background: #eee; | |
364 | + } | |
365 | + .progress { | |
366 | + margin-bottom: 0; | |
367 | + margin-top: 4px; | |
368 | + } | |
369 | +} | |
370 | + | |
371 | +h1.http_status_code { | |
372 | + font-size: 56px; | |
373 | + line-height: 100px; | |
374 | + font-weight: normal; | |
375 | + color: #456; | |
376 | +} | |
377 | + | |
378 | +.control-group { | |
379 | + .controls { | |
380 | + span { | |
381 | + &.descr { | |
382 | + position: relative; | |
383 | + top: 2px; | |
384 | + left: 5px; | |
385 | + color: #666; | |
386 | + } | |
387 | + } | |
388 | + } | |
389 | +} | |
390 | + | |
391 | +img.emoji { | |
392 | + height: 20px; | |
393 | + vertical-align: middle; | |
394 | + width: 20px; | |
395 | +} | |
396 | + | |
397 | +.appear-data { | |
398 | + display: none; | |
399 | +} | |
400 | + | |
401 | +.chart { | |
402 | + overflow: hidden; | |
403 | + height: 220px; | |
404 | +} | |
405 | + | |
406 | +.navless-container { | |
407 | + margin-top: 20px; | |
408 | +} | |
409 | + | |
410 | +.description-block { | |
411 | + @extend .light-well; | |
412 | + @extend .light; | |
413 | + margin-bottom: 10px; | |
414 | +} | |
415 | + | |
416 | +table { | |
417 | + td.permission-x { | |
418 | + background: #D9EDF7 !important; | |
419 | + text-align: center; | |
420 | + } | |
421 | +} | |
422 | + | |
423 | +.dashboard-intro-icon { | |
424 | + float: left; | |
425 | + font-size: 32px; | |
426 | + color: #AAA; | |
427 | + padding: 5px 0; | |
428 | + width: 50px; | |
429 | + min-height: 100px; | |
430 | +} | |
431 | + | |
432 | +.broadcast-message { | |
433 | + padding: 10px; | |
434 | + text-align: center; | |
435 | + background: #555; | |
436 | + color: #BBB; | |
437 | +} | |
438 | + | |
439 | +.broadcast-message-preview { | |
440 | + @extend .broadcast-message; | |
441 | + margin-bottom: 20px; | |
442 | +} | |
443 | + | |
444 | +.ajax-users-select { | |
445 | + width: 400px; | |
446 | + | |
447 | + &.input-large { | |
448 | + width: 210px; | |
449 | + } | |
450 | + | |
451 | + &.input-clamp { | |
452 | + max-width: 100%; | |
453 | + } | |
454 | +} | |
455 | + | |
456 | +.user-result { | |
457 | + .user-image { | |
458 | + float: left; | |
459 | + } | |
460 | + .user-name { | |
461 | + } | |
462 | + .user-username { | |
463 | + color: #999; | |
464 | + } | |
465 | +} | |
466 | + | |
467 | +.namespace-result { | |
468 | + .namespace-kind { | |
469 | + color: #AAA; | |
470 | + font-weight: normal; | |
471 | + } | |
472 | + .namespace-path { | |
473 | + margin-left: 10px; | |
474 | + font-weight: bolder; | |
475 | + } | |
476 | +} | |
477 | + | |
478 | +.side-filters { | |
479 | + fieldset { | |
480 | + margin-bottom: 15px; | |
481 | + } | |
482 | +} | |
483 | + | |
484 | +.btn-sign-in { | |
485 | + margin-top: 7px; | |
486 | + text-shadow: none; | |
487 | +} | ... | ... |
app/assets/stylesheets/generic/nav.scss
... | ... | @@ -1,61 +0,0 @@ |
1 | -/** | |
2 | - * nav-pills | |
3 | - * | |
4 | - */ | |
5 | -.nav-pills { | |
6 | - .active a { | |
7 | - background: $primary_color; | |
8 | - } | |
9 | - | |
10 | - &.nav-stacked { | |
11 | - > li > a { | |
12 | - @include border-radius(0); | |
13 | - border-left: 4px solid #EEE; | |
14 | - padding: 12px; | |
15 | - color: #777; | |
16 | - } | |
17 | - > .active > a { | |
18 | - border-color: $primary_color; | |
19 | - background: none; | |
20 | - color: #333; | |
21 | - font-weight: bolder; | |
22 | - | |
23 | - &:hover { | |
24 | - background: none; | |
25 | - color: #333; | |
26 | - } | |
27 | - } | |
28 | - | |
29 | - &.nav-stacked-menu { | |
30 | - li > a { | |
31 | - padding: 16px; | |
32 | - } | |
33 | - } | |
34 | - } | |
35 | - | |
36 | - &.nav-pills-small { | |
37 | - > li > a { | |
38 | - padding: 8px 12px; | |
39 | - font-size: 12px; | |
40 | - } | |
41 | - } | |
42 | -} | |
43 | - | |
44 | -.nav-pills > .active > a > i[class^="icon-"] { background: inherit; } | |
45 | - | |
46 | - | |
47 | - | |
48 | -/** | |
49 | - * nav-tabs | |
50 | - * | |
51 | - */ | |
52 | -.nav-tabs > li > a, .nav-pills > li > a { color: $style_color; } | |
53 | - | |
54 | -/** | |
55 | - * fix to keep tooltips position in top navigation bar | |
56 | - * | |
57 | - */ | |
58 | -.navbar .nav > li { | |
59 | - position: relative; | |
60 | - white-space: nowrap; | |
61 | -} |
app/assets/stylesheets/gl_bootstrap.scss
1 | +/* | |
2 | + * Twitter bootstrap with GitLab customizations/additions | |
3 | + * | |
4 | + * Some unused bootstrap compontents like panels are not included. | |
5 | + * Other components like tabs are modified to GitLab style. | |
6 | + * | |
7 | + */ | |
8 | + | |
9 | + | |
1 | 10 | // Core variables and mixins |
2 | 11 | @import "bootstrap/variables"; |
3 | 12 | @import "bootstrap/mixins"; |
... | ... | @@ -128,6 +137,50 @@ |
128 | 137 | } |
129 | 138 | } |
130 | 139 | |
140 | +.nav-tabs > li > a, .nav-pills > li > a { color: $style_color; } | |
141 | + | |
142 | +// Nav pills | |
143 | +.nav-pills { | |
144 | + .active a { | |
145 | + background: $primary_color; | |
146 | + } | |
147 | + | |
148 | + &.nav-stacked { | |
149 | + > li > a { | |
150 | + @include border-radius(0); | |
151 | + border-left: 4px solid #EEE; | |
152 | + padding: 12px; | |
153 | + color: #777; | |
154 | + } | |
155 | + > .active > a { | |
156 | + border-color: $primary_color; | |
157 | + background: none; | |
158 | + color: #333; | |
159 | + font-weight: bolder; | |
160 | + | |
161 | + &:hover { | |
162 | + background: none; | |
163 | + color: #333; | |
164 | + } | |
165 | + } | |
166 | + | |
167 | + &.nav-stacked-menu { | |
168 | + li > a { | |
169 | + padding: 16px; | |
170 | + } | |
171 | + } | |
172 | + } | |
173 | + | |
174 | + &.nav-pills-small { | |
175 | + > li > a { | |
176 | + padding: 8px 12px; | |
177 | + font-size: 12px; | |
178 | + } | |
179 | + } | |
180 | +} | |
181 | + | |
182 | +.nav-pills > .active > a > i[class^="icon-"] { background: inherit; } | |
183 | + | |
131 | 184 | /* |
132 | 185 | * Callouts from Bootstrap3 docs |
133 | 186 | * |
... | ... | @@ -172,3 +225,26 @@ |
172 | 225 | border-color: #5cA64d; |
173 | 226 | color: #3c763d; |
174 | 227 | } |
228 | + | |
229 | +// Breadcrumb | |
230 | +ul.breadcrumb { | |
231 | + background: white; | |
232 | + border: none; | |
233 | + li { | |
234 | + display: inline; | |
235 | + text-shadow: 0 1px 0 white | |
236 | + } | |
237 | + | |
238 | + a { | |
239 | + font-size: 16px; | |
240 | + } | |
241 | +} | |
242 | + | |
243 | +/** | |
244 | + * fix to keep tooltips position in top navigation bar | |
245 | + * | |
246 | + */ | |
247 | +.navbar .nav > li { | |
248 | + position: relative; | |
249 | + white-space: nowrap; | |
250 | +} | ... | ... |
... | ... | @@ -0,0 +1,18 @@ |
1 | +html { | |
2 | + overflow-y: scroll; | |
3 | +} | |
4 | + | |
5 | +body { | |
6 | + -webkit-font-smoothing: antialiased; | |
7 | + -moz-osx-font-smoothing: grayscale; | |
8 | + margin-bottom: 20px; | |
9 | +} | |
10 | + | |
11 | +.container { | |
12 | + padding-top: 0; | |
13 | + z-index: 5; | |
14 | +} | |
15 | + | |
16 | +.container .content { | |
17 | + margin: 0 0; | |
18 | +} | ... | ... |
app/assets/stylesheets/sections.scss
... | ... | @@ -1,21 +0,0 @@ |
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"; |