Download as
Browse Code »

Commit 1dd938d20cb51a8068c9b3ab9041068292d97a9b

Authored by randx
1 parent 35fbc4d3
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

SCSS refactoring & cleanup. First iteration

Showing 17 changed files with 717 additions and 1269 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @1dd938d
1   -.diff_file_header a,
2   -.file_stats a {
3   - color:$style_color;
4   -}
5   -
6   -
7 1 /** LAYOUT **/
8 2  
  3 +body {
  4 + margin-bottom:20px;
  5 +}
  6 +
9 7 .container {
10 8 padding-top:0;
11 9 z-index:5;
... ... @@ -40,30 +38,6 @@
40 38 color: $link_color;
41 39 }
42 40  
43   -.widget {
44   - @include shade;
45   - padding:20px;
46   - margin-bottom:20px;
47   - border: 1px solid #DDD;
48   - border-radius: 5px;
49   - background:#fafafa;
50   -
51   - .link_holder {
52   - background:#eee;
53   - position:relative;
54   - left:-20px;
55   - top:20px;
56   - padding:10px 20px;
57   - width:100%;
58   - border-top:1px solid #ccc;
59   -
60   - a {
61   - font-size:14px;
62   - color:#666;
63   - }
64   - }
65   -}
66   -
67 41 .help li { color:#111 }
68 42  
69 43 .back_link {
... ... @@ -88,16 +62,6 @@
88 62 padding-left:20px;
89 63 }
90 64  
91   -.number {
92   - border-radius: 4px;
93   - text-shadow: none;
94   - background: rgba(0,0,0,.12);
95   - text-align: center;
96   - padding: 2px 4px;
97   - line-height:18px;
98   - margin-left:2px;
99   -}
100   -
101 65 table a code {
102 66 position: relative;
103 67 top: -2px;
... ... @@ -174,10 +138,6 @@ span.update-author {
174 138 display:block;
175 139 }
176 140 /** END UPDATE ITEM **/
177   -.ajax-tab-loading {
178   - padding:40px;
179   - display:none;
180   -}
181 141 .dashboard-loader {
182 142 float:left;
183 143 margin:10px;
... ... @@ -200,6 +160,117 @@ a.project-update.titled {
200 160 }
201 161 }
202 162  
  163 +.neib {
  164 + margin-right:10px;
  165 +}
  166 +
  167 +.label {
  168 + background-color: #474D57;
  169 +
  170 + &.label-issue {
  171 + background-color: #eee;
  172 + border: 1px solid #ccc;
  173 + padding:4px 6px;
  174 + color:#444;
  175 + text-shadow:0 0 1px #fff;
  176 +
  177 + &.grouped {
  178 + float: left;
  179 + margin-right: 6px;
  180 + padding: 6px;
  181 + }
  182 + }
  183 +}
  184 +
  185 +.event_label {
  186 + @extend .label;
  187 + background-color: #999;
  188 +
  189 + &.pushed {
  190 + background-color: #3A87AD;
  191 + }
  192 +
  193 + &.opened {
  194 + background-color: #468847;
  195 + }
  196 +
  197 + &.closed {
  198 + background-color: #B94A48;
  199 + }
  200 +
  201 + &.merged {
  202 + background-color: #2A2;
  203 + }
  204 +}
  205 +
  206 +form {
  207 + @extend .form-horizontal;
  208 +
  209 + .actions {
  210 + @extend .form-actions;
  211 + }
  212 +
  213 + .clearfix {
  214 + @extend .control-group;
  215 + }
  216 +
  217 + .input {
  218 + @extend .controls;
  219 + }
  220 +
  221 + label {
  222 + @extend .control-label;
  223 + }
  224 + .xlarge {
  225 + @extend .input-xlarge;
  226 + }
  227 + .xxlarge {
  228 + @extend .input-xxlarge;
  229 + }
  230 +}
  231 +
  232 +
  233 +
  234 +
  235 +
  236 +
  237 +.field_with_errors {
  238 + display:inline;
  239 +}
  240 +
  241 +ul.breadcrumb {
  242 + background:white;
  243 + border:none;
  244 + li {
  245 + display: inline;
  246 + text-shadow: 0 1px 0 white
  247 + }
  248 +
  249 + a {
  250 + color:#474D57;
  251 + font-weight:bold;
  252 + font-size:14px;
  253 + }
  254 +
  255 + .arrow {
  256 + background: url("images.png") no-repeat -85px -77px;
  257 + width: 19px;
  258 + height: 16px;
  259 + float: left;
  260 + position: relative;
  261 + left: -10px;
  262 + padding:0;
  263 + margin:0;
  264 + }
  265 +}
  266 +
  267 +input[type=text] {
  268 + &.large_text {
  269 + padding:6px;
  270 + font-size:16px;
  271 + }
  272 +}
  273 +
203 274 input.git_clone_url {
204 275 width:325px;
205 276 }
... ...
app/assets/stylesheets/gitlab_bootstrap.scss
View file @35fbc4d
... ... @@ -1,817 +0,0 @@
1   -body {
2   - margin-bottom:20px;
3   -}
4   -
5   -pre {
6   - font-family:'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace;
7   -
8   - &.dark {
9   - background: #333;
10   - color:#f5f5f5;
11   - }
12   -}
13   -
14   -a {
15   - outline: none;
16   - color: $link_color;
17   - &:hover {
18   - text-decoration:none;
19   - color: $blue_link;
20   - }
21   -
22   - &.btn {
23   - color: $style_color;
24   - }
25   -
26   - &.dark {
27   - color: $style_color;
28   - }
29   -
30   - &.lined {
31   - text-decoration:underline;
32   - &:hover { text-decoration:underline; }
33   - }
34   -
35   - &.gray {
36   - color:gray;
37   - }
38   -
39   - &.supp_diff_link {
40   - text-align:center;
41   - padding:20px 0;
42   - background:#f1f1f1;
43   - width:100%;
44   - float:left;
45   - }
46   -
47   - &.neib {
48   - margin-right:15px;
49   - }
50   -}
51   -
52   -.neib {
53   - margin-right:10px;
54   -}
55   -
56   -.alert-message {
57   - @extend .alert;
58   -
59   - &.success {
60   - @extend .alert-success;
61   - }
62   -
63   - &.error {
64   - @extend .alert-error;
65   - }
66   -}
67   -
68   -.alert {
69   - &.alert-well {
70   - background:#ddd;
71   - border:1px solid #ccc;
72   - background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #ddd), to(#dfdfdf));
73   - background-image: -webkit-linear-gradient(#ddd 6.6%, #dfdfdf);
74   - background-image: -moz-linear-gradient(#ddd 6.6%, #dfdfdf);
75   - background-image: -o-linear-gradient(#ddd 6.6%, #dfdfdf);
76   - color:#111;
77   - }
78   -}
79   -
80   -h3, h4, h5, h6 {
81   - line-height: 36px;
82   -}
83   -
84   -h5 {
85   - font-size:14px;
86   -}
87   -
88   -
89   -table {
90   - width:100%;
91   - th {
92   - padding-top: 9px;
93   - font-weight: bold;
94   - vertical-align: middle;
95   - }
96   - th, td {
97   - padding: 10px 10px 9px;
98   - line-height: 18px;
99   - text-align: left;
100   - }
101   -
102   - &.bordered-table {
103   - border: 1px solid #DDD;
104   - border-collapse: separate;
105   - -webkit-border-radius: 4px;
106   - -moz-border-radius: 4px;
107   - border-radius: 4px;
108   - }
109   -
110   - &.zebra-striped {
111   - @extend .table-striped;
112   - }
113   -}
114   -
115   -.btn {
116   - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f1f1f1), color-stop(25%, #f1f1f1), to(#e6e6e6));
117   - background-image: -webkit-linear-gradient(#f1f1f1, #f1f1f1 25%, #e6e6e6);
118   - background-image: -moz-linear-gradient(top, #f1f1f1, #f1f1f1 25%, #e6e6e6);
119   - background-image: -ms-linear-gradient(#f1f1f1, #f1f1f1 25%, #e6e6e6);
120   - background-image: -o-linear-gradient(#f1f1f1, #f1f1f1 25%, #e6e6e6);
121   - background-image: linear-gradient(#f1f1f1, #f1f1f1 25%, #e6e6e6);
122   -
123   - &:hover {
124   - }
125   -
126   - &.btn-primary {
127   - background:$link_color;
128   - border-color: #2A79A3;
129   - &:hover {
130   - background:$blue_link;
131   - }
132   - }
133   - &.primary {
134   - @extend .btn-primary;
135   - }
136   -
137   - &.success {
138   - color: #fff;
139   - text-shadow: 0 0 1px #111;
140   - background: #5bb75b;;
141   - font-weight: bold;
142   -
143   - &:hover {
144   - background-color: #51a351;
145   - color: #fff;
146   - }
147   - }
148   -
149   - &.danger,
150   - &.btn-danger {
151   - color:#fff;
152   - background: #DA4E49;
153   - border-color: #BD362F;
154   -
155   - &:hover {
156   - color:#fff;
157   - background: #EE4E49;
158   - }
159   - }
160   -
161   - &.danger {
162   - @extend .btn-danger;
163   - }
164   -
165   - &.small {
166   - @extend .btn-small;
167   - }
168   -
169   - &.active {
170   - border-color:#aaa;
171   - background-color:#ccc;
172   - }
173   -}
174   -
175   -a:focus {
176   - outline: none;
177   -}
178   -
179   -.nav-pills a:hover {
180   - background-color:#888;
181   -}
182   -
183   -.nav-pills .active a {
184   - background-color: $style_color;
185   -}
186   -
187   -.label {
188   - background-color: #474D57;
189   - &.label-important {
190   - background-color: #B94A48;
191   - }
192   -
193   - &.label-issue {
194   - background-color: #eee;
195   - border: 1px solid #ccc;
196   - padding:4px 6px;
197   - color:#444;
198   - text-shadow:0 0 1px #fff;
199   -
200   - &.grouped {
201   - float: left;
202   - margin-right: 6px;
203   - padding: 6px;
204   - }
205   - }
206   -}
207   -
208   -.nav-tabs > li > a, .nav-pills > li > a {
209   - color:$style_color;
210   -}
211   -
212   -.nav-tabs > .active > a {
213   - font-weight:bold;
214   -}
215   -
216   -/** COLORS **/
217   -.cgray { color:gray; }
218   -.cred { color:#D12F19; }
219   -.cgreen { color:#44aa22; }
220   -.cblack { color:#111; }
221   -.cdark { color:#444 }
222   -.cwhite { color:#fff !important }
223   -.bgred { background: #F2DEDE !important}
224   -
225   -/** COMMON STYLES **/
226   -.left {
227   - float:left;
228   -}
229   -.right {
230   - float:right !important;
231   -}
232   -.width-50p{
233   - width:50%;
234   -}
235   -.width-49p{
236   - width:49%;
237   -}
238   -.width-30p{
239   - width:30%;
240   -}
241   -.width-65p{
242   - width:65%;
243   -}
244   -.width-100p{
245   - width:100%;
246   -}
247   -.append-bottom-10 {
248   - margin-bottom:10px;
249   -}
250   -.append-bottom-20 {
251   - margin-bottom:20px;
252   -}
253   -.prepend-top-10 {
254   - margin-top:10px;
255   -}
256   -
257   -.prepend-top-20 {
258   - margin-top:20px;
259   -}
260   -
261   -.padded {
262   - padding:20px;
263   -}
264   -
265   -.ipadded {
266   - padding:20px !important;
267   -}
268   -.lborder {
269   - border-left:1px solid #eee;
270   -}
271   -
272   -.borders {
273   - border: 1px solid #ccc;
274   - @include shade;
275   -}
276   -.no-borders {
277   - border:none;
278   -}
279   -table.no-borders {
280   - border:none;
281   - tr, td { border:none }
282   -}
283   -.no-padding {
284   - padding:0 !important;
285   -}
286   -.underlined {
287   - border-bottom: 1px solid $border_color;
288   -}
289   -.vlink {
290   - color: $link_color !important;
291   -}
292   -
293   -.pretty_label {
294   - @include round-borders-all(4px);
295   - padding:2px 4px;
296   - background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #fefefe), to(#F6F7F8));
297   - background-image: -webkit-linear-gradient(#fefefe 7.6%, #F6F7F8);
298   - background-image: -moz-linear-gradient(#fefefe 7.6%, #F6F7F8);
299   - background-image: -o-linear-gradient(#fefefe 7.6%, #F6F7F8);
300   - color: #777;
301   - border: 1px solid #DEDFE1;
302   -
303   - &.branch {
304   - border:none;
305   - font-size:13px;
306   - background: #474D57;
307   - color:#fff;
308   - font-weight:bold;
309   - font-family: monospace;
310   - }
311   -}
312   -
313   -.event_label {
314   - @extend .label;
315   - background-color: #999;
316   -
317   - &.pushed {
318   - background-color: #3A87AD;
319   - }
320   -
321   - &.opened {
322   - background-color: #468847;
323   - }
324   -
325   - &.closed {
326   - background-color: #B94A48;
327   - }
328   -
329   - &.merged {
330   - background-color: #2A2;
331   - }
332   -}
333   -
334   -img.avatar {
335   - float:left;
336   - margin-right:15px;
337   - width:40px;
338   - border:1px solid #ddd;
339   - padding:1px;
340   -
341   - &.s16 {
342   - width:16px;
343   - height:16px;
344   - }
345   - &.s24 {
346   - width:24px;
347   - height:24px;
348   - }
349   - &.s32 {
350   - width:32px;
351   - height:32px;
352   - }
353   -}
354   -
355   -img.lil_av {
356   - padding-left: 4px;
357   - padding-right:3px;
358   -}
359   -
360   -form {
361   - @extend .form-horizontal;
362   -
363   - .actions {
364   - @extend .form-actions;
365   - }
366   -
367   - .clearfix {
368   - @extend .control-group;
369   - }
370   -
371   - .input {
372   - @extend .controls;
373   - }
374   -
375   - label {
376   - @extend .control-label;
377   - }
378   - .xlarge {
379   - @extend .input-xlarge;
380   - }
381   - .xxlarge {
382   - @extend .input-xxlarge;
383   - }
384   -}
385   -
386   -/**
387   - * List li block element #1
388   - *
389   - */
390   -.wll {
391   - background-color: #FFF;
392   - padding: 10px 5px;
393   - min-height: 20px;
394   - border-bottom: 1px solid #eee;
395   - border-bottom: 1px solid rgba(0, 0, 0, 0.05);
396   - &.smoke {
397   - background-color:#f5f5f5;
398   - }
399   - &:hover {
400   - background:$hover;
401   - }
402   - &:last-child { border:none }
403   - p { padding-top:5px; margin:0; color:$style_color;}
404   - .author { color: #999; }
405   - p {
406   - color:#222;
407   - margin-bottom: 0;
408   - img {
409   - position:relative;
410   - top:3px;
411   - }
412   - }
413   -}
414   -
415   -
416   -/**
417   - * Block element #2
418   - *
419   - */
420   -.entry {
421   - position: relative;
422   - padding: 7px 15px;
423   - margin-bottom: 18px;
424   - color: #404040;
425   - filter:none;
426   -
427   - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
428   - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
429   -
430   - -webkit-border-radius: 4px;
431   - -moz-border-radius: 4px;
432   - border-radius: 4px;
433   -
434   - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
435   - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
436   - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
437   -
438   - background:#F1F1F1;
439   - border: 1px solid #ccc;
440   -
441   -
442   - p {
443   - color:$style_color;
444   - margin-bottom: 0;
445   - img {
446   - position:relative;
447   - top:3px;
448   - }
449   - }
450   -}
451   -
452   -
453   -/**
454   - * Big UI Block for show page content
455   - *
456   - */
457   -.ui-box {
458   - background:#F9F9F9;
459   - margin-bottom: 25px;
460   - @include round-borders-all(4px);
461   - border-color: #CCC;
462   - @include solid_shade;
463   -
464   - ul {
465   - margin:0;
466   - }
467   -
468   - h5, .title {
469   - padding: 0 10px;
470   - @include round-borders-top(4px);
471   - @include bg-gray-gradient;
472   - border-bottom: 1px solid #bbb;
473   -
474   - &.small {
475   - line-height: 28px;
476   - font-size: 14px;
477   - line-height:28px;
478   - text-shadow: 0 1px 1px white;
479   - }
480   -
481   - form {
482   - padding:9px 0;
483   - margin:0px;
484   - }
485   -
486   - .nav-pills {
487   - li {
488   - padding:3px 0;
489   - &.active a { background-color:$style_color; }
490   - a {
491   - border-radius:7px;
492   - }
493   - }
494   - }
495   - }
496   -
497   - .bottom {
498   - @include bg-gray-gradient;
499   - @include round-borders-bottom(4px);
500   - border-bottom:none;
501   - border-top: 1px solid #bbb;
502   - }
503   -
504   - &.padded {
505   - h5, .title {
506   - margin: -20px;
507   - margin-bottom: 0;
508   - padding: 5px 20px;
509   - }
510   - .middle_title {
511   - background:#f5f5f5;
512   - margin:20px -20px;
513   - padding: 0 20px;
514   - border-top:1px solid #eee;
515   - border-bottom:1px solid #eee;
516   - font-size:14px;
517   - color:#777;
518   - }
519   - }
520   - .row_title {
521   - font-weight:bold;
522   - color:#444;
523   - &:hover {
524   - color:#444;
525   - text-decoration:underline;
526   - }
527   - }
528   -
529   - li, .wll {
530   - padding:10px;
531   - &:first-child {
532   - @include round-borders-top(4px);
533   - border-top:none;
534   - }
535   -
536   - &:last-child {
537   - @include round-borders-bottom(4px);
538   - border:none;
539   - }
540   - }
541   -
542   -}
543   -
544   -table.admin-table {
545   - @extend .table-bordered;
546   - @extend .zebra-striped;
547   - @include solid_shade;
548   - th {
549   - border-color: #CCC;
550   - border-bottom: 1px solid #bbb;
551   - @include bg-gray-gradient;
552   - }
553   -}
554   -
555   -.field_with_errors {
556   - display:inline;
557   -}
558   -
559   -ul.breadcrumb {
560   - background:white;
561   - border:none;
562   - li {
563   - display: inline;
564   - text-shadow: 0 1px 0 white
565   - }
566   -
567   - a {
568   - color:#474D57;
569   - font-weight:bold;
570   - font-size:14px;
571   - }
572   -
573   - .arrow {
574   - background: url("images.png") no-repeat -85px -77px;
575   - width: 19px;
576   - height: 16px;
577   - float: left;
578   - position: relative;
579   - left: -10px;
580   - padding:0;
581   - margin:0;
582   - }
583   -}
584   -
585   -.nothing_here_message {
586   - text-align:center;
587   - padding:20px;
588   - color:#777;
589   -}
590   -
591   -/**
592   - * UI box element
593   - * contains top, middle, bottom blocks
594   - *
595   - */
596   -.main_box {
597   - @extend .borders;
598   - @extend .prepend-top-20;
599   - @extend .append-bottom-20;
600   - border-width:1px;
601   - @include solid_shade;
602   -
603   -
604   - img { max-width: 100%; }
605   -
606   - pre {
607   - code {
608   - background: none !important;
609   - }
610   - }
611   -
612   - .top_box_content,
613   - .middle_box_content,
614   - .bottom_box_content {
615   - padding:15px;
616   -
617   - pre {
618   - background: none !important;
619   - margin:0;
620   - border:none;
621   - padding:0;
622   - }
623   - }
624   -
625   - .middle_box_content {
626   - border-radius:0;
627   - border:none;
628   - font-size:12px;
629   - background-color:#f5f5f5;
630   - border:none;
631   - border-top:1px solid #eee;
632   - }
633   -
634   - .bottom_box_content {
635   - border-top:1px solid #eee;
636   - }
637   -}
638   -
639   -input[type=text] {
640   - &.large_text {
641   - padding:6px;
642   - font-size:16px;
643   - }
644   -}
645   -
646   -p {
647   - &.slead {
648   - color:#456;
649   - font-size:16px;
650   - margin-bottom: 12px;
651   - font-weight: 200;
652   - line-height: 24px;
653   - }
654   -}
655   -
656   -h3.page_title {
657   - color:#456;
658   - font-size:20px;
659   - font-weight: normal;
660   - line-height: 28px;
661   -}
662   -
663   -/**
664   - * File content holder
665   - *
666   - */
667   -.file_holder {
668   - border:1px solid #CCC;
669   - margin-bottom:1em;
670   - @include solid_shade;
671   -
672   - .file_title {
673   - border-bottom: 1px solid #bbb;
674   - @include bg-gray-gradient;
675   - margin: 0;
676   - font-weight: normal;
677   - font-weight: bold;
678   - text-align: left;
679   - color: #666;
680   - padding: 9px 10px;
681   - height:18px;
682   -
683   - .options {
684   - float:right;
685   - margin-top: -5px;
686   - }
687   -
688   - .file_name {
689   - color:$style_color;
690   - font-size:14px;
691   - text-shadow: 0 1px 1px #fff;
692   - small {
693   - color:#999;
694   - font-size:13px;
695   - }
696   - }
697   - }
698   - .file_content {
699   - background:#fff;
700   - font-size: 11px;
701   -
702   - &.wiki {
703   - font-size: 13px;
704   - code {
705   - padding:0 4px;
706   - }
707   - padding:20px;
708   - h1, h2 {
709   - line-height: 46px;
710   - }
711   - h3, h4 {
712   - line-height: 40px;
713   - }
714   - }
715   -
716   - &.image_file {
717   - background:#eee;
718   - text-align:center;
719   - img {
720   - padding:100px;
721   - max-width:300px;
722   - }
723   - }
724   -
725   - &.blob_file {
726   -
727   - }
728   -
729   - /**
730   - * Blame file
731   - */
732   - &.blame {
733   - tr {
734   - border-bottom: 1px solid #eee;
735   - }
736   - td {
737   - padding:5px;
738   - }
739   - .author,
740   - .blame_commit {
741   - background:#f5f5f5;
742   - vertical-align:top;
743   - }
744   - .lines {
745   - pre {
746   - padding:0;
747   - margin:0;
748   - background:none;
749   - border:none;
750   - }
751   - }
752   - }
753   -
754   - &.logs {
755   - background:#eee;
756   - max-height: 700px;
757   - overflow-y: auto;
758   -
759   - ol {
760   - margin-left:40px;
761   - padding: 10px 0;
762   - border-left: 1px solid #CCC;
763   - margin-bottom:0;
764   - background: white;
765   - li {
766   - color:#888;
767   - p {
768   - margin:0;
769   - color:#333;
770   - line-height:24px;
771   - padding-left: 10px;
772   - }
773   -
774   - &:hover {
775   - background:$hover;
776   - }
777   - }
778   - }
779   - }
780   -
781   - /**
782   - * Code file
783   - */
784   - &.code {
785   - padding:0;
786   - td.code {
787   - width: 100%;
788   - .highlight {
789   - margin-left: 55px;
790   - overflow:auto;
791   - overflow-y:hidden;
792   - }
793   - }
794   - .highlight pre {
795   - white-space: pre;
796   - word-wrap:normal;
797   - }
798   -
799   - table.highlighttable {
800   - border: none;
801   - }
802   - body.project-page table.highlighttable td { border: none }
803   - table.highlighttable tr:hover { background:none;}
804   -
805   - table.highlighttable pre{
806   - line-height:16px !important;
807   - font-size:12px !important;
808   - }
809   -
810   - table.highlighttable .linenodiv pre {
811   - text-align: right;
812   - padding-right: 4px;
813   - color:#666;
814   - }
815   - }
816   - }
817   -}
app/assets/stylesheets/gitlab_bootstrap/blocks.scss 0 → 100644
  Diff comments   View file @1dd938d
... ... @@ -0,0 +1,145 @@
  1 +/**
  2 + * ===================================
  3 + * Contain 3 main UI block elements:
  4 + * .main_box - for show pages
  5 + * .ui-box - for simple block & widgets
  6 + * ===================================
  7 + */
  8 +
  9 +/**
  10 + * UI box element
  11 + * contains top, middle, bottom blocks
  12 + *
  13 + */
  14 +.main_box {
  15 + @extend .borders;
  16 + @extend .prepend-top-20;
  17 + @extend .append-bottom-20;
  18 + border-width:1px;
  19 + @include solid_shade;
  20 +
  21 +
  22 + img { max-width: 100%; }
  23 +
  24 + pre {
  25 + code {
  26 + background: none !important;
  27 + }
  28 + }
  29 +
  30 + .top_box_content,
  31 + .middle_box_content,
  32 + .bottom_box_content {
  33 + padding:15px;
  34 +
  35 + pre {
  36 + background: none !important;
  37 + margin:0;
  38 + border:none;
  39 + padding:0;
  40 + }
  41 + }
  42 +
  43 + .middle_box_content {
  44 + border-radius:0;
  45 + border:none;
  46 + font-size:12px;
  47 + background-color:#f5f5f5;
  48 + border:none;
  49 + border-top:1px solid #eee;
  50 + }
  51 +
  52 + .bottom_box_content {
  53 + border-top:1px solid #eee;
  54 + }
  55 +}
  56 +
  57 +/**
  58 + * Big UI Block for show page content
  59 + *
  60 + */
  61 +.ui-box {
  62 + background:#F9F9F9;
  63 + margin-bottom: 25px;
  64 + @include round-borders-all(4px);
  65 + border-color: #CCC;
  66 + @include solid_shade;
  67 +
  68 + ul {
  69 + margin:0;
  70 + }
  71 +
  72 + h5, .title {
  73 + padding: 0 10px;
  74 + @include round-borders-top(4px);
  75 + @include bg-gray-gradient;
  76 + border-bottom: 1px solid #bbb;
  77 +
  78 + &.small {
  79 + line-height: 28px;
  80 + font-size: 14px;
  81 + line-height:28px;
  82 + text-shadow: 0 1px 1px white;
  83 + }
  84 +
  85 + form {
  86 + padding:9px 0;
  87 + margin:0px;
  88 + }
  89 +
  90 + .nav-pills {
  91 + li {
  92 + padding:3px 0;
  93 + &.active a { background-color:$style_color; }
  94 + a {
  95 + border-radius:7px;
  96 + }
  97 + }
  98 + }
  99 + }
  100 +
  101 + .bottom {
  102 + @include bg-gray-gradient;
  103 + @include round-borders-bottom(4px);
  104 + border-bottom:none;
  105 + border-top: 1px solid #bbb;
  106 + }
  107 +
  108 + &.padded {
  109 + h5, .title {
  110 + margin: -20px;
  111 + margin-bottom: 0;
  112 + padding: 5px 20px;
  113 + }
  114 + .middle_title {
  115 + background:#f5f5f5;
  116 + margin:20px -20px;
  117 + padding: 0 20px;
  118 + border-top:1px solid #eee;
  119 + border-bottom:1px solid #eee;
  120 + font-size:14px;
  121 + color:#777;
  122 + }
  123 + }
  124 + .row_title {
  125 + font-weight:bold;
  126 + color:#444;
  127 + &:hover {
  128 + color:#444;
  129 + text-decoration:underline;
  130 + }
  131 + }
  132 +
  133 + li, .wll {
  134 + padding:10px;
  135 + &:first-child {
  136 + @include round-borders-top(4px);
  137 + border-top:none;
  138 + }
  139 +
  140 + &:last-child {
  141 + @include round-borders-bottom(4px);
  142 + border:none;
  143 + }
  144 + }
  145 +}
... ...
app/assets/stylesheets/gitlab_bootstrap/buttons.scss 0 → 100644
  Diff comments   View file @1dd938d
... ... @@ -0,0 +1,72 @@
  1 +.btn {
  2 + @include bg-dark-gray-gradient;
  3 + border-color:#aaa;
  4 + &:hover {
  5 + @include bg-gray-gradient;
  6 + border-color:#bbb;
  7 + color:#333;
  8 + }
  9 +
  10 + &.btn-primary {
  11 + background:$link_color;
  12 + border-color: #2A79A3;
  13 + &:hover {
  14 + background:$blue_link;
  15 + color:#fff;
  16 + }
  17 + }
  18 + &.primary {
  19 + @extend .btn-primary;
  20 + }
  21 +
  22 + &.success {
  23 + color: #fff;
  24 + text-shadow: 0 0 1px #111;
  25 + background: #5bb75b;;
  26 + font-weight: bold;
  27 +
  28 + &:hover {
  29 + background-color: #51a351;
  30 + color: #fff;
  31 + }
  32 + }
  33 +
  34 + &.save-btn {
  35 + @extend .wide;
  36 + @extend .primary;
  37 + }
  38 +
  39 + &.cancel-btn {
  40 + float:right;
  41 + }
  42 +
  43 + &.wide {
  44 + padding-left:30px;
  45 + padding-right:30px;
  46 + }
  47 +
  48 + &.danger,
  49 + &.btn-danger {
  50 + color:#fff;
  51 + background: #DA4E49;
  52 + border-color: #BD362F;
  53 +
  54 + &:hover {
  55 + color:#fff;
  56 + background: #EE4E49;
  57 + }
  58 + }
  59 +
  60 + &.danger {
  61 + @extend .btn-danger;
  62 + }
  63 +
  64 + &.small {
  65 + @extend .btn-small;
  66 + }
  67 +
  68 + &.active {
  69 + border-color:#aaa;
  70 + background-color:#ccc;
  71 + }
  72 +}
... ...
app/assets/stylesheets/gitlab_bootstrap/common.scss 0 → 100644
  Diff comments   View file @1dd938d
... ... @@ -0,0 +1,51 @@
  1 +/** COLORS **/
  2 +.cgray { color:gray }
  3 +.cred { color:#D12F19 }
  4 +.cgreen { color:#4a2 }
  5 +.cblack { color:#111 }
  6 +.cdark { color:#444 }
  7 +.cwhite { color:#fff!important }
  8 +.bgred { background:#F2DEDE!important }
  9 +
  10 +/** COMMON CLASSES **/
  11 +.left { float:left }
  12 +.right { float:right!important }
  13 +.width-50p { width:50% }
  14 +.width-49p { width:49% }
  15 +.width-30p { width:30% }
  16 +.width-65p { width:65% }
  17 +.width-100p { width:100% }
  18 +.append-bottom-10 { margin-bottom:10px }
  19 +.append-bottom-20 { margin-bottom:20px }
  20 +.prepend-top-10 { margin-top:10px }
  21 +.prepend-top-20 { margin-top:20px }
  22 +.padded { padding:20px }
  23 +.ipadded { padding:20px!important }
  24 +.lborder { border-left:1px solid #eee }
  25 +.no-padding { padding:0 !important; }
  26 +.underlined { border-bottom: 1px solid #CCC; }
  27 +.no-borders { border:none; }
  28 +.vlink { color: $link_color !important; }
  29 +.borders { border: 1px solid #ccc; @include shade; }
  30 +
  31 +/** PILLS & TABS**/
  32 +.nav-pills a:hover { background-color:#888; }
  33 +.nav-pills .active a { background-color: $style_color; }
  34 +.nav-tabs > li > a, .nav-pills > li > a { color:$style_color; }
  35 +.nav-tabs > .active > a { font-weight:bold; }
  36 +
  37 +/** ALERT MESSAGES **/
  38 +.alert-message { @extend .alert; }
  39 +.alert-messag.success { @extend .alert-success; }
  40 +.alert-message.error { @extend .alert-error; }
  41 +
  42 +/** AVATARS **/
  43 +img.avatar { float:left; margin-right:15px; width:40px; border:1px solid #ddd; padding:1px; }
  44 +img.avatar.s16 { width:16px; height:16px; }
  45 +img.avatar.s24 { width:24px; height:24px; }
  46 +img.avatar.s32 { width:32px; height:32px; }
  47 +img.lil_av { padding-left: 4px; padding-right:3px; }
  48 +
  49 +/** HELPERS **/
  50 +.nothing_here_message { text-align:center; padding:20px; color:#777; }
  51 +p.slead { color:#456; font-size:16px; margin-bottom: 12px; font-weight: 200; line-height: 24px; }
... ...
app/assets/stylesheets/gitlab_bootstrap/files.scss 0 → 100644
  Diff comments   View file @1dd938d
... ... @@ -0,0 +1,156 @@
  1 +/**
  2 + * File content holder
  3 + *
  4 + */
  5 +.file_holder {
  6 + border:1px solid #CCC;
  7 + margin-bottom:1em;
  8 + @include solid_shade;
  9 +
  10 + .file_title {
  11 + border-bottom: 1px solid #bbb;
  12 + @include bg-gray-gradient;
  13 + margin: 0;
  14 + font-weight: normal;
  15 + font-weight: bold;
  16 + text-align: left;
  17 + color: #666;
  18 + padding: 9px 10px;
  19 + height:18px;
  20 +
  21 + .options {
  22 + float:right;
  23 + margin-top: -5px;
  24 + }
  25 +
  26 + .file_name {
  27 + color:$style_color;
  28 + font-size:14px;
  29 + text-shadow: 0 1px 1px #fff;
  30 + small {
  31 + color:#999;
  32 + font-size:13px;
  33 + }
  34 + }
  35 + }
  36 + .file_content {
  37 + background:#fff;
  38 + font-size: 11px;
  39 +
  40 + &.wiki {
  41 + font-size: 13px;
  42 + code {
  43 + padding:0 4px;
  44 + }
  45 + padding:20px;
  46 + h1, h2 {
  47 + line-height: 46px;
  48 + }
  49 + h3, h4 {
  50 + line-height: 40px;
  51 + }
  52 + }
  53 +
  54 + &.image_file {
  55 + background:#eee;
  56 + text-align:center;
  57 + img {
  58 + padding:100px;
  59 + max-width:300px;
  60 + }
  61 + }
  62 +
  63 + &.blob_file {
  64 +
  65 + }
  66 +
  67 + /**
  68 + * Blame file
  69 + */
  70 + &.blame {
  71 + tr {
  72 + border-bottom: 1px solid #eee;
  73 + }
  74 + td {
  75 + padding:5px;
  76 + }
  77 + .author,
  78 + .blame_commit {
  79 + background:#f5f5f5;
  80 + vertical-align:top;
  81 + }
  82 + .lines {
  83 + pre {
  84 + padding:0;
  85 + margin:0;
  86 + background:none;
  87 + border:none;
  88 + }
  89 + }
  90 + }
  91 +
  92 + &.logs {
  93 + background:#eee;
  94 + max-height: 700px;
  95 + overflow-y: auto;
  96 +
  97 + ol {
  98 + margin-left:40px;
  99 + padding: 10px 0;
  100 + border-left: 1px solid #CCC;
  101 + margin-bottom:0;
  102 + background: white;
  103 + li {
  104 + color:#888;
  105 + p {
  106 + margin:0;
  107 + color:#333;
  108 + line-height:24px;
  109 + padding-left: 10px;
  110 + }
  111 +
  112 + &:hover {
  113 + background:$hover;
  114 + }
  115 + }
  116 + }
  117 + }
  118 +
  119 + /**
  120 + * Code file
  121 + */
  122 + &.code {
  123 + padding:0;
  124 + td.code {
  125 + width: 100%;
  126 + .highlight {
  127 + margin-left: 55px;
  128 + overflow:auto;
  129 + overflow-y:hidden;
  130 + }
  131 + }
  132 + .highlight pre {
  133 + white-space: pre;
  134 + word-wrap:normal;
  135 + }
  136 +
  137 + table.highlighttable {
  138 + border: none;
  139 + }
  140 + body.project-page table.highlighttable td { border: none }
  141 + table.highlighttable tr:hover { background:none;}
  142 +
  143 + table.highlighttable pre{
  144 + line-height:16px !important;
  145 + font-size:12px !important;
  146 + }
  147 +
  148 + table.highlighttable .linenodiv pre {
  149 + text-align: right;
  150 + padding-right: 4px;
  151 + color:#666;
  152 + }
  153 + }
  154 + }
  155 +}
  156 +
... ...
app/assets/stylesheets/gitlab_bootstrap/lists.scss 0 → 100644
  Diff comments   View file @1dd938d
... ... @@ -0,0 +1,30 @@
  1 +/** LISTS **/
  2 +
  3 +ul {
  4 + /**
  5 + * List li block element #1
  6 + *
  7 + */
  8 + .wll {
  9 + background-color: #FFF;
  10 + padding: 10px 5px;
  11 + min-height: 20px;
  12 + border-bottom: 1px solid #eee;
  13 + border-bottom: 1px solid rgba(0, 0, 0, 0.05);
  14 +
  15 + &.smoke { background-color:#f5f5f5; }
  16 + &:hover { background:$hover; }
  17 + &:last-child { border:none }
  18 + .author { color: #999; }
  19 +
  20 + p {
  21 + padding-top:5px;
  22 + margin:0;
  23 + color:#222;
  24 + img {
  25 + position:relative;
  26 + top:3px;
  27 + }
  28 + }
  29 + }
  30 +}
... ...
app/assets/stylesheets/gitlab_bootstrap/tables.scss 0 → 100644
  Diff comments   View file @1dd938d
... ... @@ -0,0 +1,41 @@
  1 +table {
  2 + width:100%;
  3 + th {
  4 + padding-top: 9px;
  5 + font-weight: bold;
  6 + vertical-align: middle;
  7 + }
  8 + th, td {
  9 + padding: 10px 10px 9px;
  10 + line-height: 18px;
  11 + text-align: left;
  12 + }
  13 +
  14 + &.bordered-table {
  15 + border: 1px solid #DDD;
  16 + border-collapse: separate;
  17 + -webkit-border-radius: 4px;
  18 + -moz-border-radius: 4px;
  19 + border-radius: 4px;
  20 + }
  21 +
  22 + &.zebra-striped {
  23 + @extend .table-striped;
  24 + }
  25 +}
  26 +
  27 +table.admin-table {
  28 + @extend .table-bordered;
  29 + @extend .zebra-striped;
  30 + @include solid_shade;
  31 + th {
  32 + border-color: #CCC;
  33 + border-bottom: 1px solid #bbb;
  34 + @include bg-gray-gradient;
  35 + }
  36 +}
  37 +
  38 +table.no-borders {
  39 + border:none;
  40 + tr, td { border:none }
  41 +}
... ...
app/assets/stylesheets/gitlab_bootstrap/typography.scss 0 → 100644
  Diff comments   View file @1dd938d
... ... @@ -0,0 +1,71 @@
  1 +/**
  2 + * Headers
  3 + *
  4 + */
  5 +h3, h4, h5, h6 { line-height: 36px; }
  6 +h5 { font-size:14px; }
  7 +h3.page_title {
  8 + color:#456;
  9 + font-size:20px;
  10 + font-weight: normal;
  11 + line-height: 28px;
  12 +}
  13 +
  14 +/** CODE **/
  15 +pre {
  16 + font-family:'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace;
  17 +
  18 + &.dark {
  19 + background: #333;
  20 + color:#f5f5f5;
  21 + }
  22 +}
  23 +
  24 +/**
  25 + * Links
  26 + *
  27 + */
  28 +a {
  29 + outline: none;
  30 + color: $link_color;
  31 + &:hover {
  32 + text-decoration:none;
  33 + color: $blue_link;
  34 + }
  35 +
  36 + &.btn {
  37 + color: $style_color;
  38 + &:hover {
  39 + color: $style_color;
  40 + }
  41 + }
  42 +
  43 + &.dark {
  44 + color: $style_color;
  45 + }
  46 +
  47 + &.lined {
  48 + text-decoration:underline;
  49 + &:hover { text-decoration:underline; }
  50 + }
  51 +
  52 + &.gray {
  53 + color:gray;
  54 + }
  55 +
  56 + &.supp_diff_link {
  57 + text-align:center;
  58 + padding:20px 0;
  59 + background:#f1f1f1;
  60 + width:100%;
  61 + float:left;
  62 + }
  63 +
  64 + &.neib {
  65 + margin-right:15px;
  66 + }
  67 +}
  68 +
  69 +a:focus {
  70 + outline: none;
  71 +}
... ...
app/assets/stylesheets/main.scss
  Diff comments   View file @1dd938d
... ... @@ -2,24 +2,8 @@
2 2 @import "bootstrap-responsive";
3 3  
4 4 /** GITLAB colors **/
5   -$text_color:#222;
6   -$lite_text_color: #666;
7 5 $link_color:#2A79A3;
8   -$active_link_color:#2FA0BB;
9   -$active_bg_color:#79C3E0;
10   -$active_bd_color: #2FA0BB;
11   -$border_color:#CCC;
12   -$lite_border_color:#EEE;
13   -$min_app_width:980px;
14   -$max_app_width:980px;
15   -$app_padding:20px;
16   -$bg_color: #FFF;
17   -$styled_border_color: #2FA0BB;
18   -$color: "#4BB8D2";
19 6 $blue_link: #2fa0bb;
20   -
21   -
22   -/** Style colors **/
23 7 $style_color: #474D57;
24 8 $hover: #FDF5D9;
25 9  
... ... @@ -80,6 +64,13 @@ $hover: #FDF5D9;
80 64 background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
81 65 }
82 66  
  67 +@mixin bg-dark-gray-gradient {
  68 + background:#eee;
  69 + background-image: -webkit-linear-gradient(#e9e9e9, #d7d7d7);
  70 + background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7);
  71 + background-image: -o-linear-gradient(#e9e9e9, #d7d7d7);
  72 +}
  73 +
83 74 /**
84 75 * Header of application.
85 76 * Contain application logo, search panel, profile icon
... ... @@ -119,7 +110,13 @@ $hover: #FDF5D9;
119 110 * Overrides some styles of twitter bootstrap.
120 111 * Also give some common classes for gitlab app
121 112 */
122   -@import "gitlab_bootstrap.scss";
  113 +@import "gitlab_bootstrap/common.scss";
  114 +@import "gitlab_bootstrap/typography.scss";
  115 +@import "gitlab_bootstrap/buttons.scss";
  116 +@import "gitlab_bootstrap/blocks.scss";
  117 +@import "gitlab_bootstrap/files.scss";
  118 +@import "gitlab_bootstrap/tables.scss";
  119 +@import "gitlab_bootstrap/lists.scss";
123 120  
124 121  
125 122 /**
... ...
app/assets/stylesheets/projects.css.scss
View file @35fbc4d
... ... @@ -1,385 +0,0 @@
1   -.git_url_wrapper { margin-right:50px }
2   -
3   -.sidebar aside a{
4   - display: block;
5   - position: relative;
6   - padding: 15px 10px;
7   - margin: 10px 0 0 0;
8   -
9   - font-size:13px;
10   - font-weight:bold;
11   - color:#333;
12   -
13   - &.current {
14   - color: white;
15   - background: $active_bg_color;
16   - border: 1px solid $active_bd_color;
17   - border-radius:5px;
18   -
19   - -webkit-border-top-right-radius: 0;
20   - -webkit-border-bottom-right-radius: 0;
21   - -moz-border-radius-topright: 0px;
22   - -moz-border-radius-bottomright: 0px;
23   - border-top-right-radius: 0;
24   - border-bottom-right-radius: 0;
25   - margin-right: -1px;
26   - }
27   -}
28   -
29   -body table .commit a{color: #{$blue_link}}
30   -body table th, body table td{ border-bottom: 1px solid #DEE2E3;}
31   -body .fixed{position: fixed; }
32   -
33   -/** File stat **/
34   -.file_stats {
35   - span {
36   - img {
37   - width:14px;
38   - float:left;
39   - margin-right: 6px;
40   - padding:2px 0;
41   - }
42   - }
43   -}
44   -
45   -.round-borders {
46   - @include round-borders-all(4px);
47   - padding: 4px 0px;
48   -}
49   -
50   -table.round-borders {
51   - float:left;
52   - text-align: left;
53   -}
54   -
55   -
56   -
57   -/** PROJECTS **/
58   -input.ssh_project_url {
59   - padding:5px;
60   - margin:0px;
61   - float:right;
62   - width:400px;
63   - text-align:center;
64   -}
65   -
66   -#projects-list .project {
67   - height:50px;
68   -}
69   -
70   -#tree-slider .tree-item,
71   -#projects-list .project,
72   -#snippets-table .snippet,
73   -#issues-table .issue{
74   - cursor:pointer;
75   -}
76   -
77   -.clear {
78   - clear: both;
79   -}
80   -
81   -
82   -
83   -#user_projects_limit{
84   - width: 60px;
85   -}
86   -
87   -.handle:hover{
88   - cursor: move;
89   -}
90   -
91   -.project-refs-form {
92   - span {
93   - background: none !important;
94   - position:static !important;
95   - width:auto !important;
96   - height: auto !important;
97   - }
98   -}
99   -
100   -.project-refs-select {
101   - width:200px;
102   -}
103   -
104   -.filter .left { margin-right:15px; }
105   -
106   -body table .commit {
107   - a.tree-commit-link {
108   - color:#444;
109   - &:hover {
110   - text-decoration:underline;
111   - }
112   - }
113   -}
114   -
115   -/** NEW PROJECT **/
116   -.new-project-hodler {
117   - .icon span { background-position: -31px -70px; }
118   - td { border-bottom: 1px solid #DEE2E3; }
119   -}
120   -
121   -/** Feed entry **/
122   -.commit,
123   -.snippet,
124   -.message {
125   - .title {
126   - color:#666;
127   - a { color:#666 !important; }
128   - p { margin-top:0px; }
129   - }
130   - .author { color: #999 }
131   -}
132   -
133   -/** JQuery UI **/
134   -.ui-autocomplete { @include round-borders-all(5px); }
135   -.ui-menu-item { cursor: pointer }
136   -.ui-selectmenu{
137   - @include round-borders-all(4px);
138   - margin-right:10px;
139   - font-size:1.5em;
140   - height:auto;
141   - font-weight:bold;
142   - .ui-selectmenu-status {
143   - padding:3px 10px;
144   - }
145   -}
146   -
147   -#holder {
148   - background:#FAFAFA;
149   - border: 1px solid #EEE;
150   - cursor: move;
151   - height: 70%;
152   - overflow: hidden;
153   -}
154   -
155   -/* Project Dashboard Page */
156   -html, body { height: 100%; }
157   -
158   -.news-feed h2{float: left;}
159   -.news-feed .project-updates {margin-bottom: 20px; display: block; width: 100%;}
160   -.news-feed .project-updates .data{ padding: 0}
161   -.news-feed .project-updates a.project-update {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
162   -.news-feed .project-updates a.project-update:last-child{border-bottom: 0}
163   -.news-feed .project-updates a.project-update img{float: left; margin-right: 10px;}
164   -.news-feed .project-updates a.project-update span.update-title, .dashboard-page .news-feed .project-updates li a span.update-author{display: block;}
165   -.news-feed .project-updates a.project-update span.update-title{margin-bottom: 10px}
166   -.news-feed .project-updates a.project-update span.update-author{color: #999; font-weight: normal; font-style: italic;}
167   -.news-feed .project-updates a.project-update span.update-author strong{font-weight: bold; font-style: normal;}
168   -/* eo Dashboard Page */
169   -
170   -
171   -/** Update entry **/
172   -.update-data { padding: 0 }
173   -.update-data { width:100%; }
174   -.update-data.ui-box .data { padding:0; }
175   -a.update-item {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
176   -a.update-item:last-child{border-bottom: 0}
177   -a.update-item img{float: left; margin-right: 10px;}
178   -a.update-item span.update-title, .dashboard-page .news-feed .project-updates li a span.update-author{display: block;}
179   -a.update-item span.update-title{margin-bottom: 10px}
180   -a.update-item span.update-author{color: #999; font-weight: normal; font-style: italic;}
181   -a.update-item span.update-author strong{font-weight: bold; font-style: normal;}
182   -
183   -
184   -body .team_member_new .span-6, .team_member_edit .span-6{ padding:10px 0; }
185   -
186   -body.projects-page input.text.git-url.project_list_url { width:165px; }
187   -
188   -
189   -body table.no-borders th {
190   - background:none;
191   - border-bottom:1px solid #CCC;
192   - color:#333;
193   -}
194   -
195   -body table.no-borders tr,
196   -body table.no-borders td{
197   - border:none;
198   -}
199   -
200   -.ajax-tab-loading {
201   - padding:40px;
202   - display:none;
203   -}
204   -
205   -#tree-content-holder { float:left; width:100%; }
206   -
207   -#tree-readme-holder {
208   - float:left;
209   - width:100%;
210   -
211   - .readme {
212   - @include round-borders-all(4px);
213   - padding: 4px 15px;
214   - background:#F7F7F7;
215   - }
216   -}
217   -
218   -
219   -
220   -/* Commit Page */
221   -.entity-info {float: right;}
222   -.entity-button{
223   - background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.192, #fff), to(#f4f4f4));
224   - background-image: -webkit-linear-gradient(#fff 19.2%, #f4f4f4);
225   - background-image: -moz-linear-gradient(#fff 19.2%, #f4f4f4);
226   - background-image: -o-linear-gradient(#fff 19.2%, #f4f4f4);
227   - box-shadow: 0 -1px 0 white inset;
228   - display: block;
229   - border: 1px solid #eee;
230   - border-radius: 5px;
231   - margin-bottom: 2px;
232   - position: relative;
233   - padding: 4px 10px;
234   - font-size: 11px;
235   - padding-right: 20px;
236   -}
237   -
238   -.entity-button i{
239   - background: url('images.png') no-repeat -138px -27px;
240   - width: 6px;
241   - height: 9px;
242   - float: right;
243   - position: absolute;
244   - top: 6px;
245   - right: 5px;
246   -}
247   -.box-arrow{float: right; background: #E3E5EA; padding: 10px; border-radius: 5px; margin-top: 2px; text-shadow: none; color: #999; margin: 1.5em 0;}
248   -
249   -h4.dash-tabs {
250   - margin: 0;
251   - border-bottom: 1px solid #ccc;
252   - padding: 10px 10px;
253   - font-size: 11px;
254   - padding-left:20px;
255   - font-weight: bold; text-transform: uppercase;
256   - background: #F7F7F7;
257   - margin-bottom:20px;
258   - height:13px;
259   -
260   -}
261   -
262   -.dash-button {
263   - border-right: 1px solid #ddd;
264   - background:none;
265   - padding: 10px 15px;
266   - float:left;
267   - position:relative;
268   - top:-10px;
269   - left:0px;
270   - height:13px;
271   -
272   - &:first-child {
273   - border-left: 1px solid #ddd;
274   - }
275   - &.active {
276   - background: #eaeaea;
277   - }
278   -}
279   -
280   -
281   -.dashboard-loader {
282   - float:right;
283   - margin-right:30px;
284   - display:none;
285   -}
286   -
287   -
288   -.merge-tabs {
289   - margin: 0;
290   - border: 1px solid #ccc;
291   - padding: 5px;
292   - font-size: 12px;
293   - background: #F7F7F7;
294   - margin-bottom:20px;
295   - height:26px;
296   -
297   - -moz-border-radius: 4px;
298   - -webkit-border-radius: 4px;
299   - border-radius: 4px;
300   -
301   - .tab {
302   - font-weight: bold;
303   - border-right: 1px solid #ddd;
304   - background:none;
305   - padding: 10px;
306   - min-width:60px;
307   - float:left;
308   - position:relative;
309   - top:-5px;
310   - left:-5px;
311   - height:16px;
312   - padding-left:34px;
313   -
314   - span {
315   - width: 20px;
316   - height: 20px;
317   - display: inline-block;
318   - position: absolute;
319   - left: 8px;
320   - top: 8px;
321   - }
322   -
323   - &.active {
324   - background: #eaeaea;
325   - }
326   - }
327   -}
328   -.merge-tabs.repository .tab span{ background: url("images.png") no-repeat -38px -77px; }
329   -.activities-tab span { background: url("images.png") no-repeat -161px -1px; }
330   -.stat-tab span,
331   -.team-tab span,
332   -.snippets-tab span { background: url("images.png") no-repeat -38px -77px; }
333   -.files-tab span { background: url("images.png") no-repeat -112px -23px; }
334   -
335   -.merge-notes-tab span { background: url("images.png") no-repeat -161px -1px; }
336   -.merge-commits-tab span { background: url("images.png") no-repeat -86px 1px; }
337   -.merge-diffs-tab span { background: url("images.png") no-repeat -118px 1px; }
338   -.merge-tabs .dashboard-loader { padding:8px; }
339   -
340   -.user-mention {
341   - color: #2FA0BB;
342   - font-weight: bold;
343   -}
344   -
345   -.author {
346   - color: #999;
347   -}
348   -
349   -
350   -
351   -
352   -.dark_scheme_box {
353   - padding:20px 0;
354   -
355   - label {
356   - float:left;
357   - box-shadow: 0 0px 5px rgba(0,0,0,.3);
358   -
359   - img {
360   - }
361   - }
362   -}
363   -
364   -a.project-update.titled {
365   - position: relative;
366   - padding-left: 235px !important;
367   -
368   - .title-block {
369   - padding: 10px;
370   - width: 205px;
371   - position: absolute;
372   - left: 0;
373   - top: 0;
374   - }
375   -}
376   -
377   -.add_new {
378   - float: right;
379   - background: #A6B807;
380   - color: white;
381   - padding: 4px 10px;
382   - @include round-borders-all(4px);
383   - font-size:11px;
384   - margin: 10px 0;
385   -}
app/assets/stylesheets/sections/commits.scss
  Diff comments   View file @1dd938d
... ... @@ -207,3 +207,8 @@
207 207 font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace;
208 208 }
209 209 }
  210 +
  211 +.diff_file_header a,
  212 +.file_stats a {
  213 + color:$style_color;
  214 +}
... ...
app/assets/stylesheets/sections/merge_requests.scss
  Diff comments   View file @1dd938d
... ... @@ -99,3 +99,14 @@ li.merge_request {
99 99 @extend .padded;
100 100 @extend .append-bottom-10;
101 101 }
  102 +
  103 +.label_branch {
  104 + @include round-borders-all(4px);
  105 + padding:2px 4px;
  106 + border:none;
  107 + font-size:13px;
  108 + background: #474D57;
  109 + color:#fff;
  110 + font-weight:bold;
  111 + font-family: monospace;
  112 +}
... ...
app/views/keys/_form.html.haml
  Diff comments   View file @1dd938d
... ... @@ -19,6 +19,6 @@
19 19  
20 20  
21 21 .actions
22   - = f.submit 'Save', class: "primary btn"
23   - = link_to "Cancel", keys_path, class: "btn"
  22 + = f.submit 'Save', class: "btn save-btn"
  23 + = link_to "Cancel", keys_path, class: "btn cancel-btn"
24 24  
... ...
app/views/merge_requests/show/_mr_title.html.haml
  Diff comments   View file @1dd938d
1 1 %h3.page_title
2 2 = "Merge Request ##{@merge_request.id}:"
3 3  
4   - %span.pretty_label.branch= @merge_request.source_branch
  4 + %span.label_branch= @merge_request.source_branch
5 5 →
6   - %span.pretty_label.branch= @merge_request.target_branch
  6 + %span.label_branch= @merge_request.target_branch
7 7  
8 8 %span.right
9 9 - if @merge_request.merged?
... ...
app/views/profile/password.html.haml
  Diff comments   View file @1dd938d
... ... @@ -16,4 +16,4 @@
16 16 = f.label :password_confirmation
17 17 .input= f.password_field :password_confirmation
18 18 .actions
19   - = f.submit 'Save', class: "btn primary"
  19 + = f.submit 'Save', class: "btn save-btn"
... ...
app/views/profile/show.html.haml
  Diff comments   View file @1dd938d
... ... @@ -67,4 +67,4 @@
67 67 = link_to "Add Public Key", new_key_path, class: "btn small right"
68 68  
69 69 .form-actions
70   - = f.submit 'Save', class: "btn-primary btn"
  70 + = f.submit 'Save', class: "btn save-btn"
... ...