Download as
Browse Code »

Commit 83f2a387d68ca055e83ed2cfb61cc329e0bda2d1

Authored by Dmitriy Zaporozhets
2 parents 1d889a79 1481bae5
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #2117 from koenpunt/scss-cleanup 

Scss cleanup
Showing 31 changed files with 828 additions and 849 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @83f2a38
1 /** LAYOUT **/ 1 /** LAYOUT **/
2 2
3 body { 3 body {
4 - margin-bottom:20px; 4 + margin-bottom: 20px;
5 } 5 }
6 6
7 .container { 7 .container {
8 - padding-top:0;  
9 - z-index:5; 8 + padding-top: 0;
  9 + z-index: 5;
10 } 10 }
11 11
12 .container .content { 12 .container .content {
13 - margin:0 0; 13 + margin: 0 0;
14 } 14 }
15 15
16 .container .sidebar { 16 .container .sidebar {
17 width: 200px; 17 width: 200px;
18 - height:100%;  
19 - min-height:450px;  
20 - float:right; 18 + height: 100%;
  19 + min-height: 450px;
  20 + float: right;
21 } 21 }
22 22
23 23
@@ -29,25 +29,25 @@ body { @@ -29,25 +29,25 @@ body {
29 .help li { color:#111 } 29 .help li { color:#111 }
30 30
31 .back_link { 31 .back_link {
32 - text-decoration:underline;  
33 - font-size:14px;  
34 - font-weight:bold;  
35 - padding:10px 0;  
36 - padding-bottom:0; 32 + text-decoration: underline;
  33 + font-size: 14px;
  34 + font-weight: bold;
  35 + padding: 10px 0;
  36 + padding-bottom: 0;
37 } 37 }
38 38
39 .info_link { 39 .info_link {
40 - margin-right:5px;  
41 - float:left; 40 + margin-right: 5px;
  41 + float: left;
42 42
43 img { 43 img {
44 - width:20px; 44 + width: 20px;
45 } 45 }
46 } 46 }
47 47
48 .download_repo_link { 48 .download_repo_link {
49 background: url("images.png") no-repeat 0 -48px; 49 background: url("images.png") no-repeat 0 -48px;
50 - padding-left:20px; 50 + padding-left: 20px;
51 } 51 }
52 52
53 table a code { 53 table a code {
@@ -61,32 +61,32 @@ table a code { @@ -61,32 +61,32 @@ table a code {
61 } 61 }
62 62
63 .loading { 63 .loading {
64 - margin:20px auto; 64 + margin: 20px auto;
65 background: url(ajax_loader.gif) no-repeat center center; 65 background: url(ajax_loader.gif) no-repeat center center;
66 - width:40px;  
67 - height:40px; 66 + width: 40px;
  67 + height: 40px;
68 } 68 }
69 69
70 /** FLASH message **/ 70 /** FLASH message **/
71 #flash_container { 71 #flash_container {
72 - height:50px;  
73 - position:fixed;  
74 - z-index:10001;  
75 - top:0px;  
76 - width:100%;  
77 - margin-bottom:15px;  
78 - overflow:hidden;  
79 - background:white;  
80 - cursor:pointer;  
81 - border-bottom:1px solid #ccc; 72 + height: 50px;
  73 + position: fixed;
  74 + z-index: 10001;
  75 + top: 0px;
  76 + width: 100%;
  77 + margin-bottom: 15px;
  78 + overflow: hidden;
  79 + background: white;
  80 + cursor: pointer;
  81 + border-bottom: 1px solid #ccc;
82 82
83 h4 { 83 h4 {
84 - color:#666;  
85 - font-size:18px;  
86 - line-height:38px;  
87 - padding-top:5px;  
88 - margin:2px;  
89 - font-weight:normal; 84 + color: #666;
  85 + font-size: 18px;
  86 + line-height: 38px;
  87 + padding-top: 5px;
  88 + margin: 2px;
  89 + font-weight: normal;
90 } 90 }
91 } 91 }
92 92
@@ -95,39 +95,39 @@ table a code { @@ -95,39 +95,39 @@ table a code {
95 } 95 }
96 96
97 .handle:hover { 97 .handle:hover {
98 - cursor:move; 98 + cursor: move;
99 } 99 }
100 100
101 span.update-author { 101 span.update-author {
102 - display:block; 102 + display: block;
103 } 103 }
104 span.update-author { 104 span.update-author {
105 - color:#999;  
106 - font-weight:normal;  
107 - font-style:italic; 105 + color: #999;
  106 + font-weight: normal;
  107 + font-style: italic;
108 } 108 }
109 span.update-author strong { 109 span.update-author strong {
110 - font-weight:bold; 110 + font-weight: bold;
111 font-style: normal; 111 font-style: normal;
112 } 112 }
113 113
114 /** UPDATE ITEM **/ 114 /** UPDATE ITEM **/
115 span.update-author { 115 span.update-author {
116 - display:block; 116 + display: block;
117 } 117 }
118 /** END UPDATE ITEM **/ 118 /** END UPDATE ITEM **/
119 .dashboard-loader { 119 .dashboard-loader {
120 - float:left;  
121 - margin:10px;  
122 - display:none; 120 + float: left;
  121 + margin: 10px;
  122 + display: none;
123 } 123 }
124 .user-mention { 124 .user-mention {
125 - color:#2FA0BB;  
126 - font-weight:bold; 125 + color: #2FA0BB;
  126 + font-weight: bold;
127 } 127 }
128 128
129 .neib { 129 .neib {
130 - margin-right:10px; 130 + margin-right: 10px;
131 } 131 }
132 132
133 .label { 133 .label {
@@ -136,9 +136,9 @@ span.update-author { @@ -136,9 +136,9 @@ span.update-author {
136 &.label-tag { 136 &.label-tag {
137 background: none; 137 background: none;
138 border: none; 138 border: none;
139 - padding:4px 6px;  
140 - color:#444;  
141 - text-shadow:0 0 1px #fff; 139 + padding: 4px 6px;
  140 + color: #444;
  141 + text-shadow: 0 0 1px #fff;
142 142
143 &.grouped { 143 &.grouped {
144 float: left; 144 float: left;
@@ -149,9 +149,9 @@ span.update-author { @@ -149,9 +149,9 @@ span.update-author {
149 &.label-issue { 149 &.label-issue {
150 background-color: #eee; 150 background-color: #eee;
151 border: 1px solid #ccc; 151 border: 1px solid #ccc;
152 - padding:4px 6px;  
153 - color:#444;  
154 - text-shadow:0 0 1px #fff; 152 + padding: 4px 6px;
  153 + color: #444;
  154 + text-shadow: 0 0 1px #fff;
155 155
156 &.grouped { 156 &.grouped {
157 float: left; 157 float: left;
@@ -201,21 +201,21 @@ form { @@ -201,21 +201,21 @@ form {
201 201
202 202
203 .field_with_errors { 203 .field_with_errors {
204 - display:inline; 204 + display: inline;
205 } 205 }
206 206
207 ul.breadcrumb { 207 ul.breadcrumb {
208 - background:white;  
209 - border:none; 208 + background: white;
  209 + border: none;
210 li { 210 li {
211 display: inline; 211 display: inline;
212 text-shadow: 0 1px 0 white 212 text-shadow: 0 1px 0 white
213 } 213 }
214 214
215 a { 215 a {
216 - color:#474D57;  
217 - font-weight:bold;  
218 - font-size:14px; 216 + color: #474D57;
  217 + font-weight: bold;
  218 + font-size: 14px;
219 } 219 }
220 220
221 .arrow { 221 .arrow {
@@ -225,31 +225,31 @@ ul.breadcrumb { @@ -225,31 +225,31 @@ ul.breadcrumb {
225 float: left; 225 float: left;
226 position: relative; 226 position: relative;
227 left: -10px; 227 left: -10px;
228 - padding:0;  
229 - margin:0; 228 + padding: 0;
  229 + margin: 0;
230 } 230 }
231 } 231 }
232 232
233 input[type=text] { 233 input[type=text] {
234 &.large_text { 234 &.large_text {
235 - padding:6px;  
236 - font-size:16px; 235 + padding: 6px;
  236 + font-size: 16px;
237 } 237 }
238 } 238 }
239 239
240 input.git_clone_url { 240 input.git_clone_url {
241 - width:325px; 241 + width: 325px;
242 } 242 }
243 243
244 .merge-request-form-holder { 244 .merge-request-form-holder {
245 select { 245 select {
246 - width:300px; 246 + width: 300px;
247 } 247 }
248 } 248 }
249 249
250 /** Issues **/ 250 /** Issues **/
251 #issue_assignee_id { 251 #issue_assignee_id {
252 - width:300px; 252 + width: 300px;
253 } 253 }
254 254
255 #new_issue_dialog textarea{ 255 #new_issue_dialog textarea{
@@ -257,21 +257,21 @@ input.git_clone_url { @@ -257,21 +257,21 @@ input.git_clone_url {
257 } 257 }
258 258
259 .project_list_url { 259 .project_list_url {
260 - width:250px; 260 + width: 250px;
261 background:#fff !important; 261 background:#fff !important;
262 } 262 }
263 263
264 264
265 /** bordered list **/ 265 /** bordered list **/
266 ul.bordered-list { 266 ul.bordered-list {
267 - margin:5px 0px;  
268 - padding:0px; 267 + margin: 5px 0px;
  268 + padding: 0px;
269 li { 269 li {
270 padding: 5px 0; 270 padding: 5px 0;
271 border-bottom: 1px solid #EEE; 271 border-bottom: 1px solid #EEE;
272 overflow: hidden; 272 overflow: hidden;
273 display: block; 273 display: block;
274 - margin:0px; 274 + margin: 0px;
275 } 275 }
276 } 276 }
277 277
@@ -287,10 +287,10 @@ ul.bordered-list li:last-child { border:none } @@ -287,10 +287,10 @@ ul.bordered-list li:last-child { border:none }
287 287
288 li.commit { 288 li.commit {
289 .avatar { 289 .avatar {
290 - width:24px; 290 + width: 24px;
291 top:-5px; 291 top:-5px;
292 - margin-right:10px;  
293 - margin-left:10px; 292 + margin-right: 10px;
  293 + margin-left: 10px;
294 } 294 }
295 295
296 code { 296 code {
@@ -310,7 +310,7 @@ p.time { @@ -310,7 +310,7 @@ p.time {
310 310
311 311
312 .styled_image { 312 .styled_image {
313 - border:2px solid #ddd; 313 + border: 2px solid #ddd;
314 } 314 }
315 315
316 316
@@ -337,29 +337,29 @@ p.time { @@ -337,29 +337,29 @@ p.time {
337 337
338 .leftbar { 338 .leftbar {
339 h5, .title { 339 h5, .title {
340 - padding:5px 10px; 340 + padding: 5px 10px;
341 } 341 }
342 342
343 h4 { 343 h4 {
344 - font-size:14px;  
345 - padding:2px 10px;  
346 - color:#666;  
347 - border-bottom:1px solid #f1f1f1; 344 + font-size: 14px;
  345 + padding: 2px 10px;
  346 + color: #666;
  347 + border-bottom: 1px solid #f1f1f1;
348 } 348 }
349 - a:last-child h4 { border:none; } 349 + a:last-child h4 { border: none; }
350 350
351 a:hover { 351 a:hover {
352 h4 { 352 h4 {
353 - color:#111;  
354 - background:$hover;  
355 - border-color:#CCC; 353 + color: #111;
  354 + background: $hover;
  355 + border-color: #CCC;
356 .ico.project { 356 .ico.project {
357 background-position:-209px -21px; 357 background-position:-209px -21px;
358 } 358 }
359 } 359 }
360 } 360 }
361 .bottom { 361 .bottom {
362 - padding:10px; 362 + padding: 10px;
363 } 363 }
364 } 364 }
365 365
@@ -374,12 +374,12 @@ p.time { @@ -374,12 +374,12 @@ p.time {
374 height: 100%; 374 height: 100%;
375 } 375 }
376 .bar-success { 376 .bar-success {
  377 + @include linear-gradient(#62C462, #51A351);
377 background-color: #468847; 378 background-color: #468847;
378 - @include bg-gradient(#62C462, #51A351);  
379 } 379 }
380 .bar-danger { 380 .bar-danger {
  381 + @include linear-gradient(#EE5F5B, #BD362F);
381 background-color: #B94A48; 382 background-color: #B94A48;
382 - @include bg-gradient(#EE5F5B, #BD362F);  
383 } 383 }
384 } 384 }
385 .upvotes { 385 .upvotes {
@@ -420,17 +420,17 @@ p.time { @@ -420,17 +420,17 @@ p.time {
420 420
421 421
422 .highlight_word { 422 .highlight_word {
423 - background:#EEDC94; 423 + background: #EEDC94;
424 } 424 }
425 425
426 .status_info { 426 .status_info {
427 - font-size:14px;  
428 - padding:5px 15px;  
429 - line-height:24px;  
430 - width:60px;  
431 - text-align:center;  
432 - float:left;  
433 - margin-right:20px; 427 + font-size: 14px;
  428 + padding: 5px 15px;
  429 + line-height: 24px;
  430 + width: 60px;
  431 + text-align: center;
  432 + float: left;
  433 + margin-right: 20px;
434 434
435 &.success { 435 &.success {
436 background: #5BB75B; 436 background: #5BB75B;
@@ -449,12 +449,12 @@ p.time { @@ -449,12 +449,12 @@ p.time {
449 .arrow{ 449 .arrow{
450 background: #E3E5EA; 450 background: #E3E5EA;
451 padding: 5px; 451 padding: 5px;
452 - margin-top:5px;  
453 - border-radius: 5px; 452 + margin-top: 5px;
  453 + @include border-radius(5px);
454 text-shadow: none; 454 text-shadow: none;
455 color: #999; 455 color: #999;
456 line-height: 16px; 456 line-height: 16px;
457 - font-weight:bold; 457 + font-weight: bold;
458 } 458 }
459 459
460 .thin_area{ 460 .thin_area{
@@ -462,19 +462,19 @@ p.time { @@ -462,19 +462,19 @@ p.time {
462 } 462 }
463 463
464 .gitlab_pagination { 464 .gitlab_pagination {
465 - span a { color:$link_color; } 465 + span a { color: $link_color; }
466 .prev, .next, .current, .page a { 466 .prev, .next, .current, .page a {
467 - padding:10px; 467 + padding: 10px;
468 } 468 }
469 .current { 469 .current {
470 - border-bottom:2px solid $style_color; 470 + border-bottom: 2px solid $style_color;
471 } 471 }
472 } 472 }
473 473
474 // Fixes alignment on notes. 474 // Fixes alignment on notes.
475 .new_note { 475 .new_note {
476 label { 476 label {
477 - text-align:left; 477 + text-align: left;
478 } 478 }
479 } 479 }
480 480
@@ -486,7 +486,7 @@ li.note { @@ -486,7 +486,7 @@ li.note {
486 border-bottom:none !important; 486 border-bottom:none !important;
487 } 487 }
488 .file { 488 .file {
489 - padding-left:20px; 489 + padding-left: 20px;
490 background:url("icon-attachment.png") no-repeat left center; 490 background:url("icon-attachment.png") no-repeat left center;
491 } 491 }
492 } 492 }
@@ -494,7 +494,7 @@ li.note { @@ -494,7 +494,7 @@ li.note {
494 494
495 .markdown { 495 .markdown {
496 img { 496 img {
497 - max-width:100%; 497 + max-width: 100%;
498 } 498 }
499 } 499 }
500 500
@@ -504,19 +504,19 @@ li.note { @@ -504,19 +504,19 @@ li.note {
504 504
505 .team_member_show { 505 .team_member_show {
506 td:first-child { 506 td:first-child {
507 - color:#aaa; 507 + color: #aaa;
508 } 508 }
509 } 509 }
510 510
511 .remember_me { 511 .remember_me {
512 - text-align:left; 512 + text-align: left;
513 513
514 input { 514 input {
515 - margin:0; 515 + margin: 0;
516 } 516 }
517 517
518 span { 518 span {
519 - padding-left:5px; 519 + padding-left: 5px;
520 } 520 }
521 } 521 }
522 522
@@ -530,10 +530,10 @@ li.note { @@ -530,10 +530,10 @@ li.note {
530 .data { 530 .data {
531 a { 531 a {
532 h1 { 532 h1 {
533 - line-height:48px;  
534 - font-size:48px;  
535 - padding:20px;  
536 - text-align:center; 533 + line-height: 48px;
  534 + font-size: 48px;
  535 + padding: 20px;
  536 + text-align: center;
537 } 537 }
538 } 538 }
539 } 539 }
@@ -541,12 +541,12 @@ li.note { @@ -541,12 +541,12 @@ li.note {
541 541
542 .rss-icon { 542 .rss-icon {
543 img { 543 img {
544 - width:24px;  
545 - vertical-align:top; 544 + width: 24px;
  545 + vertical-align: top;
546 } 546 }
547 547
548 strong { 548 strong {
549 - line-height:24px; 549 + line-height: 24px;
550 } 550 }
551 } 551 }
552 552
@@ -554,43 +554,43 @@ li.note { @@ -554,43 +554,43 @@ li.note {
554 554
555 /* CHZN reset few styles */ 555 /* CHZN reset few styles */
556 .chzn-container-single .chzn-single { 556 .chzn-container-single .chzn-single {
557 - background:#FFF; 557 + background: #FFF;
558 border: 1px solid #bbb; 558 border: 1px solid #bbb;
559 - box-shadow:none; 559 + box-shadow: none;
560 } 560 }
561 .chzn-container-active .chzn-single { 561 .chzn-container-active .chzn-single {
562 - background:#fff; 562 + background: #fff;
563 } 563 }
564 564
565 565
566 .supp_diff_link, 566 .supp_diff_link,
567 .mr_show_all_commits { 567 .mr_show_all_commits {
568 - cursor:pointer; 568 + cursor: pointer;
569 } 569 }
570 570
571 .merge_request, 571 .merge_request,
572 .issue { 572 .issue {
573 &.today{ 573 &.today{
574 background: #EFE; 574 background: #EFE;
575 - border-color:#CEC; 575 + border-color: #CEC;
576 } 576 }
577 &.closed { 577 &.closed {
578 background: #F5f5f5; 578 background: #F5f5f5;
579 - border-color:#E5E5E5; 579 + border-color: #E5E5E5;
580 } 580 }
581 &.merged { 581 &.merged {
582 background: #F5f5f5; 582 background: #F5f5f5;
583 - border-color:#E5E5E5; 583 + border-color: #E5E5E5;
584 } 584 }
585 } 585 }
586 586
587 .git_error_tips { 587 .git_error_tips {
588 @extend .span6; 588 @extend .span6;
589 - text-align:left;  
590 - margin-top:40px; 589 + text-align: left;
  590 + margin-top: 40px;
591 pre { 591 pre {
592 - background:white;  
593 - border:none; 592 + background: white;
  593 + border: none;
594 font-size: 12px; 594 font-size: 12px;
595 } 595 }
596 } 596 }
@@ -605,15 +605,15 @@ li.note { @@ -605,15 +605,15 @@ li.note {
605 } 605 }
606 606
607 .oauth_select_holder { 607 .oauth_select_holder {
608 - padding:20px; 608 + padding: 20px;
609 img { 609 img {
610 - padding:5px;  
611 - margin-right:10px; 610 + padding: 5px;
  611 + margin-right: 10px;
612 } 612 }
613 .active { 613 .active {
614 img { 614 img {
615 - border:1px solid #ccc;  
616 - background:$hover; 615 + border: 1px solid #ccc;
  616 + background: $hover;
617 @include border-radius(5px); 617 @include border-radius(5px);
618 } 618 }
619 } 619 }
@@ -627,30 +627,30 @@ li.note { @@ -627,30 +627,30 @@ li.note {
627 627
628 .gitlab-promo { 628 .gitlab-promo {
629 a { 629 a {
630 - color:#aaa; 630 + color: #aaa;
631 margin-right: 30px; 631 margin-right: 30px;
632 } 632 }
633 } 633 }
634 634
635 pre { 635 pre {
636 &.clean { 636 &.clean {
637 - background:none;  
638 - border:none;  
639 - margin:0;  
640 - padding:0; 637 + background: none;
  638 + border: none;
  639 + margin: 0;
  640 + padding: 0;
641 } 641 }
642 } 642 }
643 643
644 .milestone .progress { 644 .milestone .progress {
645 margin-bottom: 0; 645 margin-bottom: 0;
646 - margin-top:4px; 646 + margin-top: 4px;
647 } 647 }
648 648
649 .float-link { 649 .float-link {
650 - float:left;  
651 - margin-right:15px; 650 + float: left;
  651 + margin-right: 15px;
652 .s16 { 652 .s16 {
653 - margin-right:5px; 653 + margin-right: 5px;
654 } 654 }
655 } 655 }
656 656
app/assets/stylesheets/fonts.scss 0 → 100644
  Diff comments   View file @83f2a38
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
  1 +@font-face{
  2 + font-family: Korolev;
  3 + src: font-url('korolev-medium-compressed.otf');
  4 +}
  5 +
  6 +/** Typo **/
  7 +$monospace: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono', 'lucida console', monospace;
0 \ No newline at end of file 8 \ No newline at end of file
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
  Diff comments   View file @83f2a38
@@ -15,8 +15,8 @@ @@ -15,8 +15,8 @@
15 @extend .borders; 15 @extend .borders;
16 @extend .prepend-top-20; 16 @extend .prepend-top-20;
17 @extend .append-bottom-20; 17 @extend .append-bottom-20;
18 - border-width:1px;  
19 - @include solid_shade; 18 + border-width: 1px;
  19 + @include solid-shade;
20 20
21 21
22 img { max-width: 100%; } 22 img { max-width: 100%; }
@@ -30,27 +30,27 @@ @@ -30,27 +30,27 @@
30 .top_box_content, 30 .top_box_content,
31 .middle_box_content, 31 .middle_box_content,
32 .bottom_box_content { 32 .bottom_box_content {
33 - padding:15px; 33 + padding: 15px;
34 34
35 pre { 35 pre {
36 background: none !important; 36 background: none !important;
37 - margin:0;  
38 - border:none;  
39 - padding:0; 37 + margin: 0;
  38 + border: none;
  39 + padding: 0;
40 } 40 }
41 } 41 }
42 42
43 .middle_box_content { 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; 44 + @include border-radius(0);
  45 + border: none;
  46 + font-size: 12px;
  47 + background-color: #f5f5f5;
  48 + border: none;
  49 + border-top: 1px solid #eee;
50 } 50 }
51 51
52 .bottom_box_content { 52 .bottom_box_content {
53 - border-top:1px solid #eee; 53 + border-top: 1px solid #eee;
54 } 54 }
55 } 55 }
56 56
@@ -59,44 +59,48 @@ @@ -59,44 +59,48 @@
59 * 59 *
60 */ 60 */
61 .ui-box { 61 .ui-box {
62 - background:#F9F9F9; 62 + background: #F9F9F9;
63 margin-bottom: 25px; 63 margin-bottom: 25px;
64 - @include round-borders-all(4px); 64 +
  65 + border: 1px solid #eaeaea;
  66 + @include border-radius(4px);
  67 +
65 border-color: #CCC; 68 border-color: #CCC;
66 - @include solid_shade; 69 + @include solid-shade;
67 70
68 &.white { 71 &.white {
69 - background:#fff; 72 + background: #fff;
70 } 73 }
71 74
72 ul { 75 ul {
73 - margin:0; 76 + margin: 0;
74 } 77 }
75 78
76 h5, .title { 79 h5, .title {
77 padding: 0 10px; 80 padding: 0 10px;
78 - @include round-borders-top(4px); 81 + @include border-radius(4px 4px 0 0);
79 @include bg-gray-gradient; 82 @include bg-gray-gradient;
  83 + border-top: 1px solid #eaeaea;
80 border-bottom: 1px solid #bbb; 84 border-bottom: 1px solid #bbb;
81 85
82 &.small { 86 &.small {
83 line-height: 28px; 87 line-height: 28px;
84 font-size: 14px; 88 font-size: 14px;
85 - line-height:28px; 89 + line-height: 28px;
86 text-shadow: 0 1px 1px white; 90 text-shadow: 0 1px 1px white;
87 } 91 }
88 92
89 form { 93 form {
90 - padding:9px 0;  
91 - margin:0px; 94 + padding: 9px 0;
  95 + margin: 0px;
92 } 96 }
93 97
94 .nav-pills { 98 .nav-pills {
95 li { 99 li {
96 - padding:3px 0;  
97 - &.active a { background-color:$style_color; } 100 + padding: 3px 0;
  101 + &.active a { background-color: $style_color; }
98 a { 102 a {
99 - border-radius:7px; 103 + @include border-radius(7px);
100 } 104 }
101 } 105 }
102 } 106 }
@@ -104,8 +108,8 @@ @@ -104,8 +108,8 @@
104 108
105 .bottom { 109 .bottom {
106 @include bg-gray-gradient; 110 @include bg-gray-gradient;
107 - @include round-borders-bottom(4px);  
108 - border-bottom:none; 111 + @include border-radius(0 0 4px 4px);
  112 + border-bottom: none;
109 border-top: 1px solid #bbb; 113 border-top: 1px solid #bbb;
110 } 114 }
111 115
@@ -116,38 +120,38 @@ @@ -116,38 +120,38 @@
116 padding: 5px 20px; 120 padding: 5px 20px;
117 } 121 }
118 .middle_title { 122 .middle_title {
119 - background:#f5f5f5; 123 + background: #f5f5f5;
120 margin:20px -20px; 124 margin:20px -20px;
121 padding: 0 20px; 125 padding: 0 20px;
122 - border-top:1px solid #eee;  
123 - border-bottom:1px solid #eee;  
124 - font-size:14px;  
125 - color:#777; 126 + border-top: 1px solid #eee;
  127 + border-bottom: 1px solid #eee;
  128 + font-size: 14px;
  129 + color: #777;
126 } 130 }
127 } 131 }
128 .row_title { 132 .row_title {
129 - font-weight:bold;  
130 - color:#444; 133 + font-weight: bold;
  134 + color: #444;
131 &:hover { 135 &:hover {
132 - color:#444;  
133 - text-decoration:underline; 136 + color: #444;
  137 + text-decoration: underline;
134 } 138 }
135 } 139 }
136 140
137 li, .wll { 141 li, .wll {
138 - padding:10px; 142 + padding: 10px;
139 &:first-child { 143 &:first-child {
140 - @include round-borders-top(4px);  
141 - border-top:none; 144 + @include border-radius(4px 4px 0 0);
  145 + border-top: none;
142 } 146 }
143 147
144 &:last-child { 148 &:last-child {
145 - @include round-borders-bottom(4px);  
146 - border:none; 149 + @include border-radius(0 0 4px 4px);
  150 + border: none;
147 } 151 }
148 } 152 }
149 153
150 .ui-box-body { 154 .ui-box-body {
151 - padding:10px; 155 + padding: 10px;
152 } 156 }
153 } 157 }
app/assets/stylesheets/gitlab_bootstrap/buttons.scss
  Diff comments   View file @83f2a38
1 .btn { 1 .btn {
2 - @include bg-gradient(#f7f7f7, #d5d5d5);  
3 - border-color:#aaa; 2 + @include linear-gradient(#f7f7f7, #d5d5d5);
  3 + border-color: #aaa;
4 &:hover { 4 &:hover {
5 @include bg-gray-gradient; 5 @include bg-gray-gradient;
6 - border-color:#bbb;  
7 - color:#333; 6 + border-color: #bbb;
  7 + color: #333;
8 } 8 }
9 9
10 &.primary { 10 &.primary {
11 - background:#2a79A3;  
12 - @include bg-gradient(#47A7b7, #2585b5); 11 + background: #2a79A3;
  12 + @include linear-gradient(#47A7b7, #2585b5);
13 border-color: #2A79A3; 13 border-color: #2A79A3;
14 - color:#fff; 14 + color: #fff;
15 text-shadow: 0 1px 1px #268; 15 text-shadow: 0 1px 1px #268;
16 &:hover { 16 &:hover {
17 - background:$blue_link;  
18 - color:#fff; 17 + background: $primary_color;
  18 + color: #fff;
19 } 19 }
20 20
21 &.disabled { 21 &.disabled {
22 - color:#fff;  
23 - background:#29B; 22 + color: #fff;
  23 + background: #29B;
24 } 24 }
25 } 25 }
26 26
27 &.btn-info { 27 &.btn-info {
28 - background:#5aB9C3;  
29 - border-color: $blue_link;  
30 - color:#fff; 28 + background: #5aB9C3;
  29 + border-color: $primary_color;
  30 + color: #fff;
31 text-shadow: 0 1px 1px #268; 31 text-shadow: 0 1px 1px #268;
32 &:hover { 32 &:hover {
33 - background:$blue_link;  
34 - color:#fff; 33 + background: $primary_color;
  34 + color: #fff;
35 } 35 }
36 36
37 &.disabled { 37 &.disabled {
38 - color:#fff;  
39 - background:#29B; 38 + color: #fff;
  39 + background: #29B;
40 } 40 }
41 } 41 }
42 42
@@ -49,8 +49,8 @@ @@ -49,8 +49,8 @@
49 } 49 }
50 50
51 &.disabled { 51 &.disabled {
52 - color:#fff;  
53 - background:#2b2; 52 + color: #fff;
  53 + background: #2b2;
54 } 54 }
55 } 55 }
56 56
@@ -60,12 +60,12 @@ @@ -60,12 +60,12 @@
60 } 60 }
61 61
62 &.cancel-btn { 62 &.cancel-btn {
63 - float:right; 63 + float: right;
64 } 64 }
65 65
66 &.wide { 66 &.wide {
67 - padding-left:30px;  
68 - padding-right:30px; 67 + padding-left: 30px;
  68 + padding-right: 30px;
69 } 69 }
70 70
71 &.danger { 71 &.danger {
@@ -73,7 +73,7 @@ @@ -73,7 +73,7 @@
73 border-color: #BD362F; 73 border-color: #BD362F;
74 74
75 &:hover { 75 &:hover {
76 - color:#fff; 76 + color: #fff;
77 background: #EE4E49; 77 background: #EE4E49;
78 } 78 }
79 } 79 }
@@ -87,24 +87,24 @@ @@ -87,24 +87,24 @@
87 } 87 }
88 88
89 &.active { 89 &.active {
90 - border-color:#aaa;  
91 - background-color:#ccc; 90 + border-color: #aaa;
  91 + background-color: #ccc;
92 } 92 }
93 93
94 &.very_small { 94 &.very_small {
95 - font-size:11px;  
96 - padding:2px 6px; 95 + font-size: 11px;
  96 + padding: 2px 6px;
97 line-height: 16px; 97 line-height: 16px;
98 - margin:2px; 98 + margin: 2px;
99 } 99 }
100 100
101 &.grouped { 101 &.grouped {
102 - margin-right:7px;  
103 - float:left; 102 + margin-right: 7px;
  103 + float: left;
104 } 104 }
105 105
106 &.padded { 106 &.padded {
107 - margin-right:3px;  
108 - padding:4px 10px 4px; 107 + margin-right: 3px;
  108 + padding: 4px 10px 4px;
109 } 109 }
110 } 110 }
app/assets/stylesheets/gitlab_bootstrap/common.scss
  Diff comments   View file @83f2a38
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 .lborder { border-left:1px solid #eee } 24 .lborder { border-left:1px solid #eee }
25 .no-padding { padding:0 !important; } 25 .no-padding { padding:0 !important; }
26 .underlined { border-bottom: 1px solid #CCC; } 26 .underlined { border-bottom: 1px solid #CCC; }
27 -.no-borders { border:none; } 27 +.no-borders { border: none; }
28 .vlink { color: $link_color !important; } 28 .vlink { color: $link_color !important; }
29 .underlined_link { text-decoration: underline; } 29 .underlined_link { text-decoration: underline; }
30 .borders { border: 1px solid #ccc; @include shade; } 30 .borders { border: 1px solid #ccc; @include shade; }
@@ -32,32 +32,32 @@ @@ -32,32 +32,32 @@
32 .light { color: #888 } 32 .light { color: #888 }
33 33
34 /** PILLS & TABS**/ 34 /** PILLS & TABS**/
35 -.nav-pills a:hover { background-color:#888; } 35 +.nav-pills a:hover { background-color: #888; }
36 .nav-pills .active a { background-color: $style_color; } 36 .nav-pills .active a { background-color: $style_color; }
37 -.nav-tabs > li > a, .nav-pills > li > a { color:$style_color; } 37 +.nav-tabs > li > a, .nav-pills > li > a { color: $style_color; }
38 .nav.nav-tabs { 38 .nav.nav-tabs {
39 li { 39 li {
40 > a { 40 > a {
41 - padding:8px 20px; 41 + padding: 8px 20px;
42 margin-right: 7px; 42 margin-right: 7px;
43 line-height: 19px; 43 line-height: 19px;
44 border-color: #EEE; 44 border-color: #EEE;
45 - color:#888; 45 + color: #888;
46 border-bottom: 1px solid #ddd; 46 border-bottom: 1px solid #ddd;
47 .badge { 47 .badge {
48 background-color: #eee; 48 background-color: #eee;
49 - color:#888;  
50 - text-shadow:0 1px 1px #fff; 49 + color: #888;
  50 + text-shadow: 0 1px 1px #fff;
51 } 51 }
52 i[class^="icon-"] { 52 i[class^="icon-"] {
53 - line-height:14px; 53 + line-height: 14px;
54 } 54 }
55 } 55 }
56 &.active { 56 &.active {
57 > a { 57 > a {
58 border-color: #CCC; 58 border-color: #CCC;
59 border-bottom: 1px solid #fff; 59 border-bottom: 1px solid #fff;
60 - color:#333; 60 + color: #333;
61 } 61 }
62 } 62 }
63 } 63 }
@@ -69,25 +69,25 @@ @@ -69,25 +69,25 @@
69 .alert-message.error { @extend .alert-error; } 69 .alert-message.error { @extend .alert-error; }
70 70
71 /** AVATARS **/ 71 /** AVATARS **/
72 -img.avatar { float:left; margin-right:12px; width:40px; border:1px solid #ddd; padding:1px; }  
73 -img.avatar.s16 { width:16px; height:16px; margin-right:6px; }  
74 -img.avatar.s24 { width:24px; height:24px; margin-right:8px; }  
75 -img.avatar.s32 { width:32px; height:32px; margin-right:10px; }  
76 -img.lil_av { padding-left: 4px; padding-right:3px; } 72 +img.avatar { float: left; margin-right: 12px; width: 40px; border: 1px solid #ddd; padding: 1px; }
  73 +img.avatar.s16 { width: 16px; height: 16px; margin-right: 6px; }
  74 +img.avatar.s24 { width: 24px; height: 24px; margin-right: 8px; }
  75 +img.avatar.s32 { width: 32px; height: 32px; margin-right: 10px; }
  76 +img.lil_av { padding-left: 4px; padding-right: 3px; }
77 img.small { width: 80px; } 77 img.small { width: 80px; }
78 78
79 /** HELPERS **/ 79 /** HELPERS **/
80 -.nothing_here_message { text-align:center; padding:20px; color:#777; }  
81 -p.slead { color:#456; font-size:16px; margin-bottom: 12px; font-weight: 200; line-height: 24px; } 80 +.nothing_here_message { text-align: center; padding: 20px; color: #777; }
  81 +p.slead { color: #456; font-size: 16px; margin-bottom: 12px; font-weight: 200; line-height: 24px; }
82 82
83 /** FORMS **/ 83 /** FORMS **/
84 input[type='search'].search-text-input { 84 input[type='search'].search-text-input {
85 background-image: url("icon-search.png"); 85 background-image: url("icon-search.png");
86 background-repeat: no-repeat; 86 background-repeat: no-repeat;
87 background-position: 10px; 87 background-position: 10px;
88 - padding-left:25px; 88 + padding-left: 25px;
89 @include border-radius(4px); 89 @include border-radius(4px);
90 - border:1px solid #ccc; 90 + border: 1px solid #ccc;
91 } 91 }
92 92
93 fieldset legend { font-size: 17px; } 93 fieldset legend { font-size: 17px; }
app/assets/stylesheets/gitlab_bootstrap/files.scss
  Diff comments   View file @83f2a38
@@ -3,9 +3,9 @@ @@ -3,9 +3,9 @@
3 * 3 *
4 */ 4 */
5 .file_holder { 5 .file_holder {
6 - border:1px solid #BBB;  
7 - margin-bottom:1em;  
8 - @include solid_shade; 6 + border: 1px solid #BBB;
  7 + margin-bottom: 1em;
  8 + @include solid-shade;
9 9
10 .file_title { 10 .file_title {
11 border-bottom: 1px solid #bbb; 11 border-bottom: 1px solid #bbb;
@@ -16,33 +16,33 @@ @@ -16,33 +16,33 @@
16 text-align: left; 16 text-align: left;
17 color: #666; 17 color: #666;
18 padding: 9px 10px; 18 padding: 9px 10px;
19 - height:18px; 19 + height: 18px;
20 20
21 .options { 21 .options {
22 - float:right; 22 + float: right;
23 margin-top: -5px; 23 margin-top: -5px;
24 } 24 }
25 25
26 .file_name { 26 .file_name {
27 - color:$style_color;  
28 - font-size:14px; 27 + color: $style_color;
  28 + font-size: 14px;
29 text-shadow: 0 1px 1px #fff; 29 text-shadow: 0 1px 1px #fff;
30 small { 30 small {
31 - color:#999;  
32 - font-size:13px; 31 + color: #999;
  32 + font-size: 13px;
33 } 33 }
34 } 34 }
35 } 35 }
36 .file_content { 36 .file_content {
37 - background:#fff; 37 + background: #fff;
38 font-size: 11px; 38 font-size: 11px;
39 39
40 &.wiki { 40 &.wiki {
41 font-size: 13px; 41 font-size: 13px;
42 code { 42 code {
43 - padding:0 4px; 43 + padding: 0 4px;
44 } 44 }
45 - padding:20px; 45 + padding: 20px;
46 h1, h2 { 46 h1, h2 {
47 line-height: 46px; 47 line-height: 46px;
48 } 48 }
@@ -52,11 +52,11 @@ @@ -52,11 +52,11 @@
52 } 52 }
53 53
54 &.image_file { 54 &.image_file {
55 - background:#eee;  
56 - text-align:center; 55 + background: #eee;
  56 + text-align: center;
57 img { 57 img {
58 - padding:100px;  
59 - max-width:300px; 58 + padding: 100px;
  59 + max-width: 300px;
60 } 60 }
61 } 61 }
62 62
@@ -69,60 +69,60 @@ @@ -69,60 +69,60 @@
69 */ 69 */
70 &.blame { 70 &.blame {
71 table { 71 table {
72 - border:none;  
73 - box-shadow:none;  
74 - margin:0; 72 + border: none;
  73 + box-shadow: none;
  74 + margin: 0;
75 } 75 }
76 tr { 76 tr {
77 border-bottom: 1px solid #eee; 77 border-bottom: 1px solid #eee;
78 } 78 }
79 td { 79 td {
80 &:first-child { 80 &:first-child {
81 - border-left:none; 81 + border-left: none;
82 } 82 }
83 &:last-child { 83 &:last-child {
84 - border-right:none; 84 + border-right: none;
85 } 85 }
86 - background:#fff;  
87 - padding:5px; 86 + background: #fff;
  87 + padding: 5px;
88 } 88 }
89 .author, 89 .author,
90 .blame_commit { 90 .blame_commit {
91 - background:#f5f5f5;  
92 - vertical-align:top; 91 + background: #f5f5f5;
  92 + vertical-align: top;
93 } 93 }
94 .lines { 94 .lines {
95 pre { 95 pre {
96 - padding:0;  
97 - margin:0;  
98 - border:none;  
99 - border-radius: 0; 96 + padding: 0;
  97 + margin: 0;
  98 + background: none;
  99 + border: none;
100 } 100 }
101 } 101 }
102 } 102 }
103 103
104 &.logs { 104 &.logs {
105 - background:#eee; 105 + background: #eee;
106 max-height: 700px; 106 max-height: 700px;
107 overflow-y: auto; 107 overflow-y: auto;
108 108
109 ol { 109 ol {
110 - margin-left:40px; 110 + margin-left: 40px;
111 padding: 10px 0; 111 padding: 10px 0;
112 border-left: 1px solid #CCC; 112 border-left: 1px solid #CCC;
113 - margin-bottom:0; 113 + margin-bottom: 0;
114 background: white; 114 background: white;
115 li { 115 li {
116 - color:#888; 116 + color: #888;
117 p { 117 p {
118 - margin:0;  
119 - color:#333;  
120 - line-height:24px; 118 + margin: 0;
  119 + color: #333;
  120 + line-height: 24px;
121 padding-left: 10px; 121 padding-left: 10px;
122 } 122 }
123 123
124 &:hover { 124 &:hover {
125 - background:$hover; 125 + background: $hover;
126 } 126 }
127 } 127 }
128 } 128 }
app/assets/stylesheets/gitlab_bootstrap/lists.scss
  Diff comments   View file @83f2a38
@@ -12,21 +12,21 @@ ul { @@ -12,21 +12,21 @@ ul {
12 border-bottom: 1px solid #eee; 12 border-bottom: 1px solid #eee;
13 border-bottom: 1px solid rgba(0, 0, 0, 0.05); 13 border-bottom: 1px solid rgba(0, 0, 0, 0.05);
14 14
15 - &.smoke { background-color:#f5f5f5; } 15 + &.smoke { background-color: #f5f5f5; }
16 &:hover { 16 &:hover {
17 - background:$hover;  
18 - border-bottom:1px solid #ADF; 17 + background: $hover;
  18 + border-bottom: 1px solid #ADF;
19 } 19 }
20 &:last-child { border:none } 20 &:last-child { border:none }
21 .author { color: #999; } 21 .author { color: #999; }
22 22
23 p { 23 p {
24 padding-top: 1px; 24 padding-top: 1px;
25 - margin:0;  
26 - color:#222; 25 + margin: 0;
  26 + color: #222;
27 img { 27 img {
28 - position:relative;  
29 - top:3px; 28 + position: relative;
  29 + top: 3px;
30 } 30 }
31 } 31 }
32 } 32 }
@@ -35,7 +35,7 @@ ul { @@ -35,7 +35,7 @@ ul {
35 ol, ul { 35 ol, ul {
36 &.styled { 36 &.styled {
37 li { 37 li {
38 - padding:2px; 38 + padding: 2px;
39 } 39 }
40 } 40 }
41 } 41 }
app/assets/stylesheets/gitlab_bootstrap/tables.scss
  Diff comments   View file @83f2a38
1 table { 1 table {
2 @extend .table; 2 @extend .table;
3 @extend .table-striped; 3 @extend .table-striped;
4 - @include solid_shade;  
5 - border:1px solid #bbb;  
6 - width:100%; 4 + @include solid-shade;
  5 + border: 1px solid #bbb;
  6 + width: 100%;
7 7
8 &.low { 8 &.low {
9 td { 9 td {
10 - line-height:18px; 10 + line-height: 18px;
11 } 11 }
12 } 12 }
13 13
@@ -31,8 +31,8 @@ table { @@ -31,8 +31,8 @@ table {
31 } 31 }
32 32
33 td { 33 td {
34 - border-color:#f1f1f1;  
35 - line-height:28px; 34 + border-color: #f1f1f1;
  35 + line-height: 28px;
36 36
37 .s16 { 37 .s16 {
38 margin-top: 5px; 38 margin-top: 5px;
@@ -40,11 +40,11 @@ table { @@ -40,11 +40,11 @@ table {
40 } 40 }
41 41
42 &:first-child { 42 &:first-child {
43 - border-left:1px solid #bbb; 43 + border-left: 1px solid #bbb;
44 } 44 }
45 45
46 &:last-child { 46 &:last-child {
47 - border-right:1px solid #bbb; 47 + border-right: 1px solid #bbb;
48 } 48 }
49 } 49 }
50 50
@@ -53,10 +53,10 @@ table { @@ -53,10 +53,10 @@ table {
53 } 53 }
54 54
55 &.lite { 55 &.lite {
56 - border:none;  
57 - box-shadow:none; 56 + border: none;
  57 + box-shadow: none;
58 tr, td { 58 tr, td {
59 - border:none; 59 + border: none;
60 background:none !important; 60 background:none !important;
61 } 61 }
62 } 62 }
app/assets/stylesheets/gitlab_bootstrap/typography.scss
  Diff comments   View file @83f2a38
@@ -5,11 +5,11 @@ @@ -5,11 +5,11 @@
5 5
6 h1, h2, h3, h4, h5, h6 { margin: 0; } 6 h1, h2, h3, h4, h5, h6 { margin: 0; }
7 h3, h4, h5, h6 { line-height: 36px; } 7 h3, h4, h5, h6 { line-height: 36px; }
8 -h5 { font-size:14px; } 8 +h5 { font-size: 14px; }
9 9
10 h3.page_title { 10 h3.page_title {
11 - color:#456;  
12 - font-size:20px; 11 + color: #456;
  12 + font-size: 20px;
13 font-weight: normal; 13 font-weight: normal;
14 line-height: 28px; 14 line-height: 28px;
15 } 15 }
@@ -25,7 +25,7 @@ pre { @@ -25,7 +25,7 @@ pre {
25 25
26 &.dark { 26 &.dark {
27 background: #333; 27 background: #333;
28 - color:#f5f5f5; 28 + color: #f5f5f5;
29 } 29 }
30 } 30 }
31 31
@@ -37,8 +37,8 @@ a { @@ -37,8 +37,8 @@ a {
37 outline: none; 37 outline: none;
38 color: $link_color; 38 color: $link_color;
39 &:hover { 39 &:hover {
40 - text-decoration:none;  
41 - color: $blue_link; 40 + text-decoration: none;
  41 + color: $primary_color;
42 } 42 }
43 43
44 &.btn { 44 &.btn {
@@ -53,24 +53,24 @@ a { @@ -53,24 +53,24 @@ a {
53 } 53 }
54 54
55 &.lined { 55 &.lined {
56 - text-decoration:underline;  
57 - &:hover { text-decoration:underline; } 56 + text-decoration: underline;
  57 + &:hover { text-decoration: underline; }
58 } 58 }
59 59
60 &.gray { 60 &.gray {
61 - color:gray; 61 + color: gray;
62 } 62 }
63 63
64 &.supp_diff_link { 64 &.supp_diff_link {
65 - text-align:center;  
66 - padding:20px 0;  
67 - background:#f1f1f1;  
68 - width:100%;  
69 - float:left; 65 + text-align: center;
  66 + padding: 20px 0;
  67 + background: #f1f1f1;
  68 + width: 100%;
  69 + float: left;
70 } 70 }
71 71
72 &.neib { 72 &.neib {
73 - margin-right:15px; 73 + margin-right: 15px;
74 } 74 }
75 } 75 }
76 76
app/assets/stylesheets/highlight/dark.scss
  Diff comments   View file @83f2a38
@@ -23,43 +23,43 @@ @@ -23,43 +23,43 @@
23 .gs { font-weight: bold } /* Generic.Strong */ 23 .gs { font-weight: bold } /* Generic.Strong */
24 .gu { color: #606060 } /* Generic.Subheading */ 24 .gu { color: #606060 } /* Generic.Subheading */
25 .gt { color: #aa0000 } /* Generic.Traceback */ 25 .gt { color: #aa0000 } /* Generic.Traceback */
26 - .kc{font-weight:bold;} /* Keyword.Constant */  
27 - .kd{font-weight:bold;} /* Keyword.Declaration */  
28 - .kn{font-weight:bold;} /* Keyword.Namespace */  
29 - .kp{font-weight:bold;} /* Keyword.Pseudo */  
30 - .kr{font-weight:bold;} /* Keyword.Reserved */  
31 - .kt{color:#458;font-weight:bold;} /* Keyword.Type */ 26 + .kc{font-weight: bold;} /* Keyword.Constant */
  27 + .kd{font-weight: bold;} /* Keyword.Declaration */
  28 + .kn{font-weight: bold;} /* Keyword.Namespace */
  29 + .kp{font-weight: bold;} /* Keyword.Pseudo */
  30 + .kr{font-weight: bold;} /* Keyword.Reserved */
  31 + .kt{color: #458;font-weight: bold;} /* Keyword.Type */
32 .m { color: #0000DD; font-weight: bold } /* Literal.Number */ 32 .m { color: #0000DD; font-weight: bold } /* Literal.Number */
33 .p { color: #eee; } 33 .p { color: #eee; }
34 .s { color: #0AD; background-color: transparent } /* Literal.String */ 34 .s { color: #0AD; background-color: transparent } /* Literal.String */
35 - .na{color:#008080;} /* Name.Attribute */  
36 - .nb{color:#0086B3;} /* Name.Builtin */  
37 - .nc{color:#ccc;font-weight:bold;} /* Name.Class */  
38 - .no{color:turquoise;} /* Name.Constant */  
39 - .ni{color:#800080;}  
40 - .ne{color:#900;font-weight:bold;} /* Name.Exception */  
41 - .nf{color:#ccc;font-weight:bold;} /* Name.Function */  
42 - .nn{color:#79C3E0;font-weight:bold;} /* Name.Namespace */  
43 - .nt{color:#fc5;} /* Name.Tag */  
44 - .nv{color:#FA4;} /* Name.Variable */ 35 + .na{color: #008080;} /* Name.Attribute */
  36 + .nb{color: #0086B3;} /* Name.Builtin */
  37 + .nc{color: #ccc;font-weight: bold;} /* Name.Class */
  38 + .no{color: turquoise;} /* Name.Constant */
  39 + .ni{color: #800080;}
  40 + .ne{color: #900;font-weight: bold;} /* Name.Exception */
  41 + .nf{color: #ccc;font-weight: bold;} /* Name.Function */
  42 + .nn{color: #79C3E0;font-weight: bold;} /* Name.Namespace */
  43 + .nt{color: #fc5;} /* Name.Tag */
  44 + .nv{color: #FA4;} /* Name.Variable */
45 .py { color: #336699; font-weight: bold } /* Name.Property */ 45 .py { color: #336699; font-weight: bold } /* Name.Property */
46 .ow { color: #008800 } /* Operator.Word */ 46 .ow { color: #008800 } /* Operator.Word */
47 .w { color: #bbbbbb } /* Text.Whitespace */ 47 .w { color: #bbbbbb } /* Text.Whitespace */
48 .mf { color: #7AC; font-weight: bold } /* Literal.Number.Float */ 48 .mf { color: #7AC; font-weight: bold } /* Literal.Number.Float */
49 .mh { color: #7AC; font-weight: bold } /* Literal.Number.Hex */ 49 .mh { color: #7AC; font-weight: bold } /* Literal.Number.Hex */
50 - .mi {color:#099;} /* Literal.Number.Integer */ 50 + .mi {color: #099;} /* Literal.Number.Integer */
51 .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ 51 .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */
52 .sb { color: #dd2200; background-color: transparent; } /* Literal.String.Backtick */ 52 .sb { color: #dd2200; background-color: transparent; } /* Literal.String.Backtick */
53 - .sc{color:#d14;} /* Literal.String.Char */ 53 + .sc{color: #d14;} /* Literal.String.Char */
54 .sd { color: #dd2200; background-color: transparent; } /* Literal.String.Doc */ 54 .sd { color: #dd2200; background-color: transparent; } /* Literal.String.Doc */
55 - .s2{color:orange;} /* Literal.String.Double */  
56 - .se{color:orange;} /* Literal.String.Escape */  
57 - .sh{color:orange;} /* Literal.String.Heredoc */  
58 - .si{color:orange;} /* Literal.String.Interpol */  
59 - .sx{color:orange;} /* Literal.String.Other */  
60 - .sr{color:orange;} /* Literal.String.Regex */  
61 - .s1{color:orange;} /* Literal.String.Single */  
62 - .ss{color:orange;} /* Literal.String.Symbol */ 55 + .s2{color: orange;} /* Literal.String.Double */
  56 + .se{color: orange;} /* Literal.String.Escape */
  57 + .sh{color: orange;} /* Literal.String.Heredoc */
  58 + .si{color: orange;} /* Literal.String.Interpol */
  59 + .sx{color: orange;} /* Literal.String.Other */
  60 + .sr{color: orange;} /* Literal.String.Regex */
  61 + .s1{color: orange;} /* Literal.String.Single */
  62 + .ss{color: orange;} /* Literal.String.Symbol */
63 .bp { color: #D58 } /* Name.Builtin.Pseudo */ 63 .bp { color: #D58 } /* Name.Builtin.Pseudo */
64 .vc { color: #336699 } /* Name.Variable.Class */ 64 .vc { color: #336699 } /* Name.Variable.Class */
65 .vg { color: #dd7700 } /* Name.Variable.Global */ 65 .vg { color: #dd7700 } /* Name.Variable.Global */
app/assets/stylesheets/highlight/white.scss
  Diff comments   View file @83f2a38
@@ -22,42 +22,42 @@ @@ -22,42 +22,42 @@
22 .gs { font-weight: bold } /* Generic.Strong */ 22 .gs { font-weight: bold } /* Generic.Strong */
23 .gu { color: #606060 } /* Generic.Subheading */ 23 .gu { color: #606060 } /* Generic.Subheading */
24 .gt { color: #aa0000 } /* Generic.Traceback */ 24 .gt { color: #aa0000 } /* Generic.Traceback */
25 - .kc{font-weight:bold;} /* Keyword.Constant */  
26 - .kd{font-weight:bold;} /* Keyword.Declaration */  
27 - .kn{font-weight:bold;} /* Keyword.Namespace */  
28 - .kp{font-weight:bold;} /* Keyword.Pseudo */  
29 - .kr{font-weight:bold;} /* Keyword.Reserved */  
30 - .kt{color:#458;font-weight:bold;} /* Keyword.Type */ 25 + .kc{font-weight: bold;} /* Keyword.Constant */
  26 + .kd{font-weight: bold;} /* Keyword.Declaration */
  27 + .kn{font-weight: bold;} /* Keyword.Namespace */
  28 + .kp{font-weight: bold;} /* Keyword.Pseudo */
  29 + .kr{font-weight: bold;} /* Keyword.Reserved */
  30 + .kt{color: #458;font-weight: bold;} /* Keyword.Type */
31 .m { color: #0000DD; font-weight: bold } /* Literal.Number */ 31 .m { color: #0000DD; font-weight: bold } /* Literal.Number */
32 .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */ 32 .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */
33 - .na{color:#008080;} /* Name.Attribute */  
34 - .nb{color:#0086B3;} /* Name.Builtin */  
35 - .nc{color:#458;font-weight:bold;} /* Name.Class */  
36 - .no{color:#008080;} /* Name.Constant */  
37 - .ni{color:#800080;}  
38 - .ne{color:#900;font-weight:bold;} /* Name.Exception */  
39 - .nf{color:#900;font-weight:bold;} /* Name.Function */  
40 - .nn{color:#005;font-weight:bold;} /* Name.Namespace */  
41 - .nt{color:#000080;} /* Name.Tag */  
42 - .nv{color:#008080;} /* Name.Variable */ 33 + .na{color: #008080;} /* Name.Attribute */
  34 + .nb{color: #0086B3;} /* Name.Builtin */
  35 + .nc{color: #458;font-weight: bold;} /* Name.Class */
  36 + .no{color: #008080;} /* Name.Constant */
  37 + .ni{color: #800080;}
  38 + .ne{color: #900;font-weight: bold;} /* Name.Exception */
  39 + .nf{color: #900;font-weight: bold;} /* Name.Function */
  40 + .nn{color: #005;font-weight: bold;} /* Name.Namespace */
  41 + .nt{color: #000080;} /* Name.Tag */
  42 + .nv{color: #008080;} /* Name.Variable */
43 .py { color: #336699; font-weight: bold } /* Name.Property */ 43 .py { color: #336699; font-weight: bold } /* Name.Property */
44 .ow { color: #008800 } /* Operator.Word */ 44 .ow { color: #008800 } /* Operator.Word */
45 .w { color: #bbbbbb } /* Text.Whitespace */ 45 .w { color: #bbbbbb } /* Text.Whitespace */
46 .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ 46 .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */
47 .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ 47 .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */
48 - .mi {color:#099;} /* Literal.Number.Integer */ 48 + .mi {color: #099;} /* Literal.Number.Integer */
49 .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ 49 .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */
50 .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ 50 .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */
51 - .sc{color:#d14;} /* Literal.String.Char */ 51 + .sc{color: #d14;} /* Literal.String.Char */
52 .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ 52 .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */
53 - .s2{color:#d14;} /* Literal.String.Double */  
54 - .se{color:#d14;} /* Literal.String.Escape */  
55 - .sh{color:#d14;} /* Literal.String.Heredoc */  
56 - .si{color:#d14;} /* Literal.String.Interpol */  
57 - .sx{color:#d14;} /* Literal.String.Other */  
58 - .sr{color:#d14;} /* Literal.String.Regex */  
59 - .s1{color:#d14;} /* Literal.String.Single */  
60 - .ss{color:#d14;} /* Literal.String.Symbol */ 53 + .s2{color: #d14;} /* Literal.String.Double */
  54 + .se{color: #d14;} /* Literal.String.Escape */
  55 + .sh{color: #d14;} /* Literal.String.Heredoc */
  56 + .si{color: #d14;} /* Literal.String.Interpol */
  57 + .sx{color: #d14;} /* Literal.String.Other */
  58 + .sr{color: #d14;} /* Literal.String.Regex */
  59 + .s1{color: #d14;} /* Literal.String.Single */
  60 + .ss{color: #d14;} /* Literal.String.Symbol */
61 .bp { color: #003388 } /* Name.Builtin.Pseudo */ 61 .bp { color: #003388 } /* Name.Builtin.Pseudo */
62 .vc { color: #336699 } /* Name.Variable.Class */ 62 .vc { color: #336699 } /* Name.Variable.Class */
63 .vg { color: #dd7700 } /* Name.Variable.Global */ 63 .vg { color: #dd7700 } /* Name.Variable.Global */
@@ -65,7 +65,5 @@ @@ -65,7 +65,5 @@
65 } 65 }
66 66
67 .shadow { 67 .shadow {
68 - -webkit-box-shadow:0 5px 15px #000;  
69 - -moz-box-shadow:0 5px 15px #000;  
70 - box-shadow:0 5px 15px #000; 68 + @include box-shadow(0 5px 15px #000);
71 } 69 }
app/assets/stylesheets/main.scss
  Diff comments   View file @83f2a38
@@ -3,103 +3,30 @@ $baseFontSize: 13px !default; @@ -3,103 +3,30 @@ $baseFontSize: 13px !default;
3 $baseLineHeight: 18px !default; 3 $baseLineHeight: 18px !default;
4 4
5 // BOOTSTRAP 5 // BOOTSTRAP
6 -// ------------------  
7 @import "bootstrap"; 6 @import "bootstrap";
8 -  
9 -// BOOTSTRAP RESPONSIVE  
10 -// ------------------  
11 @import "bootstrap/responsive-utilities"; 7 @import "bootstrap/responsive-utilities";
12 @import "bootstrap/responsive-1200px-min"; 8 @import "bootstrap/responsive-1200px-min";
13 9
14 // FONT AWESOME 10 // FONT AWESOME
15 -@import 'font-awesome';  
16 -  
17 -/** GitLab colors **/  
18 -$link_color: #3A89A3;  
19 -$blue_link: #2FA0BB;  
20 -$style_color: #474D57;  
21 -$hover: #D9EDF7;  
22 -$hover_border: #ADF;  
23 -  
24 -/** GitLab Fonts **/  
25 -@font-face { font-family: Korolev; src: font-url('korolev-medium-compressed.otf'); }  
26 -$monospace: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono', 'lucida console', monospace;  
27 -  
28 -/** MIXINS **/  
29 -@mixin shade {  
30 - -moz-box-shadow: 0 0 3px #ddd;  
31 - -webkit-box-shadow: 0 0 3px #ddd;  
32 - box-shadow: 0 0 3px #ddd;  
33 -}  
34 -  
35 -@mixin solid_shade {  
36 - -moz-box-shadow: 0 0 0 3px #f1f1f1;  
37 - -webkit-box-shadow: 0 0 0 3px #f1f1f1;  
38 - box-shadow: 0 0 0 3px #f1f1f1;  
39 -}  
40 -  
41 -@mixin border-radius($radius) {  
42 - -moz-border-radius: $radius;  
43 - -webkit-border-radius: $radius;  
44 - border-radius: $radius;  
45 -}  
46 -  
47 -@mixin round-borders-bottom($radius) {  
48 - border-top: 1px solid #eaeaea;  
49 - -moz-border-radius-bottomright: $radius;  
50 - -moz-border-radius-bottomleft: $radius;  
51 - border-bottom-right-radius: $radius;  
52 - border-bottom-left-radius: $radius;  
53 - -webkit-border-bottom-left-radius: $radius;  
54 - -webkit-border-bottom-right-radius: $radius;  
55 -}  
56 -  
57 -@mixin round-borders-top($radius) {  
58 - border-top: 1px solid #eaeaea;  
59 - -moz-border-radius-topright: $radius;  
60 - -moz-border-radius-topleft: $radius;  
61 - border-top-right-radius: $radius;  
62 - border-top-left-radius: $radius;  
63 - -webkit-border-top-left-radius: $radius;  
64 - -webkit-border-top-right-radius: $radius;  
65 -}  
66 -  
67 -@mixin round-borders-all($radius) {  
68 - border: 1px solid #eaeaea;  
69 - -moz-border-radius: $radius;  
70 - -webkit-border-radius: $radius;  
71 - border-radius: $radius;  
72 -}  
73 -  
74 -@mixin bg-gradient($from, $to) {  
75 - background-image: -webkit-gradient(linear, 0 0, 0 100%, from($from), to($to));  
76 - background-image: -webkit-linear-gradient($from, $to);  
77 - background-image: -moz-linear-gradient($from, $to);  
78 - background-image: -o-linear-gradient($from, $to);  
79 -}  
80 -  
81 -@mixin bg-light-gray-gradient {  
82 - background:#f1f1f1;  
83 - background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1));  
84 - background-image: -webkit-linear-gradient(#f5f5f5 6.6%, #e1e1e1);  
85 - background-image: -moz-linear-gradient(#f5f5f5 6.6%, #e1e1e1);  
86 - background-image: -o-linear-gradient(#f5f5f5 6.6%, #e1e1e1);  
87 -}  
88 -  
89 -@mixin bg-gray-gradient {  
90 - background:#eee;  
91 - background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));  
92 - background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);  
93 - background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);  
94 - background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);  
95 -}  
96 -  
97 -@mixin bg-dark-gray-gradient {  
98 - background:#eee;  
99 - background-image: -webkit-linear-gradient(#e9e9e9, #d7d7d7);  
100 - background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7);  
101 - background-image: -o-linear-gradient(#e9e9e9, #d7d7d7);  
102 -} 11 +@import "font-awesome";
  12 +
  13 +/**
  14 + * Variables
  15 + * Contains colors
  16 + */
  17 +@import "variables.scss";
  18 +
  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";
103 30
104 /** 31 /**
105 * Header of application. 32 * Header of application.
app/assets/stylesheets/mixins.scss 0 → 100644
  Diff comments   View file @83f2a38
@@ -0,0 +1,60 @@ @@ -0,0 +1,60 @@
  1 +/**
  2 + * Generic mixins
  3 + */
  4 + @mixin box-shadow($shadow) {
  5 + -webkit-box-shadow: $shadow;
  6 + -moz-box-shadow: $shadow;
  7 + -ms-box-shadow: $shadow;
  8 + -o-box-shadow: $shadow;
  9 + box-shadow: $shadow;
  10 +}
  11 +
  12 +@mixin border-radius($radius) {
  13 + -webkit-border-radius: $radius;
  14 + -moz-border-radius: $radius;
  15 + -ms-border-radius: $radius;
  16 + -o-border-radius: $radius;
  17 + border-radius: $radius;
  18 +}
  19 +
  20 +@mixin linear-gradient($from, $to) {
  21 + background-image: -webkit-gradient(linear, 0 0, 0 100%, from($from), to($to));
  22 + background-image: -webkit-linear-gradient($from, $to);
  23 + background-image: -moz-linear-gradient($from, $to);
  24 + background-image: -o-linear-gradient($from, $to);
  25 +}
  26 +
  27 +/**
  28 + * Prefilled mixins
  29 + * Mixins with fixed values
  30 + */
  31 +@mixin bg-light-gray-gradient {
  32 + background: #f1f1f1;
  33 + background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1));
  34 + background-image: -webkit-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
  35 + background-image: -moz-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
  36 + background-image: -o-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
  37 +}
  38 +
  39 +@mixin bg-gray-gradient {
  40 + background: #eee;
  41 + background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
  42 + background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
  43 + background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
  44 + background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
  45 +}
  46 +
  47 +@mixin bg-dark-gray-gradient {
  48 + background: #eee;
  49 + background-image: -webkit-linear-gradient(#e9e9e9, #d7d7d7);
  50 + background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7);
  51 + background-image: -o-linear-gradient(#e9e9e9, #d7d7d7);
  52 +}
  53 +
  54 +@mixin shade {
  55 + @include box-shadow(0 0 3px #ddd);
  56 +}
  57 +
  58 +@mixin solid-shade {
  59 + @include box-shadow(0 0 0 3px #f1f1f1);
  60 +}
0 \ No newline at end of file 61 \ No newline at end of file
app/assets/stylesheets/ref_select.scss
  Diff comments   View file @83f2a38
1 /** Branch/tag selector **/ 1 /** Branch/tag selector **/
2 .project-refs-form { 2 .project-refs-form {
3 - margin:0; 3 + margin: 0;
4 span { 4 span {
5 background:none !important; 5 background:none !important;
6 position:static !important; 6 position:static !important;
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 } 9 }
10 } 10 }
11 .project-refs-select { 11 .project-refs-select {
12 - width:120px; 12 + width: 120px;
13 } 13 }
14 14
15 .project-refs-form .chzn-container { 15 .project-refs-form .chzn-container {
@@ -21,10 +21,10 @@ @@ -21,10 +21,10 @@
21 .chzn-drop { 21 .chzn-drop {
22 min-width: 400px; 22 min-width: 400px;
23 .chzn-results { 23 .chzn-results {
24 - max-height:300px; 24 + max-height: 300px;
25 } 25 }
26 .chzn-search input { 26 .chzn-search input {
27 - min-width:365px; 27 + min-width: 365px;
28 } 28 }
29 } 29 }
30 } 30 }
@@ -33,21 +33,19 @@ @@ -33,21 +33,19 @@
33 .chzn-container { 33 .chzn-container {
34 .chzn-search { 34 .chzn-search {
35 input:focus { 35 input:focus {
36 - -webkit-box-shadow: none;  
37 - -moz-box-shadow: none;  
38 - box-shadow: none; 36 + @include box-shadow(none);
39 } 37 }
40 } 38 }
41 39
42 .chzn-drop { 40 .chzn-drop {
43 - margin:7px 0; 41 + margin: 7px 0;
44 min-width: 200px; 42 min-width: 200px;
45 border: 1px solid #bbb; 43 border: 1px solid #bbb;
46 - border-radius:0; 44 + @include border-radius(0);
47 45
48 .chzn-results { 46 .chzn-results {
49 margin-top: 5px; 47 margin-top: 5px;
50 - max-height:300px; 48 + max-height: 300px;
51 49
52 .group-result { 50 .group-result {
53 color: $style_color; 51 color: $style_color;
@@ -55,7 +53,7 @@ @@ -55,7 +53,7 @@
55 padding: 8px; 53 padding: 8px;
56 } 54 }
57 .active-result { 55 .active-result {
58 - border-radius: 0; 56 + @include border-radius(0);
59 57
60 &.highlighted { 58 &.highlighted {
61 background: $hover; 59 background: $hover;
@@ -71,7 +69,7 @@ @@ -71,7 +69,7 @@
71 .chzn-search { 69 .chzn-search {
72 @include bg-gray-gradient; 70 @include bg-gray-gradient;
73 input { 71 input {
74 - min-width:165px; 72 + min-width: 165px;
75 border-color: #CCC; 73 border-color: #CCC;
76 } 74 }
77 } 75 }
@@ -81,8 +79,8 @@ @@ -81,8 +79,8 @@
81 @include bg-light-gray-gradient; 79 @include bg-light-gray-gradient;
82 80
83 div { 81 div {
84 - background:transparent;  
85 - border-left:none; 82 + background: transparent;
  83 + border-left: none;
86 } 84 }
87 85
88 span { 86 span {
app/assets/stylesheets/sections/commits.scss
  Diff comments   View file @83f2a38
@@ -6,14 +6,14 @@ @@ -6,14 +6,14 @@
6 6
7 .commit-title { 7 .commit-title {
8 line-height: 26px; 8 line-height: 26px;
9 - margin:0; 9 + margin: 0;
10 } 10 }
11 11
12 .commit-description { 12 .commit-description {
13 font-size: 14px; 13 font-size: 14px;
14 border: none; 14 border: none;
15 background-color: white; 15 background-color: white;
16 - padding-top:10px; 16 + padding-top: 10px;
17 } 17 }
18 18
19 .browse-button { 19 .browse-button {
@@ -28,9 +28,9 @@ @@ -28,9 +28,9 @@
28 @extend .clearfix; 28 @extend .clearfix;
29 29
30 .sha-block { 30 .sha-block {
31 - text-align:right; 31 + text-align: right;
32 &:first-child { 32 &:first-child {
33 - padding-bottom:6px; 33 + padding-bottom: 6px;
34 } 34 }
35 35
36 a { 36 a {
@@ -49,10 +49,10 @@ @@ -49,10 +49,10 @@
49 49
50 .author a, 50 .author a,
51 .committer a { 51 .committer a {
52 - font-size:14px;  
53 - line-height:22px;  
54 - text-shadow:0 1px 1px #fff;  
55 - color:#777; 52 + font-size: 14px;
  53 + line-height: 22px;
  54 + text-shadow: 0 1px 1px #fff;
  55 + color: #777;
56 &:hover { 56 &:hover {
57 color: #999; 57 color: #999;
58 } 58 }
@@ -70,15 +70,16 @@ @@ -70,15 +70,16 @@
70 * 70 *
71 */ 71 */
72 .diff_file { 72 .diff_file {
73 - border:1px solid #CCC;  
74 - margin-bottom:1em; 73 + border: 1px solid #CCC;
  74 + margin-bottom: 1em;
75 75
76 .diff_file_header { 76 .diff_file_header {
77 @extend .clearfix; 77 @extend .clearfix;
78 padding: 5px 5px 5px 10px; 78 padding: 5px 5px 5px 10px;
79 color: #555; 79 color: #555;
80 - border-bottom:1px solid #CCC; 80 + border-bottom: 1px solid #CCC;
81 background: #eee; 81 background: #eee;
  82 + // TODO Replace with linear-gradient mixin
82 background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf)); 83 background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
83 background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf); 84 background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
84 background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf); 85 background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
@@ -86,7 +87,7 @@ @@ -86,7 +87,7 @@
86 87
87 > span { 88 > span {
88 font-family: $monospace; 89 font-family: $monospace;
89 - font-size:14px; 90 + font-size: 14px;
90 line-height: 30px; 91 line-height: 30px;
91 } 92 }
92 93
@@ -104,36 +105,36 @@ @@ -104,36 +105,36 @@
104 } 105 }
105 } 106 }
106 .diff_file_content { 107 .diff_file_content {
107 - overflow:auto;  
108 - overflow-y:hidden;  
109 - background:#fff;  
110 - color:#333; 108 + overflow: auto;
  109 + overflow-y: hidden;
  110 + background: #fff;
  111 + color: #333;
111 font-size: 12px; 112 font-size: 12px;
112 font-family: $monospace; 113 font-family: $monospace;
113 .old{ 114 .old{
114 span.idiff{ 115 span.idiff{
115 - background-color:#FAA; 116 + background-color: #FAA;
116 } 117 }
117 } 118 }
118 .new{ 119 .new{
119 span.idiff{ 120 span.idiff{
120 - background-color:#AFA; 121 + background-color: #AFA;
121 } 122 }
122 } 123 }
123 124
124 table { 125 table {
125 td { 126 td {
126 - line-height:18px; 127 + line-height: 18px;
127 } 128 }
128 } 129 }
129 } 130 }
130 .diff_file_content_image { 131 .diff_file_content_image {
131 - background:#eee;  
132 - text-align:center; 132 + background: #eee;
  133 + text-align: center;
133 .image { 134 .image {
134 display: inline-block; 135 display: inline-block;
135 - margin:50px;  
136 - max-width:400px; 136 + margin: 50px;
  137 + max-width: 400px;
137 138
138 img{ 139 img{
139 background: url('trans_bg.gif'); 140 background: url('trans_bg.gif');
@@ -158,7 +159,7 @@ @@ -158,7 +159,7 @@
158 159
159 &.img_compared { 160 &.img_compared {
160 .image { 161 .image {
161 - max-width:300px; 162 + max-width: 300px;
162 } 163 }
163 } 164 }
164 } 165 }
@@ -166,46 +167,46 @@ @@ -166,46 +167,46 @@
166 167
167 .diff_file_content{ 168 .diff_file_content{
168 table { 169 table {
169 - border:none;  
170 - margin:0px;  
171 - padding:0px; 170 + border: none;
  171 + margin: 0px;
  172 + padding: 0px;
172 tr { 173 tr {
173 td { 174 td {
174 - font-size:12px; 175 + font-size: 12px;
175 } 176 }
176 } 177 }
177 } 178 }
178 .old_line, .new_line { 179 .old_line, .new_line {
179 - margin:0px;  
180 - padding:0px;  
181 - border:none;  
182 - background:#EEE;  
183 - color:#666; 180 + margin: 0px;
  181 + padding: 0px;
  182 + border: none;
  183 + background: #EEE;
  184 + color: #666;
184 padding: 0px 5px; 185 padding: 0px 5px;
185 border-right: 1px solid #ccc; 186 border-right: 1px solid #ccc;
186 - text-align:right;  
187 - min-width:35px;  
188 - max-width:35px;  
189 - width:35px; 187 + text-align: right;
  188 + min-width: 35px;
  189 + max-width: 35px;
  190 + width: 35px;
190 moz-user-select: none; 191 moz-user-select: none;
191 -khtml-user-select: none; 192 -khtml-user-select: none;
192 user-select: none; 193 user-select: none;
193 a { 194 a {
194 - float:left;  
195 - width:35px;  
196 - font-weight:normal;  
197 - color:#666; 195 + float: left;
  196 + width: 35px;
  197 + font-weight: normal;
  198 + color: #666;
198 &:hover { 199 &:hover {
199 - text-decoration:underline; 200 + text-decoration: underline;
200 } 201 }
201 } 202 }
202 } 203 }
203 .line_content { 204 .line_content {
204 - white-space:pre;  
205 - height:14px;  
206 - margin:0px;  
207 - padding:0px;  
208 - border:none; 205 + white-space: pre;
  206 + height: 14px;
  207 + margin: 0px;
  208 + padding: 0px;
  209 + border: none;
209 &.new { 210 &.new {
210 background: #CFD; 211 background: #CFD;
211 } 212 }
@@ -213,8 +214,8 @@ @@ -213,8 +214,8 @@
213 background: #FDD; 214 background: #FDD;
214 } 215 }
215 &.matched { 216 &.matched {
216 - color:#ccc;  
217 - background:#fafafa; 217 + color: #ccc;
  218 + background: #fafafa;
218 } 219 }
219 } 220 }
220 } 221 }
@@ -232,28 +233,28 @@ @@ -232,28 +233,28 @@
232 233
233 .browse_code_link_holder { 234 .browse_code_link_holder {
234 @extend .span2; 235 @extend .span2;
235 - float:right; 236 + float: right;
236 } 237 }
237 238
238 .committed_ago { 239 .committed_ago {
239 - float:right; 240 + float: right;
240 @extend .cgray; 241 @extend .cgray;
241 } 242 }
242 243
243 .notes_count { 244 .notes_count {
244 - float:right; 245 + float: right;
245 margin: -6px 8px 6px; 246 margin: -6px 8px 6px;
246 } 247 }
247 248
248 code { 249 code {
249 - background:#FCEEC1;  
250 - color:$style_color; 250 + background: #FCEEC1;
  251 + color: $style_color;
251 } 252 }
252 253
253 .commit_short_id { 254 .commit_short_id {
254 - float:left; 255 + float: left;
255 @extend .lined; 256 @extend .lined;
256 - min-width:65px; 257 + min-width: 65px;
257 font-family: $monospace; 258 font-family: $monospace;
258 } 259 }
259 260
@@ -294,11 +295,10 @@ @@ -294,11 +295,10 @@
294 } 295 }
295 296
296 .label_commit { 297 .label_commit {
297 - @include round-borders-all(4px);  
298 - padding:2px 4px;  
299 - border:none;  
300 - font-size:13px; 298 + @include border-radius(4px);
  299 + padding: 2px 4px;
  300 + font-size: 13px;
301 background: #474D57; 301 background: #474D57;
302 - color:#fff; 302 + color: #fff;
303 font-family: $monospace; 303 font-family: $monospace;
304 } 304 }
app/assets/stylesheets/sections/editor.scss
  Diff comments   View file @83f2a38
1 .file-editor { 1 .file-editor {
2 #editor{ 2 #editor{
3 border: none; 3 border: none;
4 - border-radius: 0; 4 + @include border-radius(0);
5 height: 500px; 5 height: 500px;
6 margin: 0; 6 margin: 0;
7 padding: 0; 7 padding: 0;
app/assets/stylesheets/sections/events.scss
  Diff comments   View file @83f2a38
@@ -4,25 +4,25 @@ @@ -4,25 +4,25 @@
4 */ 4 */
5 .event_label { 5 .event_label {
6 &.pushed { 6 &.pushed {
7 - padding:0 2px; 7 + padding: 0 2px;
8 } 8 }
9 9
10 &.opened { 10 &.opened {
11 - padding:0 2px; 11 + padding: 0 2px;
12 } 12 }
13 13
14 &.closed { 14 &.closed {
15 - padding:0 2px; 15 + padding: 0 2px;
16 } 16 }
17 17
18 &.merged { 18 &.merged {
19 - padding:0 2px; 19 + padding: 0 2px;
20 } 20 }
21 21
22 &.left, 22 &.left,
23 &.joined { 23 &.joined {
24 - padding:0 2px;  
25 - float:none; 24 + padding: 0 2px;
  25 + float: none;
26 } 26 }
27 } 27 }
28 28
@@ -31,26 +31,26 @@ @@ -31,26 +31,26 @@
31 * 31 *
32 */ 32 */
33 .event-item { 33 .event-item {
34 - min-height:40px;  
35 - border-bottom:1px solid #eee; 34 + min-height: 40px;
  35 + border-bottom: 1px solid #eee;
36 .event-title { 36 .event-title {
37 - color:#333; 37 + color: #333;
38 font-weight: bold; 38 font-weight: bold;
39 .author_name { 39 .author_name {
40 - color:#333; 40 + color: #333;
41 } 41 }
42 } 42 }
43 .event-body { 43 .event-body {
44 p { 44 p {
45 - color:#555; 45 + color: #555;
46 padding-top: 5px; 46 padding-top: 5px;
47 } 47 }
48 .event-info { 48 .event-info {
49 - color:#666; 49 + color: #666;
50 } 50 }
51 } 51 }
52 .avatar { 52 .avatar {
53 - width:32px; 53 + width: 32px;
54 } 54 }
55 .event_icon { 55 .event_icon {
56 float: right; 56 float: right;
@@ -59,15 +59,15 @@ @@ -59,15 +59,15 @@
59 @include border-radius(5px); 59 @include border-radius(5px);
60 background: #F9F9F9; 60 background: #F9F9F9;
61 img { 61 img {
62 - width:20px; 62 + width: 20px;
63 } 63 }
64 } 64 }
65 ul { 65 ul {
66 - margin-left:50px;  
67 - margin-bottom:5px; 66 + margin-left: 50px;
  67 + margin-bottom: 5px;
68 .avatar { 68 .avatar {
69 - width:18px;  
70 - margin-top:3px; 69 + width: 18px;
  70 + margin-top: 3px;
71 } 71 }
72 } 72 }
73 73
@@ -81,9 +81,9 @@ @@ -81,9 +81,9 @@
81 li { 81 li {
82 &.commit { 82 &.commit {
83 background: transparent; 83 background: transparent;
84 - padding:3px;  
85 - border:none;  
86 - font-size:12px; 84 + padding: 3px;
  85 + border: none;
  86 + font-size: 12px;
87 } 87 }
88 &.commits-stat { 88 &.commits-stat {
89 display: block; 89 display: block;
@@ -98,15 +98,15 @@ @@ -98,15 +98,15 @@
98 * 98 *
99 */ 99 */
100 .event_lp { 100 .event_lp {
101 - color:#777;  
102 - padding:10px;  
103 - min-height:22px; 101 + color: #777;
  102 + padding: 10px;
  103 + min-height: 22px;
104 border-left: 5px solid #5AB9C3; 104 border-left: 5px solid #5AB9C3;
105 - margin-bottom:20px;  
106 - background:#f9f9f9; 105 + margin-bottom: 20px;
  106 + background: #f9f9f9;
107 107
108 .avatar { 108 .avatar {
109 - width:24px; 109 + width: 24px;
110 } 110 }
111 111
112 .btn-new-mr { 112 .btn-new-mr {
@@ -133,7 +133,7 @@ @@ -133,7 +133,7 @@
133 background: #f9f9f9; 133 background: #f9f9f9;
134 margin-bottom: 10px; 134 margin-bottom: 10px;
135 img { 135 img {
136 - width:20px; 136 + width: 20px;
137 } 137 }
138 138
139 &.inactive { 139 &.inactive {
app/assets/stylesheets/sections/graph.scss
  Diff comments   View file @83f2a38
1 .graph_holder { 1 .graph_holder {
2 border: 1px solid #aaa; 2 border: 1px solid #aaa;
3 - padding:1px; 3 + padding: 1px;
4 4
5 5
6 h4 { 6 h4 {
7 - padding:0 10px; 7 + padding: 0 10px;
8 border-bottom: 1px solid #bbb; 8 border-bottom: 1px solid #bbb;
9 @include bg-gray-gradient; 9 @include bg-gray-gradient;
10 } 10 }
app/assets/stylesheets/sections/header.scss
  Diff comments   View file @83f2a38
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 header { 5 header {
6 &.navbar-gitlab { 6 &.navbar-gitlab {
7 .navbar-inner { 7 .navbar-inner {
8 - height:45px; 8 + height: 45px;
9 padding: 5px; 9 padding: 5px;
10 background: #F1F1F1; 10 background: #F1F1F1;
11 11
@@ -24,8 +24,8 @@ header { @@ -24,8 +24,8 @@ header {
24 } 24 }
25 } 25 }
26 26
27 - z-index:10;  
28 - /*height:60px;*/ 27 + z-index: 10;
  28 + /*height: 60px;*/
29 29
30 /** 30 /**
31 * 31 *
@@ -33,24 +33,24 @@ header { @@ -33,24 +33,24 @@ header {
33 * 33 *
34 */ 34 */
35 .app_logo { 35 .app_logo {
36 - width:170px;  
37 - float:left; 36 + width: 170px;
  37 + float: left;
38 a { 38 a {
39 - float:left; 39 + float: left;
40 padding: 0px; 40 padding: 0px;
41 41
42 h1 { 42 h1 {
43 - width:90px; 43 + width: 90px;
44 background: url('logo_dark.png') no-repeat 0px 2px; 44 background: url('logo_dark.png') no-repeat 0px 2px;
45 - float:left;  
46 - margin-left:2px;  
47 - font-size:30px;  
48 - line-height:48px;  
49 - font-weight:normal;  
50 - color:$style_color; 45 + float: left;
  46 + margin-left: 2px;
  47 + font-size: 30px;
  48 + line-height: 48px;
  49 + font-weight: normal;
  50 + color: $style_color;
51 text-shadow: 0 1px 1px #FFF; 51 text-shadow: 0 1px 1px #FFF;
52 - padding-left:45px;  
53 - height:40px; 52 + padding-left: 45px;
  53 + height: 40px;
54 font-family: 'Korolev', sans-serif; 54 font-family: 'Korolev', sans-serif;
55 } 55 }
56 } 56 }
@@ -62,14 +62,14 @@ header { @@ -62,14 +62,14 @@ header {
62 * 62 *
63 */ 63 */
64 .project_name { 64 .project_name {
65 - position:relative;  
66 - float:left;  
67 - margin:0;  
68 - margin-right:30px;  
69 - font-size:30px;  
70 - line-height:48px;  
71 - font-weight:normal;  
72 - color:$style_color; 65 + position: relative;
  66 + float: left;
  67 + margin: 0;
  68 + margin-right: 30px;
  69 + font-size: 30px;
  70 + line-height: 48px;
  71 + font-weight: normal;
  72 + color: $style_color;
73 text-shadow: 0 1px 1px #FFF; 73 text-shadow: 0 1px 1px #FFF;
74 font-family: 'Korolev', sans-serif; 74 font-family: 'Korolev', sans-serif;
75 } 75 }
@@ -81,7 +81,7 @@ header { @@ -81,7 +81,7 @@ header {
81 */ 81 */
82 .search { 82 .search {
83 margin-right: 45px; 83 margin-right: 45px;
84 - margin-left:10px; 84 + margin-left: 10px;
85 margin-top: 2px; 85 margin-top: 2px;
86 86
87 .search-input { 87 .search-input {
@@ -89,11 +89,11 @@ header { @@ -89,11 +89,11 @@ header {
89 background-image: url("icon-search.png"); 89 background-image: url("icon-search.png");
90 background-repeat: no-repeat; 90 background-repeat: no-repeat;
91 background-position: 10px; 91 background-position: 10px;
92 - padding-left:25px; 92 + padding-left: 25px;
93 font-size: 13px; 93 font-size: 13px;
94 @include border-radius(3px); 94 @include border-radius(3px);
95 - border:1px solid #c6c6c6;  
96 - box-shadow:none; 95 + border: 1px solid #c6c6c6;
  96 + box-shadow: none;
97 &:focus { 97 &:focus {
98 @extend .span3; 98 @extend .span3;
99 } 99 }
@@ -122,7 +122,7 @@ header { @@ -122,7 +122,7 @@ header {
122 width: 28px; 122 width: 28px;
123 height: 28px; 123 height: 28px;
124 display: block; 124 display: block;
125 - top:1px; 125 + top: 1px;
126 &:after { 126 &:after {
127 content: " "; 127 content: " ";
128 display: block; 128 display: block;
@@ -132,12 +132,15 @@ header { @@ -132,12 +132,15 @@ header {
132 left: 0; 132 left: 0;
133 bottom: 0; 133 bottom: 0;
134 float: right; 134 float: right;
135 - border-radius: 5px; 135 + @include border-radius(5px);
136 border: 1px solid rgba(255, 255, 255, 0.1); 136 border: 1px solid rgba(255, 255, 255, 0.1);
137 border-bottom: 0; 137 border-bottom: 0;
138 - background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(255, 255, 255, 0.15)), to(rgba(0, 0, 0, 0.25))), -webkit-gradient(linear, left top, right bottom, color-stop(0, rgba(255, 255, 255, 0)), color-stop(0.5, rgba(255, 255, 255, 0.1)), color-stop(0.501, rgba(255, 255, 255, 0)), color-stop(1, rgba(255, 255, 255, 0)));  
139 - background: -moz-linear-gradient(top, rgba(255, 255, 255, 0.15), rgba(0, 0, 0, 0.25)), -moz-linear-gradient(left top, rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.1) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0));  
140 - background: linear-gradient(top, rgba(255, 255, 255, 0.15), rgba(0, 0, 0, 0.25)), linear-gradient(left top, rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.1) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0)); 138 + background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(255, 255, 255, 0.15)), to(rgba(0, 0, 0, 0.25))),
  139 + -webkit-gradient(linear, left top, right bottom, color-stop(0, rgba(255, 255, 255, 0)), color-stop(0.5, rgba(255, 255, 255, 0.1)), color-stop(0.501, rgba(255, 255, 255, 0)), color-stop(1, rgba(255, 255, 255, 0)));
  140 + background: -moz-linear-gradient(top, rgba(255, 255, 255, 0.15), rgba(0, 0, 0, 0.25)),
  141 + -moz-linear-gradient(left top, rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.1) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0));
  142 + background: linear-gradient(top, rgba(255, 255, 255, 0.15), rgba(0, 0, 0, 0.25)),
  143 + linear-gradient(left top, rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.1) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0));
141 -webkit-background-origin: border-box; 144 -webkit-background-origin: border-box;
142 -moz-background-origin: border; 145 -moz-background-origin: border;
143 background-origin: border-box; } } } 146 background-origin: border-box; } } }
@@ -149,7 +152,7 @@ header { @@ -149,7 +152,7 @@ header {
149 display: block; } } 152 display: block; } }
150 153
151 .account-links { 154 .account-links {
152 - border-radius: 5px; 155 + @include border-radius(5px);
153 box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); 156 box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
154 position: relative; 157 position: relative;
155 &:before { 158 &:before {
@@ -184,7 +187,7 @@ header { @@ -184,7 +187,7 @@ header {
184 border-bottom: 1px solid #666; 187 border-bottom: 1px solid #666;
185 font-size: 12px; 188 font-size: 12px;
186 &:hover { 189 &:hover {
187 - color:#fff; 190 + color: #fff;
188 background: #333; 191 background: #333;
189 } 192 }
190 } 193 }
@@ -197,20 +200,13 @@ header { @@ -197,20 +200,13 @@ header {
197 200
198 .account-links a { 201 .account-links a {
199 &:first-child { 202 &:first-child {
200 - -webkit-border-top-left-radius: 5px;  
201 - -webkit-border-top-right-radius: 5px;  
202 - -moz-border-radius-topleft: 5px;  
203 - -moz-border-radius-topright: 5px;  
204 - border-top-left-radius: 5px;  
205 - border-top-right-radius: 5px; } 203 + @include border-radius(5px 5px 0 0);
  204 + }
206 &:last-child { 205 &:last-child {
207 - -webkit-border-bottom-right-radius: 5px;  
208 - -webkit-border-bottom-left-radius: 5px;  
209 - -moz-border-radius-bottomright: 5px;  
210 - -moz-border-radius-bottomleft: 5px;  
211 - border-bottom-right-radius: 5px;  
212 - border-bottom-left-radius: 5px;  
213 - border-bottom: 0; } } 206 + @include border-radius(0 0 5px 5px);
  207 + border-bottom: 0;
  208 + }
  209 + }
214 210
215 211
216 212
@@ -248,13 +244,13 @@ header { @@ -248,13 +244,13 @@ header {
248 a { 244 a {
249 h1 { 245 h1 {
250 background: url('logo_white.png') no-repeat 0px 2px; 246 background: url('logo_white.png') no-repeat 0px 2px;
251 - color:#fff; 247 + color: #fff;
252 text-shadow: 0 1px 1px #111; 248 text-shadow: 0 1px 1px #111;
253 } 249 }
254 } 250 }
255 } 251 }
256 .project_name { 252 .project_name {
257 - color:#fff; 253 + color: #fff;
258 text-shadow: 0 1px 1px #111; 254 text-shadow: 0 1px 1px #111;
259 } 255 }
260 } 256 }
app/assets/stylesheets/sections/issues.scss
  Diff comments   View file @83f2a38
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 .issue_title { 3 .issue_title {
4 @extend .top_box_content; 4 @extend .top_box_content;
5 .clearfix { 5 .clearfix {
6 - margin-bottom:0px; 6 + margin-bottom: 0px;
7 input { 7 input {
8 @extend .span8; 8 @extend .span8;
9 } 9 }
@@ -11,14 +11,14 @@ @@ -11,14 +11,14 @@
11 } 11 }
12 .issue_middle_block { 12 .issue_middle_block {
13 @extend .middle_box_content; 13 @extend .middle_box_content;
14 - height:30px; 14 + height: 30px;
15 .issue_assignee { 15 .issue_assignee {
16 @extend .span6; 16 @extend .span6;
17 - float:left; 17 + float: left;
18 } 18 }
19 .issue_milestone { 19 .issue_milestone {
20 @extend .span4; 20 @extend .span4;
21 - float:left; 21 + float: left;
22 } 22 }
23 } 23 }
24 .issue_description { 24 .issue_description {
@@ -28,31 +28,31 @@ @@ -28,31 +28,31 @@
28 28
29 .issues_table { 29 .issues_table {
30 .issue { 30 .issue {
31 - padding:7px 10px; 31 + padding: 7px 10px;
32 32
33 .issue_check { 33 .issue_check {
34 - float:left; 34 + float: left;
35 padding: 8px 0; 35 padding: 8px 0;
36 padding-right: 8px; 36 padding-right: 8px;
37 min-width: 15px; 37 min-width: 15px;
38 } 38 }
39 39
40 p { 40 p {
41 - padding-top:0;  
42 - padding-bottom:2px; 41 + padding-top: 0;
  42 + padding-bottom: 2px;
43 } 43 }
44 44
45 img.avatar { 45 img.avatar {
46 - width:32px;  
47 - margin-top:1px; 46 + width: 32px;
  47 + margin-top: 1px;
48 } 48 }
49 } 49 }
50 } 50 }
51 51
52 input.check_all_issues { 52 input.check_all_issues {
53 - float:left; 53 + float: left;
54 padding: 0; 54 padding: 0;
55 - margin:0; 55 + margin: 0;
56 margin-right: 10px; 56 margin-right: 10px;
57 position: relative; 57 position: relative;
58 top: 8px; 58 top: 8px;
@@ -82,16 +82,16 @@ input.check_all_issues { @@ -82,16 +82,16 @@ input.check_all_issues {
82 } 82 }
83 } 83 }
84 84
85 -@media (min-width: 800px) { .issues_filters select { width:160px; } }  
86 -@media (min-width: 1000px) { .issues_filters select { width:200px; } }  
87 -@media (min-width: 1200px) { .issues_filters select { width:220px; } } 85 +@media (min-width: 800px) { .issues_filters select { width: 160px; } }
  86 +@media (min-width: 1000px) { .issues_filters select { width: 200px; } }
  87 +@media (min-width: 1200px) { .issues_filters select { width: 220px; } }
88 88
89 89
90 #issues-table-holder { 90 #issues-table-holder {
91 .issues_filters { 91 .issues_filters {
92 form { 92 form {
93 - padding:0;  
94 - margin:0; 93 + padding: 0;
  94 + margin: 0;
95 margin-top:7px 95 margin-top:7px
96 } 96 }
97 } 97 }
@@ -99,27 +99,27 @@ input.check_all_issues { @@ -99,27 +99,27 @@ input.check_all_issues {
99 .issues_bulk_update { 99 .issues_bulk_update {
100 margin: 0; 100 margin: 0;
101 form { 101 form {
102 - padding:0;  
103 - margin:0; 102 + padding: 0;
  103 + margin: 0;
104 margin-top:7px 104 margin-top:7px
105 } 105 }
106 .update_selected_issues { 106 .update_selected_issues {
107 - position:relative; 107 + position: relative;
108 top:-2px; 108 top:-2px;
109 - margin-left:4px;  
110 - float:left; 109 + margin-left: 4px;
  110 + float: left;
111 } 111 }
112 112
113 .update_issues_text { 113 .update_issues_text {
114 - padding:3px; 114 + padding: 3px;
115 line-height: 18px; 115 line-height: 18px;
116 - float:left; 116 + float: left;
117 } 117 }
118 } 118 }
119 } 119 }
120 120
121 #update_status { 121 #update_status {
122 - width:100px; 122 + width: 100px;
123 } 123 }
124 124
125 125
@@ -136,11 +136,11 @@ input.check_all_issues { @@ -136,11 +136,11 @@ input.check_all_issues {
136 */ 136 */
137 137
138 .ui-datepicker { 138 .ui-datepicker {
139 - border:none;  
140 - box-shadow:none; 139 + border: none;
  140 + box-shadow: none;
141 .ui-datepicker-header { 141 .ui-datepicker-header {
142 - @include solid_shade;  
143 - margin-bottom:10px;  
144 - border:1px solid #bbb; 142 + @include solid-shade;
  143 + margin-bottom: 10px;
  144 + border: 1px solid #bbb;
145 } 145 }
146 } 146 }
app/assets/stylesheets/sections/login.scss
  Diff comments   View file @83f2a38
1 /* Login Page */ 1 /* Login Page */
2 body.login-page{ 2 body.login-page{
3 padding-top: 10%; 3 padding-top: 10%;
4 - background:#f1f1f1; 4 + background: #f1f1f1;
5 } 5 }
6 6
7 .login-box{ 7 .login-box{
8 width: 304px; 8 width: 304px;
9 position: relative; 9 position: relative;
10 - border-radius: 5px; 10 + @include border-radius(5px);
11 margin: auto; 11 margin: auto;
12 padding: 20px; 12 padding: 20px;
13 background: white; 13 background: white;
@@ -18,25 +18,15 @@ body.login-page{ @@ -18,25 +18,15 @@ body.login-page{
18 display: block; 18 display: block;
19 } 19 }
20 20
21 -.login-box input.text{background-color: #f1f1f1; font-size: 16px; border-radius: 0; padding: 14px 10px; width: 280px} 21 +.login-box input.text{background-color: #f1f1f1; font-size: 16px; @include border-radius(0); padding: 14px 10px; width: 280px}
22 22
23 .login-box input.text.top{ 23 .login-box input.text.top{
24 - -webkit-border-top-left-radius: 5px;  
25 - -webkit-border-top-right-radius: 5px;  
26 - -moz-border-radius-topleft: 5px;  
27 - -moz-border-radius-topright: 5px;  
28 - border-top-left-radius: 5px;  
29 - border-top-right-radius: 5px;  
30 - margin-bottom:0px; 24 + @include border-radius(5px 5px 0 0);
  25 + margin-bottom: 0px;
31 } 26 }
32 27
33 .login-box input.text.bottom{ 28 .login-box input.text.bottom{
34 - -webkit-border-bottom-right-radius: 5px;  
35 - -webkit-border-bottom-left-radius: 5px;  
36 - -moz-border-radius-bottomright: 5px;  
37 - -moz-border-radius-bottomleft: 5px;  
38 - border-bottom-right-radius: 5px;  
39 - border-bottom-left-radius: 5px; 29 + @include border-radius(0 0 5px 5px);
40 border-top: 0; 30 border-top: 0;
41 margin-bottom: 20px; 31 margin-bottom: 20px;
42 } 32 }
app/assets/stylesheets/sections/merge_requests.scss
  Diff comments   View file @83f2a38
@@ -5,10 +5,10 @@ @@ -5,10 +5,10 @@
5 5
6 .mr_branch_box { 6 .mr_branch_box {
7 @extend .ui-box; 7 @extend .ui-box;
8 - margin-bottom:20px; 8 + margin-bottom: 20px;
9 9
10 .body { 10 .body {
11 - background:#f1f1f1; 11 + background: #f1f1f1;
12 } 12 }
13 13
14 } 14 }
@@ -23,31 +23,30 @@ @@ -23,31 +23,30 @@
23 } 23 }
24 24
25 form { 25 form {
26 - margin-bottom:0; 26 + margin-bottom: 0;
27 .clearfix { 27 .clearfix {
28 - margin-bottom:0; 28 + margin-bottom: 0;
29 } 29 }
30 } 30 }
31 31
32 .accept_group { 32 .accept_group {
33 - float:left; 33 + float: left;
34 border: 1px solid #ADA; 34 border: 1px solid #ADA;
35 padding: 2px; 35 padding: 2px;
36 @include border-radius(5px); 36 @include border-radius(5px);
37 - border-radius: 5px;  
38 background: #CEB; 37 background: #CEB;
39 38
40 .accept_merge_request { 39 .accept_merge_request {
41 - font-size:13px;  
42 - float:left; 40 + font-size: 13px;
  41 + float: left;
43 } 42 }
44 .remove_branch_holder { 43 .remove_branch_holder {
45 - margin-left:20px;  
46 - margin-right:10px;  
47 - float:left; 44 + margin-left: 20px;
  45 + margin-right: 10px;
  46 + float: left;
48 } 47 }
49 label { 48 label {
50 - color:#444; 49 + color: #444;
51 } 50 }
52 } 51 }
53 52
@@ -60,15 +59,15 @@ @@ -60,15 +59,15 @@
60 .mr_nav_tabs { 59 .mr_nav_tabs {
61 li { 60 li {
62 a { 61 a {
63 - font-weight:bold;  
64 - padding:8px 20px;  
65 - text-align:center; 62 + font-weight: bold;
  63 + padding: 8px 20px;
  64 + text-align: center;
66 } 65 }
67 } 66 }
68 } 67 }
69 68
70 li.merge_request { 69 li.merge_request {
71 - padding:7px 10px; 70 + padding: 7px 10px;
72 img.avatar { 71 img.avatar {
73 width: 32px; 72 width: 32px;
74 margin-top: 1px; 73 margin-top: 1px;
@@ -85,35 +84,35 @@ li.merge_request { @@ -85,35 +84,35 @@ li.merge_request {
85 } 84 }
86 85
87 .label_branch { 86 .label_branch {
88 - @include round-borders-all(4px);  
89 - padding:2px 4px;  
90 - border:none;  
91 - font-size:14px; 87 + @include border-radius(4px);
  88 + padding: 2px 4px;
  89 + border: none;
  90 + font-size: 14px;
92 background: #474D57; 91 background: #474D57;
93 - color:#fff; 92 + color: #fff;
94 font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace; 93 font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace;
95 } 94 }
96 95
97 .mr_source_commit, 96 .mr_source_commit,
98 .mr_target_commit { 97 .mr_target_commit {
99 .commit { 98 .commit {
100 - margin:0;  
101 - padding:0; 99 + margin: 0;
  100 + padding: 0;
102 padding: 5px; 101 padding: 5px;
103 margin-bottom: 5px; 102 margin-bottom: 5px;
104 .avatar { position:relative } 103 .avatar { position:relative }
105 .row_title { 104 .row_title {
106 - color:#444; 105 + color: #444;
107 } 106 }
108 .commit-author-name, 107 .commit-author-name,
109 .dash, 108 .dash,
110 .committed_ago, 109 .committed_ago,
111 .browse_code_link_holder { 110 .browse_code_link_holder {
112 - display:none; 111 + display: none;
113 } 112 }
114 - list-style:none; 113 + list-style: none;
115 &:hover { 114 &:hover {
116 - background:none; 115 + background: none;
117 } 116 }
118 } 117 }
119 } 118 }
@@ -126,14 +125,14 @@ li.merge_request { @@ -126,14 +125,14 @@ li.merge_request {
126 @extend .main_box; 125 @extend .main_box;
127 .merge_requests_middle_box { 126 .merge_requests_middle_box {
128 @extend .middle_box_content; 127 @extend .middle_box_content;
129 - height:30px; 128 + height: 30px;
130 .merge_requests_assignee { 129 .merge_requests_assignee {
131 @extend .span6; 130 @extend .span6;
132 - float:left; 131 + float: left;
133 } 132 }
134 .merge_requests_milestone { 133 .merge_requests_milestone {
135 @extend .span4; 134 @extend .span4;
136 - float:left; 135 + float: left;
137 } 136 }
138 } 137 }
139 } 138 }
app/assets/stylesheets/sections/nav.scss
  Diff comments   View file @83f2a38
@@ -3,36 +3,35 @@ @@ -3,36 +3,35 @@
3 * 3 *
4 */ 4 */
5 ul.main_menu { 5 ul.main_menu {
6 - border-radius: 4px; 6 + @include border-radius(4px);
7 margin: auto; 7 margin: auto;
8 - margin:30px 0;  
9 - border:1px solid #BBB;  
10 - height:37px; 8 + margin: 30px 0;
  9 + border: 1px solid #BBB;
  10 + height: 37px;
11 @include bg-gray-gradient; 11 @include bg-gray-gradient;
12 - position:relative;  
13 - overflow:hidden; 12 + position: relative;
  13 + overflow: hidden;
14 @include shade; 14 @include shade;
15 .count { 15 .count {
16 position: relative; 16 position: relative;
17 - top: -1px;  
18 - display: inline-block;  
19 - height: 15px;  
20 - margin: 0 0 0 5px;  
21 - padding: 0 8px 1px 8px;  
22 - height: auto;  
23 - font-size: 0.82em;  
24 - line-height: 14px;  
25 - text-align: center;  
26 - color: #777;  
27 - background: #f2f2f2;  
28 - border-top: 1px solid #CCC;  
29 - border-radius: 8px;  
30 - -moz-border-radius: 8px; 17 + top: -1px;
  18 + display: inline-block;
  19 + height: 15px;
  20 + margin: 0 0 0 5px;
  21 + padding: 0 8px 1px 8px;
  22 + height: auto;
  23 + font-size: 0.82em;
  24 + line-height: 14px;
  25 + text-align: center;
  26 + color: #777;
  27 + background: #f2f2f2;
  28 + border-top: 1px solid #CCC;
  29 + @include border-radius(8px);
31 } 30 }
32 .label { 31 .label {
33 - background:$hover;  
34 - text-shadow:none;  
35 - color:$style_color; 32 + background: $hover;
  33 + text-shadow: none;
  34 + color: $style_color;
36 } 35 }
37 li { 36 li {
38 list-style-type: none; 37 list-style-type: none;
@@ -41,26 +40,21 @@ ul.main_menu { @@ -41,26 +40,21 @@ ul.main_menu {
41 width: 1%; 40 width: 1%;
42 border-right: 1px solid #DDD; 41 border-right: 1px solid #DDD;
43 border-left: 1px solid #EEE; 42 border-left: 1px solid #EEE;
44 - border-bottom:2px solid #CFCFCF; 43 + border-bottom: 2px solid #CFCFCF;
45 44
46 &:first-child{ 45 &:first-child{
47 - -webkit-border-top-left-radius: 4px;  
48 - -webkit-border-bottom-left-radius: 4px;  
49 - -moz-border-radius-topleft: 4px;  
50 - -moz-border-radius-bottomleft: 4px;  
51 - border-top-left-radius: 4px;  
52 - border-bottom-left-radius: 4px; 46 + @include border-radius(5px 0 0 5px);
53 border-left: 0; 47 border-left: 0;
54 } 48 }
55 49
56 &.active { 50 &.active {
57 - background-color:#D5D5D5; 51 + background-color: #D5D5D5;
58 border-right: 1px solid #BBB; 52 border-right: 1px solid #BBB;
59 border-left: 1px solid #BBB; 53 border-left: 1px solid #BBB;
60 - border-radius: 0 0 1px 1px; 54 + @include border-radius(0 0 1px 1px);
61 &:first-child{ 55 &:first-child{
62 - border-bottom:none;  
63 - border-left:none; 56 + border-bottom: none;
  57 + border-left: none;
64 } 58 }
65 } 59 }
66 60
@@ -68,10 +62,10 @@ ul.main_menu { @@ -68,10 +62,10 @@ ul.main_menu {
68 a { 62 a {
69 background: url(home_icon.PNG) no-repeat center center; 63 background: url(home_icon.PNG) no-repeat center center;
70 text-indent:-9999px; 64 text-indent:-9999px;
71 - min-width:20px; 65 + min-width: 20px;
72 img { 66 img {
73 - position:relative;  
74 - top:4px; 67 + position: relative;
  68 + top: 4px;
75 } 69 }
76 } 70 }
77 } 71 }
@@ -79,12 +73,12 @@ ul.main_menu { @@ -79,12 +73,12 @@ ul.main_menu {
79 a { 73 a {
80 display: block; 74 display: block;
81 text-align: center; 75 text-align: center;
82 - font-weight:bold;  
83 - height:35px;  
84 - line-height:36px; 76 + font-weight: bold;
  77 + height: 35px;
  78 + line-height: 36px;
85 color: $style_color; 79 color: $style_color;
86 - text-shadow:0 1px 1px white;  
87 - padding:0 10px; 80 + text-shadow: 0 1px 1px white;
  81 + padding: 0 10px;
88 } 82 }
89 } 83 }
90 /* 84 /*
app/assets/stylesheets/sections/notes.scss
  Diff comments   View file @83f2a38
@@ -4,30 +4,30 @@ @@ -4,30 +4,30 @@
4 */ 4 */
5 #notes-list, 5 #notes-list,
6 #new-notes-list { 6 #new-notes-list {
7 - display:block;  
8 - list-style:none;  
9 - margin:0px;  
10 - padding:0px; 7 + display: block;
  8 + list-style: none;
  9 + margin: 0px;
  10 + padding: 0px;
11 } 11 }
12 12
13 .issue_notes, 13 .issue_notes,
14 .wiki_notes { 14 .wiki_notes {
15 .note_content { 15 .note_content {
16 - float:left;  
17 - width:400px; 16 + float: left;
  17 + width: 400px;
18 } 18 }
19 } 19 }
20 20
21 /* Note textare */ 21 /* Note textare */
22 #note_note { 22 #note_note {
23 - height:80px;  
24 - width:99%;  
25 - font-size:14px; 23 + height: 80px;
  24 + width: 99%;
  25 + font-size: 14px;
26 } 26 }
27 27
28 #new_note { 28 #new_note {
29 .attach_holder { 29 .attach_holder {
30 - display:none; 30 + display: none;
31 } 31 }
32 } 32 }
33 33
@@ -36,34 +36,34 @@ @@ -36,34 +36,34 @@
36 border: 1px solid #ddd; 36 border: 1px solid #ddd;
37 padding: 10px; 37 padding: 10px;
38 min-height: 60px; 38 min-height: 60px;
39 - background:#f5f5f5; 39 + background: #f5f5f5;
40 } 40 }
41 41
42 .note { 42 .note {
43 padding: 8px 0; 43 padding: 8px 0;
44 overflow: hidden; 44 overflow: hidden;
45 display: block; 45 display: block;
46 - position:relative; 46 + position: relative;
47 img {float: left; margin-right: 10px;} 47 img {float: left; margin-right: 10px;}
48 - img.emoji {float:none;margin:0;} 48 + img.emoji {float: none;margin: 0;}
49 .note-author cite{font-style: italic;} 49 .note-author cite{font-style: italic;}
50 - p { color:$style_color; } 50 + p { color: $style_color; }
51 .note-author { color: $style_color;} 51 .note-author { color: $style_color;}
52 52
53 - .note-title { margin-left:45px; padding-top: 5px;} 53 + .note-title { margin-left: 45px; padding-top: 5px;}
54 .avatar { 54 .avatar {
55 - margin-top:3px; 55 + margin-top: 3px;
56 } 56 }
57 57
58 .delete-note { 58 .delete-note {
59 - display:none;  
60 - position:absolute;  
61 - right:0;  
62 - top:0; 59 + display: none;
  60 + position: absolute;
  61 + right: 0;
  62 + top: 0;
63 } 63 }
64 64
65 &:hover { 65 &:hover {
66 - .delete-note { display:block; } 66 + .delete-note { display: block; }
67 } 67 }
68 } 68 }
69 #notes-list:not(.reversed) .note, 69 #notes-list:not(.reversed) .note,
@@ -94,30 +94,31 @@ p.notify_controls span{ @@ -94,30 +94,31 @@ p.notify_controls span{
94 } 94 }
95 95
96 tr.line_notes_row { 96 tr.line_notes_row {
97 - border-bottom:1px solid #DDD; 97 + border-bottom: 1px solid #DDD;
98 border-left: 7px solid #2A79A3; 98 border-left: 7px solid #2A79A3;
99 99
100 &.reply { 100 &.reply {
101 - background:#eee; 101 + background: #eee;
102 border-left: 7px solid #2A79A3; 102 border-left: 7px solid #2A79A3;
103 - border-top:1px solid #ddd; 103 + border-top: 1px solid #ddd;
104 td { 104 td {
105 - padding:7px 10px; 105 + padding: 7px 10px;
106 } 106 }
107 a.line_note_reply_link { 107 a.line_note_reply_link {
108 - @include round-borders-all(4px); 108 + border: 1px solid #eaeaea;
  109 + @include border-radius(4px);
109 padding: 3px 10px; 110 padding: 3px 10px;
110 - margin-left:5px; 111 + margin-left: 5px;
111 color: white; 112 color: white;
112 background: #2A79A3; 113 background: #2A79A3;
113 border-color: #2A79A3; 114 border-color: #2A79A3;
114 } 115 }
115 } 116 }
116 ul { 117 ul {
117 - margin:0; 118 + margin: 0;
118 li { 119 li {
119 - padding:0;  
120 - border:none; 120 + padding: 0;
  121 + border: none;
121 } 122 }
122 } 123 }
123 } 124 }
@@ -125,28 +126,28 @@ tr.line_notes_row { @@ -125,28 +126,28 @@ tr.line_notes_row {
125 .line_notes_row, .per_line_form { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } 126 .line_notes_row, .per_line_form { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; }
126 127
127 .per_line_form { 128 .per_line_form {
128 - background:#f5f5f5;  
129 - border-top:1px solid #eee; 129 + background: #f5f5f5;
  130 + border-top: 1px solid #eee;
130 form { margin: 0; } 131 form { margin: 0; }
131 td { 132 td {
132 - border-bottom:1px solid #ddd; 133 + border-bottom: 1px solid #ddd;
133 } 134 }
134 .note_actions { 135 .note_actions {
135 - margin:0; 136 + margin: 0;
136 padding-top: 10px; 137 padding-top: 10px;
137 138
138 .buttons { 139 .buttons {
139 - float:left;  
140 - width:300px; 140 + float: left;
  141 + width: 300px;
141 } 142 }
142 .options { 143 .options {
143 .labels { 144 .labels {
144 - float:left;  
145 - padding-left:10px; 145 + float: left;
  146 + padding-left: 10px;
146 label { 147 label {
147 padding: 6px 0; 148 padding: 6px 0;
148 margin: 0; 149 margin: 0;
149 - width:120px; 150 + width: 120px;
150 } 151 }
151 } 152 }
152 } 153 }
@@ -154,13 +155,13 @@ tr.line_notes_row { @@ -154,13 +155,13 @@ tr.line_notes_row {
154 } 155 }
155 156
156 td .line_note_link { 157 td .line_note_link {
157 - position:absolute; 158 + position: absolute;
158 margin-left:-70px; 159 margin-left:-70px;
159 margin-top:-10px; 160 margin-top:-10px;
160 - z-index:10; 161 + z-index: 10;
161 background: url("comment_add.png") no-repeat left 0; 162 background: url("comment_add.png") no-repeat left 0;
162 - width:32px;  
163 - height:32px; 163 + width: 32px;
  164 + height: 32px;
164 165
165 opacity: 0.0; 166 opacity: 0.0;
166 filter: alpha(opacity=0); 167 filter: alpha(opacity=0);
@@ -180,13 +181,13 @@ td .line_note_link { @@ -180,13 +181,13 @@ td .line_note_link {
180 .new_note { 181 .new_note {
181 .input-file { 182 .input-file {
182 font: 500px monospace; 183 font: 500px monospace;
183 - opacity:0; 184 + opacity: 0;
184 filter: alpha(opacity=0); 185 filter: alpha(opacity=0);
185 position: absolute; 186 position: absolute;
186 z-index: 1; 187 z-index: 1;
187 - top:0;  
188 - right:0;  
189 - padding:0; 188 + top: 0;
  189 + right: 0;
  190 + padding: 0;
190 margin: 0; 191 margin: 0;
191 } 192 }
192 193
@@ -198,24 +199,24 @@ td .line_note_link { @@ -198,24 +199,24 @@ td .line_note_link {
198 } 199 }
199 200
200 .attachments { 201 .attachments {
201 - position:relative; 202 + position: relative;
202 width: 350px; 203 width: 350px;
203 height: 50px; 204 height: 50px;
204 - overflow:hidden; 205 + overflow: hidden;
205 margin:0 0 5px !important; 206 margin:0 0 5px !important;
206 207
207 .input_file { 208 .input_file {
208 .file_upload { 209 .file_upload {
209 position: absolute; 210 position: absolute;
210 - right:14px;  
211 - top:7px; 211 + right: 14px;
  212 + top: 7px;
212 } 213 }
213 214
214 .file_name { 215 .file_name {
215 - line-height:30px;  
216 - width:240px;  
217 - height:28px;  
218 - overflow:hidden; 216 + line-height: 30px;
  217 + width: 240px;
  218 + height: 28px;
  219 + overflow: hidden;
219 } 220 }
220 .input-file { 221 .input-file {
221 width: 260px; 222 width: 260px;
@@ -228,5 +229,5 @@ td .line_note_link { @@ -228,5 +229,5 @@ td .line_note_link {
228 229
229 .note-text { 230 .note-text {
230 border: 1px solid #aaa; 231 border: 1px solid #aaa;
231 - box-shadow:none; 232 + box-shadow: none;
232 } 233 }
app/assets/stylesheets/sections/profile.scss
  Diff comments   View file @83f2a38
1 .profile_history { 1 .profile_history {
2 .event_feed { 2 .event_feed {
3 - min-height:20px; 3 + min-height: 20px;
4 .avatar { 4 .avatar {
5 - width:20px; 5 + width: 20px;
6 } 6 }
7 } 7 }
8 } 8 }
9 9
10 .profile_avatar_holder { 10 .profile_avatar_holder {
11 - float:left;  
12 - width:60px;  
13 - height:60px;  
14 - margin-right:20px; 11 + float: left;
  12 + width: 60px;
  13 + height: 60px;
  14 + margin-right: 20px;
15 img { 15 img {
16 - width:60px;  
17 - height:60px;  
18 - background:#fff; 16 + width: 60px;
  17 + height: 60px;
  18 + background: #fff;
19 padding: 1px; 19 padding: 1px;
20 border: 1px solid #ddd; 20 border: 1px solid #ddd;
21 } 21 }
app/assets/stylesheets/sections/projects.scss
  Diff comments   View file @83f2a38
@@ -10,38 +10,38 @@ @@ -10,38 +10,38 @@
10 .groups_box, 10 .groups_box,
11 .projects_box { 11 .projects_box {
12 h5 { 12 h5 {
13 - color:$style_color;  
14 - font-size:16px; 13 + color: $style_color;
  14 + font-size: 16px;
15 text-shadow: 0 1px 1px #fff; 15 text-shadow: 0 1px 1px #fff;
16 padding: 2px 10px; 16 padding: 2px 10px;
17 - line-height:32px;  
18 - font-size:14px; 17 + line-height: 32px;
  18 + font-size: 14px;
19 } 19 }
20 ul { 20 ul {
21 li { 21 li {
22 - padding:0; 22 + padding: 0;
23 a { 23 a {
24 - display:block; 24 + display: block;
25 .group_name { 25 .group_name {
26 - font-size:14px;  
27 - line-height:18px; 26 + font-size: 14px;
  27 + line-height: 18px;
28 } 28 }
29 .project_name { 29 .project_name {
30 - color:#4fa2bd;  
31 - font-size:14px;  
32 - line-height:18px; 30 + color: #4fa2bd;
  31 + font-size: 14px;
  32 + line-height: 18px;
33 } 33 }
34 .arrow { 34 .arrow {
35 - float:right;  
36 - padding:10px;  
37 - margin:0; 35 + float: right;
  36 + padding: 10px;
  37 + margin: 0;
38 } 38 }
39 .last_activity { 39 .last_activity {
40 - padding-top:5px;  
41 - display:block; 40 + padding-top: 5px;
  41 + display: block;
42 span, strong { 42 span, strong {
43 - font-size:12px;  
44 - color:#666; 43 + font-size: 12px;
  44 + color: #666;
45 } 45 }
46 } 46 }
47 } 47 }
@@ -58,21 +58,21 @@ @@ -58,21 +58,21 @@
58 .project_name_holder { 58 .project_name_holder {
59 input, 59 input,
60 label { 60 label {
61 - font-size:16px;  
62 - line-height:20px;  
63 - padding:8px; 61 + font-size: 16px;
  62 + line-height: 20px;
  63 + padding: 8px;
64 } 64 }
65 label { 65 label {
66 - color:#888; 66 + color: #888;
67 } 67 }
68 .btn { 68 .btn {
69 - padding:6px 10px;  
70 - margin-left:10px;  
71 - margin-bottom:8px; 69 + padding: 6px 10px;
  70 + margin-left: 10px;
  71 + margin-bottom: 8px;
72 } 72 }
73 } 73 }
74 .adv_settings { 74 .adv_settings {
75 - h6 { margin-left:40px; } 75 + h6 { margin-left: 40px; }
76 } 76 }
77 } 77 }
78 78
@@ -81,13 +81,13 @@ @@ -81,13 +81,13 @@
81 @include bg-gray-gradient; 81 @include bg-gray-gradient;
82 padding: 4px 7px; 82 padding: 4px 7px;
83 border: 1px solid #CCC; 83 border: 1px solid #CCC;
84 - margin-bottom:20px; 84 + margin-bottom: 20px;
85 } 85 }
86 86
87 .project_clone_holder { 87 .project_clone_holder {
88 input[type="text"], 88 input[type="text"],
89 .btn { 89 .btn {
90 - font-size:12px; 90 + font-size: 12px;
91 line-height: 18px; 91 line-height: 18px;
92 margin: 0; 92 margin: 0;
93 padding: 3px 10px; 93 padding: 3px 10px;
@@ -102,8 +102,8 @@ @@ -102,8 +102,8 @@
102 102
103 .save-project-loader { 103 .save-project-loader {
104 img { 104 img {
105 - margin-top:50px;  
106 - margin-bottom:50px; 105 + margin-top: 50px;
  106 + margin-bottom: 50px;
107 } 107 }
108 h3 { 108 h3 {
109 @extend .page_title; 109 @extend .page_title;
app/assets/stylesheets/sections/themes.scss
  Diff comments   View file @83f2a38
@@ -6,17 +6,17 @@ @@ -6,17 +6,17 @@
6 } 6 }
7 7
8 .themes_opts { 8 .themes_opts {
9 - padding-left:20px; 9 + padding-left: 20px;
10 10
11 label { 11 label {
12 - width:175px;  
13 - margin-right:40px; 12 + width: 175px;
  13 + margin-right: 40px;
14 14
15 .prev { 15 .prev {
16 @extend .thumbnail; 16 @extend .thumbnail;
17 - height:30px;  
18 - width:175px;  
19 - margin-bottom:10px; 17 + height: 30px;
  18 + width: 175px;
  19 + margin-bottom: 10px;
20 20
21 &.classic { 21 &.classic {
22 background: #31363e; 22 background: #31363e;
@@ -42,17 +42,17 @@ @@ -42,17 +42,17 @@
42 } 42 }
43 43
44 .code_highlight_opts { 44 .code_highlight_opts {
45 - padding-left:20px; 45 + padding-left: 20px;
46 46
47 label { 47 label {
48 - width:220px;  
49 - margin-right:40px; 48 + width: 220px;
  49 + margin-right: 40px;
50 50
51 .prev { 51 .prev {
52 @extend .thumbnail; 52 @extend .thumbnail;
53 - height:151px;  
54 - width:220px;  
55 - margin-bottom:10px; 53 + height: 151px;
  54 + width: 220px;
  55 + margin-bottom: 10px;
56 } 56 }
57 } 57 }
58 } 58 }
app/assets/stylesheets/sections/tree.scss
  Diff comments   View file @83f2a38
1 .tree-holder { 1 .tree-holder {
2 .tree-content-holder { 2 .tree-content-holder {
3 - float:left;  
4 - width:100%; 3 + float: left;
  4 + width: 100%;
5 } 5 }
6 6
7 .tree_progress { 7 .tree_progress {
8 - display:none;  
9 - margin:20px; 8 + display: none;
  9 + margin: 20px;
10 &.loading { 10 &.loading {
11 - display:block; 11 + display: block;
12 } 12 }
13 } 13 }
14 14
@@ -18,20 +18,20 @@ @@ -18,20 +18,20 @@
18 &:hover { 18 &:hover {
19 td { 19 td {
20 background: $hover; 20 background: $hover;
21 - border-top:1px solid #ADF;  
22 - border-bottom:1px solid #ADF; 21 + border-top: 1px solid #ADF;
  22 + border-bottom: 1px solid #ADF;
23 } 23 }
24 - cursor:pointer; 24 + cursor: pointer;
25 } 25 }
26 } 26 }
27 } 27 }
28 28
29 .tree-item { 29 .tree-item {
30 .tree-item-file-name { 30 .tree-item-file-name {
31 - vertical-align:middle; 31 + vertical-align: middle;
32 a { 32 a {
33 &:hover { 33 &:hover {
34 - color:$blue_link; 34 + color: $primary_color;
35 } 35 }
36 } 36 }
37 37
@@ -48,8 +48,8 @@ @@ -48,8 +48,8 @@
48 padding: 2px 10px; 48 padding: 2px 10px;
49 } 49 }
50 td { 50 td {
51 - line-height:20px;  
52 - background:#fafafa; 51 + line-height: 20px;
  52 + background: #fafafa;
53 } 53 }
54 } 54 }
55 55
@@ -86,7 +86,7 @@ @@ -86,7 +86,7 @@
86 .tree-btn-group { 86 .tree-btn-group {
87 .btn { 87 .btn {
88 margin-right:-3px; 88 margin-right:-3px;
89 - padding:2px 10px; 89 + padding: 2px 10px;
90 } 90 }
91 } 91 }
92 92
app/assets/stylesheets/themes/ui_basic.scss
  Diff comments   View file @83f2a38
@@ -11,8 +11,8 @@ @@ -11,8 +11,8 @@
11 a { 11 a {
12 color: $link_color; 12 color: $link_color;
13 &:hover { 13 &:hover {
14 - text-decoration:none;  
15 - color: $blue_link; 14 + text-decoration: none;
  15 + color: $primary_color;
16 } 16 }
17 } 17 }
18 18
app/assets/stylesheets/themes/ui_mars.scss
  Diff comments   View file @83f2a38
@@ -47,17 +47,17 @@ @@ -47,17 +47,17 @@
47 a { 47 a {
48 h1 { 48 h1 {
49 background: url('logo_white.png') no-repeat 0px 2px; 49 background: url('logo_white.png') no-repeat 0px 2px;
50 - color:#eee; 50 + color: #eee;
51 text-shadow: 0 1px 1px #111; 51 text-shadow: 0 1px 1px #111;
52 } 52 }
53 } 53 }
54 .separator { 54 .separator {
55 - display:none; 55 + display: none;
56 } 56 }
57 57
58 } 58 }
59 .project_name { 59 .project_name {
60 - color:#eee; 60 + color: #eee;
61 text-shadow: 0 1px 1px #111; 61 text-shadow: 0 1px 1px #111;
62 } 62 }
63 } 63 }
app/assets/stylesheets/variables.scss 0 → 100644
  Diff comments   View file @83f2a38
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
  1 +/** Colors **/
  2 +$primary_color: #2FA0BB;
  3 +$link_color: #3A89A3;
  4 +$style_color: #474D57;
  5 +$hover: #D9EDF7;
0 \ No newline at end of file 6 \ No newline at end of file