Commit b825582eb16d7983798f3a35746a8352675d3f23
1 parent
84de1b71
Exists in
master
and in
4 other branches
replaced redundant -*-border-radius box-shadows and others with corresponding mixins
Showing
26 changed files
with
240 additions
and
268 deletions
Show diff stats
app/assets/stylesheets/common.scss
| @@ -10,7 +10,7 @@ body { | @@ -10,7 +10,7 @@ body { | ||
| 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 { |
| @@ -32,7 +32,7 @@ body { | @@ -32,7 +32,7 @@ body { | ||
| 32 | text-decoration: underline; | 32 | text-decoration: underline; |
| 33 | font-size: 14px; | 33 | font-size: 14px; |
| 34 | font-weight: bold; | 34 | font-weight: bold; |
| 35 | - padding:10px 0; | 35 | + padding: 10px 0; |
| 36 | padding-bottom: 0; | 36 | padding-bottom: 0; |
| 37 | } | 37 | } |
| 38 | 38 | ||
| @@ -61,7 +61,7 @@ table a code { | @@ -61,7 +61,7 @@ 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; | 66 | width: 40px; |
| 67 | height: 40px; | 67 | height: 40px; |
| @@ -78,10 +78,10 @@ table a code { | @@ -78,10 +78,10 @@ table a code { | ||
| 78 | overflow: hidden; | 78 | overflow: hidden; |
| 79 | background: white; | 79 | background: white; |
| 80 | cursor: pointer; | 80 | cursor: pointer; |
| 81 | - border-bottom:1px solid #ccc; | 81 | + border-bottom: 1px solid #ccc; |
| 82 | 82 | ||
| 83 | h4 { | 83 | h4 { |
| 84 | - color:#666; | 84 | + color: #666; |
| 85 | font-size: 18px; | 85 | font-size: 18px; |
| 86 | line-height: 38px; | 86 | line-height: 38px; |
| 87 | padding-top: 5px; | 87 | padding-top: 5px; |
| @@ -102,7 +102,7 @@ span.update-author { | @@ -102,7 +102,7 @@ span.update-author { | ||
| 102 | display: block; | 102 | display: block; |
| 103 | } | 103 | } |
| 104 | span.update-author { | 104 | span.update-author { |
| 105 | - color:#999; | 105 | + color: #999; |
| 106 | font-weight: normal; | 106 | font-weight: normal; |
| 107 | font-style: italic; | 107 | font-style: italic; |
| 108 | } | 108 | } |
| @@ -122,7 +122,7 @@ span.update-author { | @@ -122,7 +122,7 @@ span.update-author { | ||
| 122 | display: none; | 122 | display: none; |
| 123 | } | 123 | } |
| 124 | .user-mention { | 124 | .user-mention { |
| 125 | - color:#2FA0BB; | 125 | + color: #2FA0BB; |
| 126 | font-weight: bold; | 126 | font-weight: bold; |
| 127 | } | 127 | } |
| 128 | 128 | ||
| @@ -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; |
| @@ -213,7 +213,7 @@ ul.breadcrumb { | @@ -213,7 +213,7 @@ ul.breadcrumb { | ||
| 213 | } | 213 | } |
| 214 | 214 | ||
| 215 | a { | 215 | a { |
| 216 | - color:#474D57; | 216 | + color: #474D57; |
| 217 | font-weight: bold; | 217 | font-weight: bold; |
| 218 | font-size: 14px; | 218 | font-size: 14px; |
| 219 | } | 219 | } |
| @@ -264,7 +264,7 @@ input.git_clone_url { | @@ -264,7 +264,7 @@ input.git_clone_url { | ||
| 264 | 264 | ||
| 265 | /** bordered list **/ | 265 | /** bordered list **/ |
| 266 | ul.bordered-list { | 266 | ul.bordered-list { |
| 267 | - margin:5px 0px; | 267 | + margin: 5px 0px; |
| 268 | padding: 0px; | 268 | padding: 0px; |
| 269 | li { | 269 | li { |
| 270 | padding: 5px 0; | 270 | padding: 5px 0; |
| @@ -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,22 +337,22 @@ p.time { | @@ -337,22 +337,22 @@ 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; | 344 | font-size: 14px; |
| 345 | - padding:2px 10px; | ||
| 346 | - color:#666; | ||
| 347 | - border-bottom:1px solid #f1f1f1; | 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; | 353 | + color: #111; |
| 354 | background: $hover; | 354 | background: $hover; |
| 355 | - border-color:#CCC; | 355 | + border-color: #CCC; |
| 356 | .ico.project { | 356 | .ico.project { |
| 357 | background-position:-209px -21px; | 357 | background-position:-209px -21px; |
| 358 | } | 358 | } |
| @@ -420,12 +420,12 @@ p.time { | @@ -420,12 +420,12 @@ 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; | 427 | font-size: 14px; |
| 428 | - padding:5px 15px; | 428 | + padding: 5px 15px; |
| 429 | line-height: 24px; | 429 | line-height: 24px; |
| 430 | width: 60px; | 430 | width: 60px; |
| 431 | text-align: center; | 431 | text-align: center; |
| @@ -450,7 +450,7 @@ p.time { | @@ -450,7 +450,7 @@ p.time { | ||
| 450 | background: #E3E5EA; | 450 | background: #E3E5EA; |
| 451 | padding: 5px; | 451 | padding: 5px; |
| 452 | margin-top: 5px; | 452 | margin-top: 5px; |
| 453 | - border-radius: 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; |
| @@ -504,7 +504,7 @@ li.note { | @@ -504,7 +504,7 @@ 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 | ||
| @@ -554,12 +554,12 @@ li.note { | @@ -554,12 +554,12 @@ 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 | ||
| @@ -572,15 +572,15 @@ li.note { | @@ -572,15 +572,15 @@ li.note { | ||
| 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 | ||
| @@ -612,7 +612,7 @@ li.note { | @@ -612,7 +612,7 @@ li.note { | ||
| 612 | } | 612 | } |
| 613 | .active { | 613 | .active { |
| 614 | img { | 614 | img { |
| 615 | - border:1px solid #ccc; | 615 | + border: 1px solid #ccc; |
| 616 | background: $hover; | 616 | background: $hover; |
| 617 | @include border-radius(5px); | 617 | @include border-radius(5px); |
| 618 | } | 618 | } |
| @@ -627,7 +627,7 @@ li.note { | @@ -627,7 +627,7 @@ 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 | } |
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
| @@ -41,16 +41,16 @@ | @@ -41,16 +41,16 @@ | ||
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | .middle_box_content { | 43 | .middle_box_content { |
| 44 | - border-radius: 0; | 44 | + @include border-radius(0); |
| 45 | border: none; | 45 | border: none; |
| 46 | font-size: 12px; | 46 | font-size: 12px; |
| 47 | - background-color:#f5f5f5; | 47 | + background-color: #f5f5f5; |
| 48 | border: none; | 48 | border: none; |
| 49 | - border-top:1px solid #eee; | 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,14 +59,14 @@ | @@ -59,14 +59,14 @@ | ||
| 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 | @include round-borders-all(4px); |
| 65 | border-color: #CCC; | 65 | border-color: #CCC; |
| 66 | @include solid_shade; | 66 | @include solid_shade; |
| 67 | 67 | ||
| 68 | &.white { | 68 | &.white { |
| 69 | - background:#fff; | 69 | + background: #fff; |
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | ul { | 72 | ul { |
| @@ -87,16 +87,16 @@ | @@ -87,16 +87,16 @@ | ||
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | form { | 89 | form { |
| 90 | - padding:9px 0; | 90 | + padding: 9px 0; |
| 91 | margin: 0px; | 91 | margin: 0px; |
| 92 | } | 92 | } |
| 93 | 93 | ||
| 94 | .nav-pills { | 94 | .nav-pills { |
| 95 | li { | 95 | li { |
| 96 | - padding:3px 0; | 96 | + padding: 3px 0; |
| 97 | &.active a { background-color: $style_color; } | 97 | &.active a { background-color: $style_color; } |
| 98 | a { | 98 | a { |
| 99 | - border-radius: 7px; | 99 | + @include border-radius(7px); |
| 100 | } | 100 | } |
| 101 | } | 101 | } |
| 102 | } | 102 | } |
| @@ -116,20 +116,20 @@ | @@ -116,20 +116,20 @@ | ||
| 116 | padding: 5px 20px; | 116 | padding: 5px 20px; |
| 117 | } | 117 | } |
| 118 | .middle_title { | 118 | .middle_title { |
| 119 | - background:#f5f5f5; | 119 | + background: #f5f5f5; |
| 120 | margin:20px -20px; | 120 | margin:20px -20px; |
| 121 | padding: 0 20px; | 121 | padding: 0 20px; |
| 122 | - border-top:1px solid #eee; | ||
| 123 | - border-bottom:1px solid #eee; | 122 | + border-top: 1px solid #eee; |
| 123 | + border-bottom: 1px solid #eee; | ||
| 124 | font-size: 14px; | 124 | font-size: 14px; |
| 125 | - color:#777; | 125 | + color: #777; |
| 126 | } | 126 | } |
| 127 | } | 127 | } |
| 128 | .row_title { | 128 | .row_title { |
| 129 | font-weight: bold; | 129 | font-weight: bold; |
| 130 | - color:#444; | 130 | + color: #444; |
| 131 | &:hover { | 131 | &:hover { |
| 132 | - color:#444; | 132 | + color: #444; |
| 133 | text-decoration: underline; | 133 | text-decoration: underline; |
| 134 | } | 134 | } |
| 135 | } | 135 | } |
app/assets/stylesheets/gitlab_bootstrap/buttons.scss
| 1 | .btn { | 1 | .btn { |
| 2 | @include bg-gradient(#f7f7f7, #d5d5d5); | 2 | @include bg-gradient(#f7f7f7, #d5d5d5); |
| 3 | - border-color:#aaa; | 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; | 11 | + background: #2a79A3; |
| 12 | @include bg-gradient(#47A7b7, #2585b5); | 12 | @include bg-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; | 17 | background: $blue_link; |
| 18 | - color:#fff; | 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; | 28 | + background: #5aB9C3; |
| 29 | border-color: $blue_link; | 29 | border-color: $blue_link; |
| 30 | - color:#fff; | 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; | 33 | background: $blue_link; |
| 34 | - color:#fff; | 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 | ||
| @@ -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,13 +87,13 @@ | @@ -87,13 +87,13 @@ | ||
| 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; | 95 | font-size: 11px; |
| 96 | - padding:2px 6px; | 96 | + padding: 2px 6px; |
| 97 | line-height: 16px; | 97 | line-height: 16px; |
| 98 | margin: 2px; | 98 | margin: 2px; |
| 99 | } | 99 | } |
| @@ -105,6 +105,6 @@ | @@ -105,6 +105,6 @@ | ||
| 105 | 105 | ||
| 106 | &.padded { | 106 | &.padded { |
| 107 | margin-right: 3px; | 107 | margin-right: 3px; |
| 108 | - padding:4px 10px 4px; | 108 | + padding: 4px 10px 4px; |
| 109 | } | 109 | } |
| 110 | } | 110 | } |
app/assets/stylesheets/gitlab_bootstrap/common.scss
| @@ -32,22 +32,22 @@ | @@ -32,22 +32,22 @@ | ||
| 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; |
| @@ -57,7 +57,7 @@ | @@ -57,7 +57,7 @@ | ||
| 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,7 +69,7 @@ | @@ -69,7 +69,7 @@ | ||
| 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; } | 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; } | 73 | img.avatar.s16 { width: 16px; height: 16px; margin-right: 6px; } |
| 74 | img.avatar.s24 { width: 24px; height: 24px; margin-right: 8px; } | 74 | img.avatar.s24 { width: 24px; height: 24px; margin-right: 8px; } |
| 75 | img.avatar.s32 { width: 32px; height: 32px; margin-right: 10px; } | 75 | img.avatar.s32 { width: 32px; height: 32px; margin-right: 10px; } |
| @@ -77,8 +77,8 @@ img.lil_av { padding-left: 4px; padding-right: 3px; } | @@ -77,8 +77,8 @@ 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 { |
| @@ -87,7 +87,7 @@ input[type='search'].search-text-input { | @@ -87,7 +87,7 @@ input[type='search'].search-text-input { | ||
| 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
| @@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
| 3 | * | 3 | * |
| 4 | */ | 4 | */ |
| 5 | .file_holder { | 5 | .file_holder { |
| 6 | - border:1px solid #BBB; | 6 | + border: 1px solid #BBB; |
| 7 | margin-bottom: 1em; | 7 | margin-bottom: 1em; |
| 8 | @include solid_shade; | 8 | @include solid_shade; |
| 9 | 9 | ||
| @@ -28,19 +28,19 @@ | @@ -28,19 +28,19 @@ | ||
| 28 | font-size: 14px; | 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; | 31 | + color: #999; |
| 32 | font-size: 13px; | 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 { |
| @@ -52,7 +52,7 @@ | @@ -52,7 +52,7 @@ | ||
| 52 | } | 52 | } |
| 53 | 53 | ||
| 54 | &.image_file { | 54 | &.image_file { |
| 55 | - background:#eee; | 55 | + background: #eee; |
| 56 | text-align: center; | 56 | text-align: center; |
| 57 | img { | 57 | img { |
| 58 | padding: 100px; | 58 | padding: 100px; |
| @@ -83,12 +83,12 @@ | @@ -83,12 +83,12 @@ | ||
| 83 | &:last-child { | 83 | &:last-child { |
| 84 | border-right: none; | 84 | border-right: none; |
| 85 | } | 85 | } |
| 86 | - background:#fff; | 86 | + background: #fff; |
| 87 | padding: 5px; | 87 | padding: 5px; |
| 88 | } | 88 | } |
| 89 | .author, | 89 | .author, |
| 90 | .blame_commit { | 90 | .blame_commit { |
| 91 | - background:#f5f5f5; | 91 | + background: #f5f5f5; |
| 92 | vertical-align: top; | 92 | vertical-align: top; |
| 93 | } | 93 | } |
| 94 | .lines { | 94 | .lines { |
| @@ -102,7 +102,7 @@ | @@ -102,7 +102,7 @@ | ||
| 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 | ||
| @@ -113,10 +113,10 @@ | @@ -113,10 +113,10 @@ | ||
| 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; | 118 | margin: 0; |
| 119 | - color:#333; | 119 | + color: #333; |
| 120 | line-height: 24px; | 120 | line-height: 24px; |
| 121 | padding-left: 10px; | 121 | padding-left: 10px; |
| 122 | } | 122 | } |
app/assets/stylesheets/gitlab_bootstrap/lists.scss
| @@ -12,10 +12,10 @@ ul { | @@ -12,10 +12,10 @@ 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; | 17 | background: $hover; |
| 18 | - border-bottom:1px solid #ADF; | 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; } |
| @@ -23,7 +23,7 @@ ul { | @@ -23,7 +23,7 @@ ul { | ||
| 23 | p { | 23 | p { |
| 24 | padding-top: 1px; | 24 | padding-top: 1px; |
| 25 | margin: 0; | 25 | margin: 0; |
| 26 | - color:#222; | 26 | + color: #222; |
| 27 | img { | 27 | img { |
| 28 | position: relative; | 28 | position: relative; |
| 29 | top: 3px; | 29 | top: 3px; |
app/assets/stylesheets/gitlab_bootstrap/tables.scss
| @@ -2,7 +2,7 @@ table { | @@ -2,7 +2,7 @@ table { | ||
| 2 | @extend .table; | 2 | @extend .table; |
| 3 | @extend .table-striped; | 3 | @extend .table-striped; |
| 4 | @include solid_shade; | 4 | @include solid_shade; |
| 5 | - border:1px solid #bbb; | 5 | + border: 1px solid #bbb; |
| 6 | width: 100%; | 6 | width: 100%; |
| 7 | 7 | ||
| 8 | &.low { | 8 | &.low { |
| @@ -31,7 +31,7 @@ table { | @@ -31,7 +31,7 @@ table { | ||
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | td { | 33 | td { |
| 34 | - border-color:#f1f1f1; | 34 | + border-color: #f1f1f1; |
| 35 | line-height: 28px; | 35 | line-height: 28px; |
| 36 | 36 | ||
| 37 | .s16 { | 37 | .s16 { |
| @@ -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 |
app/assets/stylesheets/gitlab_bootstrap/typography.scss
| @@ -8,7 +8,7 @@ h3, h4, h5, h6 { line-height: 36px; } | @@ -8,7 +8,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; | 11 | + color: #456; |
| 12 | font-size: 20px; | 12 | font-size: 20px; |
| 13 | font-weight: normal; | 13 | font-weight: normal; |
| 14 | line-height: 28px; | 14 | line-height: 28px; |
| @@ -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 | ||
| @@ -63,8 +63,8 @@ a { | @@ -63,8 +63,8 @@ a { | ||
| 63 | 63 | ||
| 64 | &.supp_diff_link { | 64 | &.supp_diff_link { |
| 65 | text-align: center; | 65 | text-align: center; |
| 66 | - padding:20px 0; | ||
| 67 | - background:#f1f1f1; | 66 | + padding: 20px 0; |
| 67 | + background: #f1f1f1; | ||
| 68 | width: 100%; | 68 | width: 100%; |
| 69 | float: left; | 69 | float: left; |
| 70 | } | 70 | } |
app/assets/stylesheets/highlight/dark.scss
| @@ -28,29 +28,29 @@ | @@ -28,29 +28,29 @@ | ||
| 28 | .kn{font-weight: bold;} /* Keyword.Namespace */ | 28 | .kn{font-weight: bold;} /* Keyword.Namespace */ |
| 29 | .kp{font-weight: bold;} /* Keyword.Pseudo */ | 29 | .kp{font-weight: bold;} /* Keyword.Pseudo */ |
| 30 | .kr{font-weight: bold;} /* Keyword.Reserved */ | 30 | .kr{font-weight: bold;} /* Keyword.Reserved */ |
| 31 | - .kt{color:#458;font-weight: bold;} /* Keyword.Type */ | 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 */ | 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 */ | 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 */ | 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 */ | 55 | .s2{color: orange;} /* Literal.String.Double */ |
| 56 | .se{color: orange;} /* Literal.String.Escape */ | 56 | .se{color: orange;} /* Literal.String.Escape */ |
app/assets/stylesheets/highlight/white.scss
| @@ -27,37 +27,37 @@ | @@ -27,37 +27,37 @@ | ||
| 27 | .kn{font-weight: bold;} /* Keyword.Namespace */ | 27 | .kn{font-weight: bold;} /* Keyword.Namespace */ |
| 28 | .kp{font-weight: bold;} /* Keyword.Pseudo */ | 28 | .kp{font-weight: bold;} /* Keyword.Pseudo */ |
| 29 | .kr{font-weight: bold;} /* Keyword.Reserved */ | 29 | .kr{font-weight: bold;} /* Keyword.Reserved */ |
| 30 | - .kt{color:#458;font-weight: bold;} /* Keyword.Type */ | 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/mixins.scss
| @@ -10,37 +10,36 @@ | @@ -10,37 +10,36 @@ | ||
| 10 | box-shadow: 0 0 0 3px #f1f1f1; | 10 | box-shadow: 0 0 0 3px #f1f1f1; |
| 11 | } | 11 | } |
| 12 | 12 | ||
| 13 | + | ||
| 14 | +@mixin box-shadow($shadow) { | ||
| 15 | + -webkit-box-shadow: $radius; | ||
| 16 | + -moz-box-shadow: $radius; | ||
| 17 | + -ms-box-shadow: $radius; | ||
| 18 | + -o-box-shadow: $radius; | ||
| 19 | + box-shadow: $radius; | ||
| 20 | +} | ||
| 21 | + | ||
| 13 | @mixin border-radius($radius) { | 22 | @mixin border-radius($radius) { |
| 14 | - -moz-border-radius: $radius; | ||
| 15 | -webkit-border-radius: $radius; | 23 | -webkit-border-radius: $radius; |
| 24 | + -moz-border-radius: $radius; | ||
| 25 | + -ms-border-radius: $radius; | ||
| 26 | + -o-border-radius: $radius; | ||
| 16 | border-radius: $radius; | 27 | border-radius: $radius; |
| 17 | } | 28 | } |
| 18 | 29 | ||
| 19 | @mixin round-borders-bottom($radius) { | 30 | @mixin round-borders-bottom($radius) { |
| 20 | border-top: 1px solid #eaeaea; | 31 | border-top: 1px solid #eaeaea; |
| 21 | - -webkit-border-bottom-left-radius: $radius; | ||
| 22 | - -webkit-border-bottom-right-radius: $radius; | ||
| 23 | - -moz-border-radius-bottomright: $radius; | ||
| 24 | - -moz-border-radius-bottomleft: $radius; | ||
| 25 | - border-bottom-right-radius: $radius; | ||
| 26 | - border-bottom-left-radius: $radius; | 32 | + @include border-radius(0 0 $radius $radius); |
| 27 | } | 33 | } |
| 28 | 34 | ||
| 29 | @mixin round-borders-top($radius) { | 35 | @mixin round-borders-top($radius) { |
| 30 | border-top: 1px solid #eaeaea; | 36 | border-top: 1px solid #eaeaea; |
| 31 | - -moz-border-radius-topright: $radius; | ||
| 32 | - -moz-border-radius-topleft: $radius; | ||
| 33 | - border-top-right-radius: $radius; | ||
| 34 | - border-top-left-radius: $radius; | ||
| 35 | - -webkit-border-top-left-radius: $radius; | ||
| 36 | - -webkit-border-top-right-radius: $radius; | 37 | + @include border-radius($radius $radius 0 0); |
| 37 | } | 38 | } |
| 38 | 39 | ||
| 39 | @mixin round-borders-all($radius) { | 40 | @mixin round-borders-all($radius) { |
| 40 | border: 1px solid #eaeaea; | 41 | border: 1px solid #eaeaea; |
| 41 | - -moz-border-radius: $radius; | ||
| 42 | - -webkit-border-radius: $radius; | ||
| 43 | - border-radius: $radius; | 42 | + @include border-radius($radius); |
| 44 | } | 43 | } |
| 45 | 44 | ||
| 46 | @mixin bg-gradient($from, $to) { | 45 | @mixin bg-gradient($from, $to) { |
| @@ -51,7 +50,7 @@ | @@ -51,7 +50,7 @@ | ||
| 51 | } | 50 | } |
| 52 | 51 | ||
| 53 | @mixin bg-light-gray-gradient { | 52 | @mixin bg-light-gray-gradient { |
| 54 | - background:#f1f1f1; | 53 | + background: #f1f1f1; |
| 55 | background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1)); | 54 | background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1)); |
| 56 | background-image: -webkit-linear-gradient(#f5f5f5 6.6%, #e1e1e1); | 55 | background-image: -webkit-linear-gradient(#f5f5f5 6.6%, #e1e1e1); |
| 57 | background-image: -moz-linear-gradient(#f5f5f5 6.6%, #e1e1e1); | 56 | background-image: -moz-linear-gradient(#f5f5f5 6.6%, #e1e1e1); |
| @@ -59,7 +58,7 @@ | @@ -59,7 +58,7 @@ | ||
| 59 | } | 58 | } |
| 60 | 59 | ||
| 61 | @mixin bg-gray-gradient { | 60 | @mixin bg-gray-gradient { |
| 62 | - background:#eee; | 61 | + background: #eee; |
| 63 | background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf)); | 62 | background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf)); |
| 64 | background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf); | 63 | background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf); |
| 65 | background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf); | 64 | background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf); |
| @@ -67,7 +66,7 @@ | @@ -67,7 +66,7 @@ | ||
| 67 | } | 66 | } |
| 68 | 67 | ||
| 69 | @mixin bg-dark-gray-gradient { | 68 | @mixin bg-dark-gray-gradient { |
| 70 | - background:#eee; | 69 | + background: #eee; |
| 71 | background-image: -webkit-linear-gradient(#e9e9e9, #d7d7d7); | 70 | background-image: -webkit-linear-gradient(#e9e9e9, #d7d7d7); |
| 72 | background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7); | 71 | background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7); |
| 73 | background-image: -o-linear-gradient(#e9e9e9, #d7d7d7); | 72 | background-image: -o-linear-gradient(#e9e9e9, #d7d7d7); |
app/assets/stylesheets/ref_select.scss
| @@ -33,17 +33,15 @@ | @@ -33,17 +33,15 @@ | ||
| 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; |
| @@ -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; |
app/assets/stylesheets/sections/commits.scss
| @@ -51,8 +51,8 @@ | @@ -51,8 +51,8 @@ | ||
| 51 | .committer a { | 51 | .committer a { |
| 52 | font-size: 14px; | 52 | font-size: 14px; |
| 53 | line-height: 22px; | 53 | line-height: 22px; |
| 54 | - text-shadow:0 1px 1px #fff; | ||
| 55 | - color:#777; | 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; | 73 | + border: 1px solid #CCC; |
| 74 | margin-bottom: 1em; | 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); |
| @@ -106,18 +107,18 @@ | @@ -106,18 +107,18 @@ | ||
| 106 | .diff_file_content { | 107 | .diff_file_content { |
| 107 | overflow: auto; | 108 | overflow: auto; |
| 108 | overflow-y: hidden; | 109 | overflow-y: hidden; |
| 109 | - background:#fff; | ||
| 110 | - color:#333; | 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 | ||
| @@ -128,7 +129,7 @@ | @@ -128,7 +129,7 @@ | ||
| 128 | } | 129 | } |
| 129 | } | 130 | } |
| 130 | .diff_file_content_image { | 131 | .diff_file_content_image { |
| 131 | - background:#eee; | 132 | + background: #eee; |
| 132 | text-align: center; | 133 | text-align: center; |
| 133 | .image { | 134 | .image { |
| 134 | display: inline-block; | 135 | display: inline-block; |
| @@ -179,8 +180,8 @@ | @@ -179,8 +180,8 @@ | ||
| 179 | margin: 0px; | 180 | margin: 0px; |
| 180 | padding: 0px; | 181 | padding: 0px; |
| 181 | border: none; | 182 | border: none; |
| 182 | - background:#EEE; | ||
| 183 | - color:#666; | 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 | text-align: right; |
| @@ -194,7 +195,7 @@ | @@ -194,7 +195,7 @@ | ||
| 194 | float: left; | 195 | float: left; |
| 195 | width: 35px; | 196 | width: 35px; |
| 196 | font-weight: normal; | 197 | font-weight: normal; |
| 197 | - color:#666; | 198 | + color: #666; |
| 198 | &:hover { | 199 | &:hover { |
| 199 | text-decoration: underline; | 200 | text-decoration: underline; |
| 200 | } | 201 | } |
| @@ -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 | } |
| @@ -246,7 +247,7 @@ | @@ -246,7 +247,7 @@ | ||
| 246 | } | 247 | } |
| 247 | 248 | ||
| 248 | code { | 249 | code { |
| 249 | - background:#FCEEC1; | 250 | + background: #FCEEC1; |
| 250 | color: $style_color; | 251 | color: $style_color; |
| 251 | } | 252 | } |
| 252 | 253 | ||
| @@ -295,10 +296,10 @@ | @@ -295,10 +296,10 @@ | ||
| 295 | 296 | ||
| 296 | .label_commit { | 297 | .label_commit { |
| 297 | @include round-borders-all(4px); | 298 | @include round-borders-all(4px); |
| 298 | - padding:2px 4px; | 299 | + padding: 2px 4px; |
| 299 | border: none; | 300 | border: none; |
| 300 | font-size: 13px; | 301 | font-size: 13px; |
| 301 | background: #474D57; | 302 | background: #474D57; |
| 302 | - color:#fff; | 303 | + color: #fff; |
| 303 | font-family: $monospace; | 304 | font-family: $monospace; |
| 304 | } | 305 | } |
app/assets/stylesheets/sections/editor.scss
app/assets/stylesheets/sections/events.scss
| @@ -4,24 +4,24 @@ | @@ -4,24 +4,24 @@ | ||
| 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; | 24 | + padding: 0 2px; |
| 25 | float: none; | 25 | float: none; |
| 26 | } | 26 | } |
| 27 | } | 27 | } |
| @@ -32,21 +32,21 @@ | @@ -32,21 +32,21 @@ | ||
| 32 | */ | 32 | */ |
| 33 | .event-item { | 33 | .event-item { |
| 34 | min-height: 40px; | 34 | min-height: 40px; |
| 35 | - border-bottom:1px solid #eee; | 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 { |
| @@ -98,12 +98,12 @@ | @@ -98,12 +98,12 @@ | ||
| 98 | * | 98 | * |
| 99 | */ | 99 | */ |
| 100 | .event_lp { | 100 | .event_lp { |
| 101 | - color:#777; | 101 | + color: #777; |
| 102 | padding: 10px; | 102 | padding: 10px; |
| 103 | min-height: 22px; | 103 | min-height: 22px; |
| 104 | border-left: 5px solid #5AB9C3; | 104 | border-left: 5px solid #5AB9C3; |
| 105 | margin-bottom: 20px; | 105 | margin-bottom: 20px; |
| 106 | - background:#f9f9f9; | 106 | + background: #f9f9f9; |
| 107 | 107 | ||
| 108 | .avatar { | 108 | .avatar { |
| 109 | width: 24px; | 109 | width: 24px; |
app/assets/stylesheets/sections/graph.scss
app/assets/stylesheets/sections/header.scss
| @@ -92,7 +92,7 @@ header { | @@ -92,7 +92,7 @@ header { | ||
| 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; | 95 | + border: 1px solid #c6c6c6; |
| 96 | box-shadow: none; | 96 | box-shadow: none; |
| 97 | &:focus { | 97 | &:focus { |
| 98 | @extend .span3; | 98 | @extend .span3; |
| @@ -132,7 +132,7 @@ header { | @@ -132,7 +132,7 @@ 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))); | 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))); |
| @@ -149,7 +149,7 @@ header { | @@ -149,7 +149,7 @@ header { | ||
| 149 | display: block; } } | 149 | display: block; } } |
| 150 | 150 | ||
| 151 | .account-links { | 151 | .account-links { |
| 152 | - border-radius: 5px; | 152 | + @include border-radius(5px); |
| 153 | box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); | 153 | box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); |
| 154 | position: relative; | 154 | position: relative; |
| 155 | &:before { | 155 | &:before { |
| @@ -184,7 +184,7 @@ header { | @@ -184,7 +184,7 @@ header { | ||
| 184 | border-bottom: 1px solid #666; | 184 | border-bottom: 1px solid #666; |
| 185 | font-size: 12px; | 185 | font-size: 12px; |
| 186 | &:hover { | 186 | &:hover { |
| 187 | - color:#fff; | 187 | + color: #fff; |
| 188 | background: #333; | 188 | background: #333; |
| 189 | } | 189 | } |
| 190 | } | 190 | } |
| @@ -197,20 +197,13 @@ header { | @@ -197,20 +197,13 @@ header { | ||
| 197 | 197 | ||
| 198 | .account-links a { | 198 | .account-links a { |
| 199 | &:first-child { | 199 | &: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; } | 200 | + @include border-radius(5px 5px 0 0); |
| 201 | + } | ||
| 206 | &:last-child { | 202 | &: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; } } | 203 | + @include border-radius(0 0 5px 5px); |
| 204 | + border-bottom: 0; | ||
| 205 | + } | ||
| 206 | + } | ||
| 214 | 207 | ||
| 215 | 208 | ||
| 216 | 209 | ||
| @@ -248,13 +241,13 @@ header { | @@ -248,13 +241,13 @@ header { | ||
| 248 | a { | 241 | a { |
| 249 | h1 { | 242 | h1 { |
| 250 | background: url('logo_white.png') no-repeat 0px 2px; | 243 | background: url('logo_white.png') no-repeat 0px 2px; |
| 251 | - color:#fff; | 244 | + color: #fff; |
| 252 | text-shadow: 0 1px 1px #111; | 245 | text-shadow: 0 1px 1px #111; |
| 253 | } | 246 | } |
| 254 | } | 247 | } |
| 255 | } | 248 | } |
| 256 | .project_name { | 249 | .project_name { |
| 257 | - color:#fff; | 250 | + color: #fff; |
| 258 | text-shadow: 0 1px 1px #111; | 251 | text-shadow: 0 1px 1px #111; |
| 259 | } | 252 | } |
| 260 | } | 253 | } |
app/assets/stylesheets/sections/issues.scss
| @@ -28,7 +28,7 @@ | @@ -28,7 +28,7 @@ | ||
| 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; |
| @@ -141,6 +141,6 @@ input.check_all_issues { | @@ -141,6 +141,6 @@ input.check_all_issues { | ||
| 141 | .ui-datepicker-header { | 141 | .ui-datepicker-header { |
| 142 | @include solid_shade; | 142 | @include solid_shade; |
| 143 | margin-bottom: 10px; | 143 | margin-bottom: 10px; |
| 144 | - border:1px solid #bbb; | 144 | + border: 1px solid #bbb; |
| 145 | } | 145 | } |
| 146 | } | 146 | } |
app/assets/stylesheets/sections/login.scss
| 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; | 24 | + @include border-radius(5px 5px 0 0); |
| 30 | margin-bottom: 0px; | 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
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 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 | } |
| @@ -34,7 +34,6 @@ | @@ -34,7 +34,6 @@ | ||
| 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 { |
| @@ -47,7 +46,7 @@ | @@ -47,7 +46,7 @@ | ||
| 47 | float: left; | 46 | float: left; |
| 48 | } | 47 | } |
| 49 | label { | 48 | label { |
| 50 | - color:#444; | 49 | + color: #444; |
| 51 | } | 50 | } |
| 52 | } | 51 | } |
| 53 | 52 | ||
| @@ -61,14 +60,14 @@ | @@ -61,14 +60,14 @@ | ||
| 61 | li { | 60 | li { |
| 62 | a { | 61 | a { |
| 63 | font-weight: bold; | 62 | font-weight: bold; |
| 64 | - padding:8px 20px; | 63 | + padding: 8px 20px; |
| 65 | text-align: center; | 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; |
| @@ -86,11 +85,11 @@ li.merge_request { | @@ -86,11 +85,11 @@ li.merge_request { | ||
| 86 | 85 | ||
| 87 | .label_branch { | 86 | .label_branch { |
| 88 | @include round-borders-all(4px); | 87 | @include round-borders-all(4px); |
| 89 | - padding:2px 4px; | 88 | + padding: 2px 4px; |
| 90 | border: none; | 89 | border: none; |
| 91 | font-size: 14px; | 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 | ||
| @@ -103,7 +102,7 @@ li.merge_request { | @@ -103,7 +102,7 @@ li.merge_request { | ||
| 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, |
app/assets/stylesheets/sections/nav.scss
| @@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
| 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; | 8 | margin: 30px 0; |
| 9 | border: 1px solid #BBB; | 9 | border: 1px solid #BBB; |
| @@ -26,8 +26,7 @@ ul.main_menu { | @@ -26,8 +26,7 @@ ul.main_menu { | ||
| 26 | color: #777; | 26 | color: #777; |
| 27 | background: #f2f2f2; | 27 | background: #f2f2f2; |
| 28 | border-top: 1px solid #CCC; | 28 | border-top: 1px solid #CCC; |
| 29 | - border-radius: 8px; | ||
| 30 | - -moz-border-radius: 8px; | 29 | + @include border-radius(8px); |
| 31 | } | 30 | } |
| 32 | .label { | 31 | .label { |
| 33 | background: $hover; | 32 | background: $hover; |
| @@ -41,23 +40,18 @@ ul.main_menu { | @@ -41,23 +40,18 @@ 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; | 56 | border-bottom: none; |
| 63 | border-left: none; | 57 | border-left: none; |
| @@ -83,8 +77,8 @@ ul.main_menu { | @@ -83,8 +77,8 @@ ul.main_menu { | ||
| 83 | height: 35px; | 77 | height: 35px; |
| 84 | line-height: 36px; | 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
| @@ -36,7 +36,7 @@ | @@ -36,7 +36,7 @@ | ||
| 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 { |
| @@ -94,15 +94,15 @@ p.notify_controls span{ | @@ -94,15 +94,15 @@ 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 | @include round-borders-all(4px); |
| @@ -125,11 +125,11 @@ tr.line_notes_row { | @@ -125,11 +125,11 @@ tr.line_notes_row { | ||
| 125 | .line_notes_row, .per_line_form { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } | 125 | .line_notes_row, .per_line_form { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } |
| 126 | 126 | ||
| 127 | .per_line_form { | 127 | .per_line_form { |
| 128 | - background:#f5f5f5; | ||
| 129 | - border-top:1px solid #eee; | 128 | + background: #f5f5f5; |
| 129 | + border-top: 1px solid #eee; | ||
| 130 | form { margin: 0; } | 130 | form { margin: 0; } |
| 131 | td { | 131 | td { |
| 132 | - border-bottom:1px solid #ddd; | 132 | + border-bottom: 1px solid #ddd; |
| 133 | } | 133 | } |
| 134 | .note_actions { | 134 | .note_actions { |
| 135 | margin: 0; | 135 | margin: 0; |
app/assets/stylesheets/sections/profile.scss
app/assets/stylesheets/sections/projects.scss
| @@ -27,7 +27,7 @@ | @@ -27,7 +27,7 @@ | ||
| 27 | line-height: 18px; | 27 | line-height: 18px; |
| 28 | } | 28 | } |
| 29 | .project_name { | 29 | .project_name { |
| 30 | - color:#4fa2bd; | 30 | + color: #4fa2bd; |
| 31 | font-size: 14px; | 31 | font-size: 14px; |
| 32 | line-height: 18px; | 32 | line-height: 18px; |
| 33 | } | 33 | } |
| @@ -41,7 +41,7 @@ | @@ -41,7 +41,7 @@ | ||
| 41 | display: block; | 41 | display: block; |
| 42 | span, strong { | 42 | span, strong { |
| 43 | font-size: 12px; | 43 | font-size: 12px; |
| 44 | - color:#666; | 44 | + color: #666; |
| 45 | } | 45 | } |
| 46 | } | 46 | } |
| 47 | } | 47 | } |
| @@ -63,10 +63,10 @@ | @@ -63,10 +63,10 @@ | ||
| 63 | padding: 8px; | 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; | 69 | + padding: 6px 10px; |
| 70 | margin-left: 10px; | 70 | margin-left: 10px; |
| 71 | margin-bottom: 8px; | 71 | margin-bottom: 8px; |
| 72 | } | 72 | } |
app/assets/stylesheets/sections/tree.scss
| @@ -18,8 +18,8 @@ | @@ -18,8 +18,8 @@ | ||
| 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 | } |
| @@ -49,7 +49,7 @@ | @@ -49,7 +49,7 @@ | ||
| 49 | } | 49 | } |
| 50 | td { | 50 | td { |
| 51 | line-height: 20px; | 51 | line-height: 20px; |
| 52 | - background:#fafafa; | 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_mars.scss
| @@ -47,7 +47,7 @@ | @@ -47,7 +47,7 @@ | ||
| 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 | } |
| @@ -57,7 +57,7 @@ | @@ -57,7 +57,7 @@ | ||
| 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 | } |