From 755e4a470015ad83337943d62a32ede2921eda53 Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Fri, 23 Nov 2012 17:26:26 +0100 Subject: [PATCH 1/9] Removed css declarations out of main.scss, so main is only a collector Fonts, variables and mixins are now all in their own stylesheets --- app/assets/stylesheets/fonts.scss | 7 ++ app/assets/stylesheets/main.scss | 109 ++++---------------------- app/assets/stylesheets/mixins.scss | 74 +++++++++++++++++ app/assets/stylesheets/variables.scss | 6 ++ 4 files changed, 104 insertions(+), 92 deletions(-) create mode 100644 app/assets/stylesheets/fonts.scss create mode 100644 app/assets/stylesheets/mixins.scss create mode 100644 app/assets/stylesheets/variables.scss diff --git a/app/assets/stylesheets/fonts.scss b/app/assets/stylesheets/fonts.scss new file mode 100644 index 00000000000..88c966d18f7 --- /dev/null +++ b/app/assets/stylesheets/fonts.scss @@ -0,0 +1,7 @@ +@font-face{ + font-family: Korolev; + src: font-url('korolev-medium-compressed.otf'); +} + +/** Typo **/ +$monospace: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono', 'lucida console', monospace; \ No newline at end of file diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index 924566e9dde..e707de02201 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -5,101 +5,26 @@ $baseLineHeight: 18px !default; // BOOTSTRAP // ------------------ @import "bootstrap"; +@import "bootstrap-responsive"; +@import "font-awesome"; -// BOOTSTRAP RESPONSIVE -// ------------------ -@import "bootstrap/responsive-utilities"; -@import "bootstrap/responsive-1200px-min"; +/** + * Variables + * Contains colors + */ +@import "variables.scss"; -// FONT AWESOME -@import 'font-awesome'; +/** + * Custom fonts + * Contains @font-face font Korolev and default $monotype + */ +@import "fonts.scss"; -/** GitLab colors **/ -$link_color: #3A89A3; -$blue_link: #2FA0BB; -$style_color: #474D57; -$hover: #D9EDF7; -$hover_border: #ADF; - -/** GitLab Fonts **/ -@font-face { font-family: Korolev; src: font-url('korolev-medium-compressed.otf'); } -$monospace: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono', 'lucida console', monospace; - -/** MIXINS **/ -@mixin shade { - -moz-box-shadow: 0 0 3px #ddd; - -webkit-box-shadow: 0 0 3px #ddd; - box-shadow: 0 0 3px #ddd; -} - -@mixin solid_shade { - -moz-box-shadow: 0 0 0 3px #f1f1f1; - -webkit-box-shadow: 0 0 0 3px #f1f1f1; - box-shadow: 0 0 0 3px #f1f1f1; -} - -@mixin border-radius($radius) { - -moz-border-radius: $radius; - -webkit-border-radius: $radius; - border-radius: $radius; -} - -@mixin round-borders-bottom($radius) { - border-top: 1px solid #eaeaea; - -moz-border-radius-bottomright: $radius; - -moz-border-radius-bottomleft: $radius; - border-bottom-right-radius: $radius; - border-bottom-left-radius: $radius; - -webkit-border-bottom-left-radius: $radius; - -webkit-border-bottom-right-radius: $radius; -} - -@mixin round-borders-top($radius) { - border-top: 1px solid #eaeaea; - -moz-border-radius-topright: $radius; - -moz-border-radius-topleft: $radius; - border-top-right-radius: $radius; - border-top-left-radius: $radius; - -webkit-border-top-left-radius: $radius; - -webkit-border-top-right-radius: $radius; -} - -@mixin round-borders-all($radius) { - border: 1px solid #eaeaea; - -moz-border-radius: $radius; - -webkit-border-radius: $radius; - border-radius: $radius; -} - -@mixin bg-gradient($from, $to) { - background-image: -webkit-gradient(linear, 0 0, 0 100%, from($from), to($to)); - background-image: -webkit-linear-gradient($from, $to); - background-image: -moz-linear-gradient($from, $to); - background-image: -o-linear-gradient($from, $to); -} - -@mixin bg-light-gray-gradient { - background:#f1f1f1; - background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1)); - background-image: -webkit-linear-gradient(#f5f5f5 6.6%, #e1e1e1); - background-image: -moz-linear-gradient(#f5f5f5 6.6%, #e1e1e1); - background-image: -o-linear-gradient(#f5f5f5 6.6%, #e1e1e1); -} - -@mixin bg-gray-gradient { - background:#eee; - background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf)); - background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf); - background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf); - background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf); -} - -@mixin bg-dark-gray-gradient { - background:#eee; - background-image: -webkit-linear-gradient(#e9e9e9, #d7d7d7); - background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7); - background-image: -o-linear-gradient(#e9e9e9, #d7d7d7); -} +/** + * General mixins. + * Contains rounded borders, gradients and shades + */ +@import "mixins.scss"; /** * Header of application. diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss new file mode 100644 index 00000000000..e66f6095c2c --- /dev/null +++ b/app/assets/stylesheets/mixins.scss @@ -0,0 +1,74 @@ +@mixin shade { + -moz-box-shadow: 0 0 3px #ddd; + -webkit-box-shadow: 0 0 3px #ddd; + box-shadow: 0 0 3px #ddd; +} + +@mixin solid_shade { + -moz-box-shadow: 0 0 0 3px #f1f1f1; + -webkit-box-shadow: 0 0 0 3px #f1f1f1; + box-shadow: 0 0 0 3px #f1f1f1; +} + +@mixin border-radius($radius) { + -moz-border-radius: $radius; + -webkit-border-radius: $radius; + border-radius: $radius; +} + +@mixin round-borders-bottom($radius) { + border-top: 1px solid #eaeaea; + -webkit-border-bottom-left-radius: $radius; + -webkit-border-bottom-right-radius: $radius; + -moz-border-radius-bottomright: $radius; + -moz-border-radius-bottomleft: $radius; + border-bottom-right-radius: $radius; + border-bottom-left-radius: $radius; +} + +@mixin round-borders-top($radius) { + border-top: 1px solid #eaeaea; + -moz-border-radius-topright: $radius; + -moz-border-radius-topleft: $radius; + border-top-right-radius: $radius; + border-top-left-radius: $radius; + -webkit-border-top-left-radius: $radius; + -webkit-border-top-right-radius: $radius; +} + +@mixin round-borders-all($radius) { + border: 1px solid #eaeaea; + -moz-border-radius: $radius; + -webkit-border-radius: $radius; + border-radius: $radius; +} + +@mixin bg-gradient($from, $to) { + background-image: -webkit-gradient(linear, 0 0, 0 100%, from($from), to($to)); + background-image: -webkit-linear-gradient($from, $to); + background-image: -moz-linear-gradient($from, $to); + background-image: -o-linear-gradient($from, $to); +} + +@mixin bg-light-gray-gradient { + background:#f1f1f1; + background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1)); + background-image: -webkit-linear-gradient(#f5f5f5 6.6%, #e1e1e1); + background-image: -moz-linear-gradient(#f5f5f5 6.6%, #e1e1e1); + background-image: -o-linear-gradient(#f5f5f5 6.6%, #e1e1e1); +} + +@mixin bg-gray-gradient { + background:#eee; + background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf)); + background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf); + background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf); + background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf); +} + +@mixin bg-dark-gray-gradient { + background:#eee; + background-image: -webkit-linear-gradient(#e9e9e9, #d7d7d7); + background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7); + background-image: -o-linear-gradient(#e9e9e9, #d7d7d7); +} diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/variables.scss new file mode 100644 index 00000000000..8e5394c84a0 --- /dev/null +++ b/app/assets/stylesheets/variables.scss @@ -0,0 +1,6 @@ +/** Colors **/ +$link_color: #3A89A3; +$blue_link: #2FA0BB; +$style_color: #474D57; +$hover: #D9EDF7; +$hover_border: #ADF; From 84de1b71d1547cc92e0f22a5e00b1f8e90f35a67 Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Fri, 23 Nov 2012 17:33:43 +0100 Subject: [PATCH 2/9] Added some uniformity, all css properties and values are separated by a colon and a space `: ` --- app/assets/stylesheets/common.scss | 208 +++++++++--------- .../stylesheets/gitlab_bootstrap/blocks.scss | 44 ++-- .../stylesheets/gitlab_bootstrap/buttons.scss | 20 +- .../stylesheets/gitlab_bootstrap/common.scss | 22 +- .../stylesheets/gitlab_bootstrap/files.scss | 52 ++--- .../stylesheets/gitlab_bootstrap/lists.scss | 10 +- .../stylesheets/gitlab_bootstrap/tables.scss | 12 +- .../gitlab_bootstrap/typography.scss | 20 +- app/assets/stylesheets/highlight/dark.scss | 38 ++-- app/assets/stylesheets/highlight/white.scss | 20 +- app/assets/stylesheets/ref_select.scss | 18 +- app/assets/stylesheets/sections/commits.scss | 86 ++++---- app/assets/stylesheets/sections/events.scss | 32 +-- app/assets/stylesheets/sections/graph.scss | 2 +- app/assets/stylesheets/sections/header.scss | 54 ++--- app/assets/stylesheets/sections/issues.scss | 54 ++--- app/assets/stylesheets/sections/login.scss | 2 +- .../stylesheets/sections/merge_requests.scss | 42 ++-- app/assets/stylesheets/sections/nav.scss | 60 ++--- app/assets/stylesheets/sections/notes.scss | 94 ++++---- app/assets/stylesheets/sections/profile.scss | 16 +- app/assets/stylesheets/sections/projects.scss | 52 ++--- app/assets/stylesheets/sections/themes.scss | 24 +- app/assets/stylesheets/sections/tree.scss | 18 +- app/assets/stylesheets/themes/ui_basic.scss | 2 +- app/assets/stylesheets/themes/ui_mars.scss | 2 +- 26 files changed, 502 insertions(+), 502 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index dd2f85b8cd8..d5173dcf2ac 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1,12 +1,12 @@ /** LAYOUT **/ body { - margin-bottom:20px; + margin-bottom: 20px; } .container { - padding-top:0; - z-index:5; + padding-top: 0; + z-index: 5; } .container .content { @@ -15,9 +15,9 @@ body { .container .sidebar { width: 200px; - height:100%; - min-height:450px; - float:right; + height: 100%; + min-height: 450px; + float: right; } @@ -29,25 +29,25 @@ body { .help li { color:#111 } .back_link { - text-decoration:underline; - font-size:14px; - font-weight:bold; + text-decoration: underline; + font-size: 14px; + font-weight: bold; padding:10px 0; - padding-bottom:0; + padding-bottom: 0; } .info_link { - margin-right:5px; - float:left; + margin-right: 5px; + float: left; img { - width:20px; + width: 20px; } } .download_repo_link { background: url("images.png") no-repeat 0 -48px; - padding-left:20px; + padding-left: 20px; } table a code { @@ -63,30 +63,30 @@ table a code { .loading { margin:20px auto; background: url(ajax_loader.gif) no-repeat center center; - width:40px; - height:40px; + width: 40px; + height: 40px; } /** FLASH message **/ #flash_container { - height:50px; - position:fixed; - z-index:10001; - top:0px; - width:100%; - margin-bottom:15px; - overflow:hidden; - background:white; - cursor:pointer; + height: 50px; + position: fixed; + z-index: 10001; + top: 0px; + width: 100%; + margin-bottom: 15px; + overflow: hidden; + background: white; + cursor: pointer; border-bottom:1px solid #ccc; h4 { color:#666; - font-size:18px; - line-height:38px; - padding-top:5px; - margin:2px; - font-weight:normal; + font-size: 18px; + line-height: 38px; + padding-top: 5px; + margin: 2px; + font-weight: normal; } } @@ -95,39 +95,39 @@ table a code { } .handle:hover { - cursor:move; + cursor: move; } span.update-author { - display:block; + display: block; } span.update-author { color:#999; - font-weight:normal; - font-style:italic; + font-weight: normal; + font-style: italic; } span.update-author strong { - font-weight:bold; + font-weight: bold; font-style: normal; } /** UPDATE ITEM **/ span.update-author { - display:block; + display: block; } /** END UPDATE ITEM **/ .dashboard-loader { - float:left; - margin:10px; - display:none; + float: left; + margin: 10px; + display: none; } .user-mention { color:#2FA0BB; - font-weight:bold; + font-weight: bold; } .neib { - margin-right:10px; + margin-right: 10px; } .label { @@ -201,12 +201,12 @@ form { .field_with_errors { - display:inline; + display: inline; } ul.breadcrumb { - background:white; - border:none; + background: white; + border: none; li { display: inline; text-shadow: 0 1px 0 white @@ -214,8 +214,8 @@ ul.breadcrumb { a { color:#474D57; - font-weight:bold; - font-size:14px; + font-weight: bold; + font-size: 14px; } .arrow { @@ -225,31 +225,31 @@ ul.breadcrumb { float: left; position: relative; left: -10px; - padding:0; - margin:0; + padding: 0; + margin: 0; } } input[type=text] { &.large_text { - padding:6px; - font-size:16px; + padding: 6px; + font-size: 16px; } } input.git_clone_url { - width:325px; + width: 325px; } .merge-request-form-holder { select { - width:300px; + width: 300px; } } /** Issues **/ #issue_assignee_id { - width:300px; + width: 300px; } #new_issue_dialog textarea{ @@ -257,7 +257,7 @@ input.git_clone_url { } .project_list_url { - width:250px; + width: 250px; background:#fff !important; } @@ -265,13 +265,13 @@ input.git_clone_url { /** bordered list **/ ul.bordered-list { margin:5px 0px; - padding:0px; + padding: 0px; li { padding: 5px 0; border-bottom: 1px solid #EEE; overflow: hidden; display: block; - margin:0px; + margin: 0px; } } @@ -287,10 +287,10 @@ ul.bordered-list li:last-child { border:none } li.commit { .avatar { - width:24px; + width: 24px; top:-5px; - margin-right:10px; - margin-left:10px; + margin-right: 10px; + margin-left: 10px; } code { @@ -341,17 +341,17 @@ p.time { } h4 { - font-size:14px; + font-size: 14px; padding:2px 10px; color:#666; border-bottom:1px solid #f1f1f1; } - a:last-child h4 { border:none; } + a:last-child h4 { border: none; } a:hover { h4 { color:#111; - background:$hover; + background: $hover; border-color:#CCC; .ico.project { background-position:-209px -21px; @@ -359,7 +359,7 @@ p.time { } } .bottom { - padding:10px; + padding: 10px; } } @@ -424,13 +424,13 @@ p.time { } .status_info { - font-size:14px; + font-size: 14px; padding:5px 15px; - line-height:24px; - width:60px; - text-align:center; - float:left; - margin-right:20px; + line-height: 24px; + width: 60px; + text-align: center; + float: left; + margin-right: 20px; &.success { background: #5BB75B; @@ -449,12 +449,12 @@ p.time { .arrow{ background: #E3E5EA; padding: 5px; - margin-top:5px; + margin-top: 5px; border-radius: 5px; text-shadow: none; color: #999; line-height: 16px; - font-weight:bold; + font-weight: bold; } .thin_area{ @@ -462,9 +462,9 @@ p.time { } .gitlab_pagination { - span a { color:$link_color; } + span a { color: $link_color; } .prev, .next, .current, .page a { - padding:10px; + padding: 10px; } .current { border-bottom:2px solid $style_color; @@ -474,7 +474,7 @@ p.time { // Fixes alignment on notes. .new_note { label { - text-align:left; + text-align: left; } } @@ -486,7 +486,7 @@ li.note { border-bottom:none !important; } .file { - padding-left:20px; + padding-left: 20px; background:url("icon-attachment.png") no-repeat left center; } } @@ -494,7 +494,7 @@ li.note { .markdown { img { - max-width:100%; + max-width: 100%; } } @@ -509,14 +509,14 @@ li.note { } .remember_me { - text-align:left; + text-align: left; input { - margin:0; + margin: 0; } span { - padding-left:5px; + padding-left: 5px; } } @@ -530,10 +530,10 @@ li.note { .data { a { h1 { - line-height:48px; - font-size:48px; - padding:20px; - text-align:center; + line-height: 48px; + font-size: 48px; + padding: 20px; + text-align: center; } } } @@ -541,12 +541,12 @@ li.note { .rss-icon { img { - width:24px; - vertical-align:top; + width: 24px; + vertical-align: top; } strong { - line-height:24px; + line-height: 24px; } } @@ -556,7 +556,7 @@ li.note { .chzn-container-single .chzn-single { background:#FFF; border: 1px solid #bbb; - box-shadow:none; + box-shadow: none; } .chzn-container-active .chzn-single { background:#fff; @@ -565,7 +565,7 @@ li.note { .supp_diff_link, .mr_show_all_commits { - cursor:pointer; + cursor: pointer; } .merge_request, @@ -586,11 +586,11 @@ li.note { .git_error_tips { @extend .span6; - text-align:left; - margin-top:40px; + text-align: left; + margin-top: 40px; pre { - background:white; - border:none; + background: white; + border: none; font-size: 12px; } } @@ -605,15 +605,15 @@ li.note { } .oauth_select_holder { - padding:20px; + padding: 20px; img { - padding:5px; - margin-right:10px; + padding: 5px; + margin-right: 10px; } .active { img { border:1px solid #ccc; - background:$hover; + background: $hover; @include border-radius(5px); } } @@ -634,23 +634,23 @@ li.note { pre { &.clean { - background:none; - border:none; - margin:0; - padding:0; + background: none; + border: none; + margin: 0; + padding: 0; } } .milestone .progress { margin-bottom: 0; - margin-top:4px; + margin-top: 4px; } .float-link { - float:left; - margin-right:15px; + float: left; + margin-right: 15px; .s16 { - margin-right:5px; + margin-right: 5px; } } diff --git a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss index ae66bd201f8..b705f8fb3b1 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss @@ -15,7 +15,7 @@ @extend .borders; @extend .prepend-top-20; @extend .append-bottom-20; - border-width:1px; + border-width: 1px; @include solid_shade; @@ -30,22 +30,22 @@ .top_box_content, .middle_box_content, .bottom_box_content { - padding:15px; + padding: 15px; pre { background: none !important; - margin:0; - border:none; - padding:0; + margin: 0; + border: none; + padding: 0; } } .middle_box_content { - border-radius:0; - border:none; - font-size:12px; + border-radius: 0; + border: none; + font-size: 12px; background-color:#f5f5f5; - border:none; + border: none; border-top:1px solid #eee; } @@ -70,7 +70,7 @@ } ul { - margin:0; + margin: 0; } h5, .title { @@ -82,21 +82,21 @@ &.small { line-height: 28px; font-size: 14px; - line-height:28px; + line-height: 28px; text-shadow: 0 1px 1px white; } form { padding:9px 0; - margin:0px; + margin: 0px; } .nav-pills { li { padding:3px 0; - &.active a { background-color:$style_color; } + &.active a { background-color: $style_color; } a { - border-radius:7px; + border-radius: 7px; } } } @@ -105,7 +105,7 @@ .bottom { @include bg-gray-gradient; @include round-borders-bottom(4px); - border-bottom:none; + border-bottom: none; border-top: 1px solid #bbb; } @@ -121,33 +121,33 @@ padding: 0 20px; border-top:1px solid #eee; border-bottom:1px solid #eee; - font-size:14px; + font-size: 14px; color:#777; } } .row_title { - font-weight:bold; + font-weight: bold; color:#444; &:hover { color:#444; - text-decoration:underline; + text-decoration: underline; } } li, .wll { - padding:10px; + padding: 10px; &:first-child { @include round-borders-top(4px); - border-top:none; + border-top: none; } &:last-child { @include round-borders-bottom(4px); - border:none; + border: none; } } .ui-box-body { - padding:10px; + padding: 10px; } } diff --git a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss index f9249e871b7..a86e8c51c16 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss @@ -14,7 +14,7 @@ color:#fff; text-shadow: 0 1px 1px #268; &:hover { - background:$blue_link; + background: $blue_link; color:#fff; } @@ -30,7 +30,7 @@ color:#fff; text-shadow: 0 1px 1px #268; &:hover { - background:$blue_link; + background: $blue_link; color:#fff; } @@ -60,12 +60,12 @@ } &.cancel-btn { - float:right; + float: right; } &.wide { - padding-left:30px; - padding-right:30px; + padding-left: 30px; + padding-right: 30px; } &.danger { @@ -92,19 +92,19 @@ } &.very_small { - font-size:11px; + font-size: 11px; padding:2px 6px; line-height: 16px; - margin:2px; + margin: 2px; } &.grouped { - margin-right:7px; - float:left; + margin-right: 7px; + float: left; } &.padded { - margin-right:3px; + margin-right: 3px; padding:4px 10px 4px; } } diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss index c1b2880140d..7e41ec9846c 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/common.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss @@ -24,7 +24,7 @@ .lborder { border-left:1px solid #eee } .no-padding { padding:0 !important; } .underlined { border-bottom: 1px solid #CCC; } -.no-borders { border:none; } +.no-borders { border: none; } .vlink { color: $link_color !important; } .underlined_link { text-decoration: underline; } .borders { border: 1px solid #ccc; @include shade; } @@ -34,7 +34,7 @@ /** PILLS & TABS**/ .nav-pills a:hover { background-color:#888; } .nav-pills .active a { background-color: $style_color; } -.nav-tabs > li > a, .nav-pills > li > a { color:$style_color; } +.nav-tabs > li > a, .nav-pills > li > a { color: $style_color; } .nav.nav-tabs { li { > a { @@ -50,7 +50,7 @@ text-shadow:0 1px 1px #fff; } i[class^="icon-"] { - line-height:14px; + line-height: 14px; } } &.active { @@ -69,23 +69,23 @@ .alert-message.error { @extend .alert-error; } /** AVATARS **/ -img.avatar { float:left; margin-right:12px; width:40px; border:1px solid #ddd; padding:1px; } -img.avatar.s16 { width:16px; height:16px; margin-right:6px; } -img.avatar.s24 { width:24px; height:24px; margin-right:8px; } -img.avatar.s32 { width:32px; height:32px; margin-right:10px; } -img.lil_av { padding-left: 4px; padding-right:3px; } +img.avatar { float: left; margin-right: 12px; width: 40px; border:1px solid #ddd; padding: 1px; } +img.avatar.s16 { width: 16px; height: 16px; margin-right: 6px; } +img.avatar.s24 { width: 24px; height: 24px; margin-right: 8px; } +img.avatar.s32 { width: 32px; height: 32px; margin-right: 10px; } +img.lil_av { padding-left: 4px; padding-right: 3px; } img.small { width: 80px; } /** HELPERS **/ -.nothing_here_message { text-align:center; padding:20px; color:#777; } -p.slead { color:#456; font-size:16px; margin-bottom: 12px; font-weight: 200; line-height: 24px; } +.nothing_here_message { text-align: center; padding: 20px; color:#777; } +p.slead { color:#456; font-size: 16px; margin-bottom: 12px; font-weight: 200; line-height: 24px; } /** FORMS **/ input[type='search'].search-text-input { background-image: url("icon-search.png"); background-repeat: no-repeat; background-position: 10px; - padding-left:25px; + padding-left: 25px; @include border-radius(4px); border:1px solid #ccc; } diff --git a/app/assets/stylesheets/gitlab_bootstrap/files.scss b/app/assets/stylesheets/gitlab_bootstrap/files.scss index e4a36148e18..dc2d19c603f 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/files.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/files.scss @@ -4,7 +4,7 @@ */ .file_holder { border:1px solid #BBB; - margin-bottom:1em; + margin-bottom: 1em; @include solid_shade; .file_title { @@ -16,20 +16,20 @@ text-align: left; color: #666; padding: 9px 10px; - height:18px; + height: 18px; .options { - float:right; + float: right; margin-top: -5px; } .file_name { - color:$style_color; - font-size:14px; + color: $style_color; + font-size: 14px; text-shadow: 0 1px 1px #fff; small { color:#999; - font-size:13px; + font-size: 13px; } } } @@ -42,7 +42,7 @@ code { padding:0 4px; } - padding:20px; + padding: 20px; h1, h2 { line-height: 46px; } @@ -53,10 +53,10 @@ &.image_file { background:#eee; - text-align:center; + text-align: center; img { - padding:100px; - max-width:300px; + padding: 100px; + max-width: 300px; } } @@ -69,34 +69,34 @@ */ &.blame { table { - border:none; - box-shadow:none; - margin:0; + border: none; + box-shadow: none; + margin: 0; } tr { border-bottom: 1px solid #eee; } td { &:first-child { - border-left:none; + border-left: none; } &:last-child { - border-right:none; + border-right: none; } background:#fff; - padding:5px; + padding: 5px; } .author, .blame_commit { background:#f5f5f5; - vertical-align:top; + vertical-align: top; } .lines { pre { - padding:0; - margin:0; - border:none; - border-radius: 0; + padding: 0; + margin: 0; + background: none; + border: none; } } } @@ -107,22 +107,22 @@ overflow-y: auto; ol { - margin-left:40px; + margin-left: 40px; padding: 10px 0; border-left: 1px solid #CCC; - margin-bottom:0; + margin-bottom: 0; background: white; li { color:#888; p { - margin:0; + margin: 0; color:#333; - line-height:24px; + line-height: 24px; padding-left: 10px; } &:hover { - background:$hover; + background: $hover; } } } diff --git a/app/assets/stylesheets/gitlab_bootstrap/lists.scss b/app/assets/stylesheets/gitlab_bootstrap/lists.scss index 4fe45ecc277..c803070b77d 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/lists.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/lists.scss @@ -14,7 +14,7 @@ ul { &.smoke { background-color:#f5f5f5; } &:hover { - background:$hover; + background: $hover; border-bottom:1px solid #ADF; } &:last-child { border:none } @@ -22,11 +22,11 @@ ul { p { padding-top: 1px; - margin:0; + margin: 0; color:#222; img { - position:relative; - top:3px; + position: relative; + top: 3px; } } } @@ -35,7 +35,7 @@ ul { ol, ul { &.styled { li { - padding:2px; + padding: 2px; } } } diff --git a/app/assets/stylesheets/gitlab_bootstrap/tables.scss b/app/assets/stylesheets/gitlab_bootstrap/tables.scss index 549cdfee5a6..1612b3cd20d 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/tables.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/tables.scss @@ -3,11 +3,11 @@ table { @extend .table-striped; @include solid_shade; border:1px solid #bbb; - width:100%; + width: 100%; &.low { td { - line-height:18px; + line-height: 18px; } } @@ -32,7 +32,7 @@ table { td { border-color:#f1f1f1; - line-height:28px; + line-height: 28px; .s16 { margin-top: 5px; @@ -53,10 +53,10 @@ table { } &.lite { - border:none; - box-shadow:none; + border: none; + box-shadow: none; tr, td { - border:none; + border: none; background:none !important; } } diff --git a/app/assets/stylesheets/gitlab_bootstrap/typography.scss b/app/assets/stylesheets/gitlab_bootstrap/typography.scss index 6896bb518c2..dc51fa2fc34 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/typography.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/typography.scss @@ -5,11 +5,11 @@ h1, h2, h3, h4, h5, h6 { margin: 0; } h3, h4, h5, h6 { line-height: 36px; } -h5 { font-size:14px; } +h5 { font-size: 14px; } h3.page_title { color:#456; - font-size:20px; + font-size: 20px; font-weight: normal; line-height: 28px; } @@ -37,7 +37,7 @@ a { outline: none; color: $link_color; &:hover { - text-decoration:none; + text-decoration: none; color: $blue_link; } @@ -53,24 +53,24 @@ a { } &.lined { - text-decoration:underline; - &:hover { text-decoration:underline; } + text-decoration: underline; + &:hover { text-decoration: underline; } } &.gray { - color:gray; + color: gray; } &.supp_diff_link { - text-align:center; + text-align: center; padding:20px 0; background:#f1f1f1; - width:100%; - float:left; + width: 100%; + float: left; } &.neib { - margin-right:15px; + margin-right: 15px; } } diff --git a/app/assets/stylesheets/highlight/dark.scss b/app/assets/stylesheets/highlight/dark.scss index 398d81456f6..c4153bf3f8c 100644 --- a/app/assets/stylesheets/highlight/dark.scss +++ b/app/assets/stylesheets/highlight/dark.scss @@ -23,23 +23,23 @@ .gs { font-weight: bold } /* Generic.Strong */ .gu { color: #606060 } /* Generic.Subheading */ .gt { color: #aa0000 } /* Generic.Traceback */ - .kc{font-weight:bold;} /* Keyword.Constant */ - .kd{font-weight:bold;} /* Keyword.Declaration */ - .kn{font-weight:bold;} /* Keyword.Namespace */ - .kp{font-weight:bold;} /* Keyword.Pseudo */ - .kr{font-weight:bold;} /* Keyword.Reserved */ - .kt{color:#458;font-weight:bold;} /* Keyword.Type */ + .kc{font-weight: bold;} /* Keyword.Constant */ + .kd{font-weight: bold;} /* Keyword.Declaration */ + .kn{font-weight: bold;} /* Keyword.Namespace */ + .kp{font-weight: bold;} /* Keyword.Pseudo */ + .kr{font-weight: bold;} /* Keyword.Reserved */ + .kt{color:#458;font-weight: bold;} /* Keyword.Type */ .m { color: #0000DD; font-weight: bold } /* Literal.Number */ .p { color: #eee; } .s { color: #0AD; background-color: transparent } /* Literal.String */ .na{color:#008080;} /* Name.Attribute */ .nb{color:#0086B3;} /* Name.Builtin */ - .nc{color:#ccc;font-weight:bold;} /* Name.Class */ - .no{color:turquoise;} /* Name.Constant */ + .nc{color:#ccc;font-weight: bold;} /* Name.Class */ + .no{color: turquoise;} /* Name.Constant */ .ni{color:#800080;} - .ne{color:#900;font-weight:bold;} /* Name.Exception */ - .nf{color:#ccc;font-weight:bold;} /* Name.Function */ - .nn{color:#79C3E0;font-weight:bold;} /* Name.Namespace */ + .ne{color:#900;font-weight: bold;} /* Name.Exception */ + .nf{color:#ccc;font-weight: bold;} /* Name.Function */ + .nn{color:#79C3E0;font-weight: bold;} /* Name.Namespace */ .nt{color:#fc5;} /* Name.Tag */ .nv{color:#FA4;} /* Name.Variable */ .py { color: #336699; font-weight: bold } /* Name.Property */ @@ -52,14 +52,14 @@ .sb { color: #dd2200; background-color: transparent; } /* Literal.String.Backtick */ .sc{color:#d14;} /* Literal.String.Char */ .sd { color: #dd2200; background-color: transparent; } /* Literal.String.Doc */ - .s2{color:orange;} /* Literal.String.Double */ - .se{color:orange;} /* Literal.String.Escape */ - .sh{color:orange;} /* Literal.String.Heredoc */ - .si{color:orange;} /* Literal.String.Interpol */ - .sx{color:orange;} /* Literal.String.Other */ - .sr{color:orange;} /* Literal.String.Regex */ - .s1{color:orange;} /* Literal.String.Single */ - .ss{color:orange;} /* Literal.String.Symbol */ + .s2{color: orange;} /* Literal.String.Double */ + .se{color: orange;} /* Literal.String.Escape */ + .sh{color: orange;} /* Literal.String.Heredoc */ + .si{color: orange;} /* Literal.String.Interpol */ + .sx{color: orange;} /* Literal.String.Other */ + .sr{color: orange;} /* Literal.String.Regex */ + .s1{color: orange;} /* Literal.String.Single */ + .ss{color: orange;} /* Literal.String.Symbol */ .bp { color: #D58 } /* Name.Builtin.Pseudo */ .vc { color: #336699 } /* Name.Variable.Class */ .vg { color: #dd7700 } /* Name.Variable.Global */ diff --git a/app/assets/stylesheets/highlight/white.scss b/app/assets/stylesheets/highlight/white.scss index 2a43e9f6b65..6f937538921 100644 --- a/app/assets/stylesheets/highlight/white.scss +++ b/app/assets/stylesheets/highlight/white.scss @@ -22,22 +22,22 @@ .gs { font-weight: bold } /* Generic.Strong */ .gu { color: #606060 } /* Generic.Subheading */ .gt { color: #aa0000 } /* Generic.Traceback */ - .kc{font-weight:bold;} /* Keyword.Constant */ - .kd{font-weight:bold;} /* Keyword.Declaration */ - .kn{font-weight:bold;} /* Keyword.Namespace */ - .kp{font-weight:bold;} /* Keyword.Pseudo */ - .kr{font-weight:bold;} /* Keyword.Reserved */ - .kt{color:#458;font-weight:bold;} /* Keyword.Type */ + .kc{font-weight: bold;} /* Keyword.Constant */ + .kd{font-weight: bold;} /* Keyword.Declaration */ + .kn{font-weight: bold;} /* Keyword.Namespace */ + .kp{font-weight: bold;} /* Keyword.Pseudo */ + .kr{font-weight: bold;} /* Keyword.Reserved */ + .kt{color:#458;font-weight: bold;} /* Keyword.Type */ .m { color: #0000DD; font-weight: bold } /* Literal.Number */ .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */ .na{color:#008080;} /* Name.Attribute */ .nb{color:#0086B3;} /* Name.Builtin */ - .nc{color:#458;font-weight:bold;} /* Name.Class */ + .nc{color:#458;font-weight: bold;} /* Name.Class */ .no{color:#008080;} /* Name.Constant */ .ni{color:#800080;} - .ne{color:#900;font-weight:bold;} /* Name.Exception */ - .nf{color:#900;font-weight:bold;} /* Name.Function */ - .nn{color:#005;font-weight:bold;} /* Name.Namespace */ + .ne{color:#900;font-weight: bold;} /* Name.Exception */ + .nf{color:#900;font-weight: bold;} /* Name.Function */ + .nn{color:#005;font-weight: bold;} /* Name.Namespace */ .nt{color:#000080;} /* Name.Tag */ .nv{color:#008080;} /* Name.Variable */ .py { color: #336699; font-weight: bold } /* Name.Property */ diff --git a/app/assets/stylesheets/ref_select.scss b/app/assets/stylesheets/ref_select.scss index 377d008605e..9bcd00906dc 100644 --- a/app/assets/stylesheets/ref_select.scss +++ b/app/assets/stylesheets/ref_select.scss @@ -1,6 +1,6 @@ /** Branch/tag selector **/ .project-refs-form { - margin:0; + margin: 0; span { background:none !important; position:static !important; @@ -9,7 +9,7 @@ } } .project-refs-select { - width:120px; + width: 120px; } .project-refs-form .chzn-container { @@ -21,10 +21,10 @@ .chzn-drop { min-width: 400px; .chzn-results { - max-height:300px; + max-height: 300px; } .chzn-search input { - min-width:365px; + min-width: 365px; } } } @@ -43,11 +43,11 @@ margin:7px 0; min-width: 200px; border: 1px solid #bbb; - border-radius:0; + border-radius: 0; .chzn-results { margin-top: 5px; - max-height:300px; + max-height: 300px; .group-result { color: $style_color; @@ -71,7 +71,7 @@ .chzn-search { @include bg-gray-gradient; input { - min-width:165px; + min-width: 165px; border-color: #CCC; } } @@ -81,8 +81,8 @@ @include bg-light-gray-gradient; div { - background:transparent; - border-left:none; + background: transparent; + border-left: none; } span { diff --git a/app/assets/stylesheets/sections/commits.scss b/app/assets/stylesheets/sections/commits.scss index 9cce5bd0389..ec8c8d1ec8c 100644 --- a/app/assets/stylesheets/sections/commits.scss +++ b/app/assets/stylesheets/sections/commits.scss @@ -6,14 +6,14 @@ .commit-title { line-height: 26px; - margin:0; + margin: 0; } .commit-description { font-size: 14px; border: none; background-color: white; - padding-top:10px; + padding-top: 10px; } .browse-button { @@ -28,9 +28,9 @@ @extend .clearfix; .sha-block { - text-align:right; + text-align: right; &:first-child { - padding-bottom:6px; + padding-bottom: 6px; } a { @@ -49,8 +49,8 @@ .author a, .committer a { - font-size:14px; - line-height:22px; + font-size: 14px; + line-height: 22px; text-shadow:0 1px 1px #fff; color:#777; &:hover { @@ -71,7 +71,7 @@ */ .diff_file { border:1px solid #CCC; - margin-bottom:1em; + margin-bottom: 1em; .diff_file_header { @extend .clearfix; @@ -86,7 +86,7 @@ > span { font-family: $monospace; - font-size:14px; + font-size: 14px; line-height: 30px; } @@ -104,8 +104,8 @@ } } .diff_file_content { - overflow:auto; - overflow-y:hidden; + overflow: auto; + overflow-y: hidden; background:#fff; color:#333; font-size: 12px; @@ -123,17 +123,17 @@ table { td { - line-height:18px; + line-height: 18px; } } } .diff_file_content_image { background:#eee; - text-align:center; + text-align: center; .image { display: inline-block; - margin:50px; - max-width:400px; + margin: 50px; + max-width: 400px; img{ background: url('trans_bg.gif'); @@ -158,7 +158,7 @@ &.img_compared { .image { - max-width:300px; + max-width: 300px; } } } @@ -166,46 +166,46 @@ .diff_file_content{ table { - border:none; - margin:0px; - padding:0px; + border: none; + margin: 0px; + padding: 0px; tr { td { - font-size:12px; + font-size: 12px; } } } .old_line, .new_line { - margin:0px; - padding:0px; - border:none; + margin: 0px; + padding: 0px; + border: none; background:#EEE; color:#666; padding: 0px 5px; border-right: 1px solid #ccc; - text-align:right; - min-width:35px; - max-width:35px; - width:35px; + text-align: right; + min-width: 35px; + max-width: 35px; + width: 35px; moz-user-select: none; -khtml-user-select: none; user-select: none; a { - float:left; - width:35px; - font-weight:normal; + float: left; + width: 35px; + font-weight: normal; color:#666; &:hover { - text-decoration:underline; + text-decoration: underline; } } } .line_content { - white-space:pre; - height:14px; - margin:0px; - padding:0px; - border:none; + white-space: pre; + height: 14px; + margin: 0px; + padding: 0px; + border: none; &.new { background: #CFD; } @@ -232,28 +232,28 @@ .browse_code_link_holder { @extend .span2; - float:right; + float: right; } .committed_ago { - float:right; + float: right; @extend .cgray; } .notes_count { - float:right; + float: right; margin: -6px 8px 6px; } code { background:#FCEEC1; - color:$style_color; + color: $style_color; } .commit_short_id { - float:left; + float: left; @extend .lined; - min-width:65px; + min-width: 65px; font-family: $monospace; } @@ -296,8 +296,8 @@ .label_commit { @include round-borders-all(4px); padding:2px 4px; - border:none; - font-size:13px; + border: none; + font-size: 13px; background: #474D57; color:#fff; font-family: $monospace; diff --git a/app/assets/stylesheets/sections/events.scss b/app/assets/stylesheets/sections/events.scss index 369ebc81e31..2b90829a931 100644 --- a/app/assets/stylesheets/sections/events.scss +++ b/app/assets/stylesheets/sections/events.scss @@ -22,7 +22,7 @@ &.left, &.joined { padding:0 2px; - float:none; + float: none; } } @@ -31,7 +31,7 @@ * */ .event-item { - min-height:40px; + min-height: 40px; border-bottom:1px solid #eee; .event-title { color:#333; @@ -50,7 +50,7 @@ } } .avatar { - width:32px; + width: 32px; } .event_icon { float: right; @@ -59,15 +59,15 @@ @include border-radius(5px); background: #F9F9F9; img { - width:20px; + width: 20px; } } ul { - margin-left:50px; - margin-bottom:5px; + margin-left: 50px; + margin-bottom: 5px; .avatar { - width:18px; - margin-top:3px; + width: 18px; + margin-top: 3px; } } @@ -81,9 +81,9 @@ li { &.commit { background: transparent; - padding:3px; - border:none; - font-size:12px; + padding: 3px; + border: none; + font-size: 12px; } &.commits-stat { display: block; @@ -99,14 +99,14 @@ */ .event_lp { color:#777; - padding:10px; - min-height:22px; + padding: 10px; + min-height: 22px; border-left: 5px solid #5AB9C3; - margin-bottom:20px; + margin-bottom: 20px; background:#f9f9f9; .avatar { - width:24px; + width: 24px; } .btn-new-mr { @@ -133,7 +133,7 @@ background: #f9f9f9; margin-bottom: 10px; img { - width:20px; + width: 20px; } &.inactive { diff --git a/app/assets/stylesheets/sections/graph.scss b/app/assets/stylesheets/sections/graph.scss index 2aa4463e45e..b285527ce19 100644 --- a/app/assets/stylesheets/sections/graph.scss +++ b/app/assets/stylesheets/sections/graph.scss @@ -1,6 +1,6 @@ .graph_holder { border: 1px solid #aaa; - padding:1px; + padding: 1px; h4 { diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss index 0db40ec9ac7..71f11c62f1d 100644 --- a/app/assets/stylesheets/sections/header.scss +++ b/app/assets/stylesheets/sections/header.scss @@ -5,7 +5,7 @@ header { &.navbar-gitlab { .navbar-inner { - height:45px; + height: 45px; padding: 5px; background: #F1F1F1; @@ -24,8 +24,8 @@ header { } } - z-index:10; - /*height:60px;*/ + z-index: 10; + /*height: 60px;*/ /** * @@ -33,24 +33,24 @@ header { * */ .app_logo { - width:170px; - float:left; + width: 170px; + float: left; a { - float:left; + float: left; padding: 0px; h1 { - width:90px; + width: 90px; background: url('logo_dark.png') no-repeat 0px 2px; - float:left; - margin-left:2px; - font-size:30px; - line-height:48px; - font-weight:normal; - color:$style_color; + float: left; + margin-left: 2px; + font-size: 30px; + line-height: 48px; + font-weight: normal; + color: $style_color; text-shadow: 0 1px 1px #FFF; - padding-left:45px; - height:40px; + padding-left: 45px; + height: 40px; font-family: 'Korolev', sans-serif; } } @@ -62,14 +62,14 @@ header { * */ .project_name { - position:relative; - float:left; - margin:0; - margin-right:30px; - font-size:30px; - line-height:48px; - font-weight:normal; - color:$style_color; + position: relative; + float: left; + margin: 0; + margin-right: 30px; + font-size: 30px; + line-height: 48px; + font-weight: normal; + color: $style_color; text-shadow: 0 1px 1px #FFF; font-family: 'Korolev', sans-serif; } @@ -81,7 +81,7 @@ header { */ .search { margin-right: 45px; - margin-left:10px; + margin-left: 10px; margin-top: 2px; .search-input { @@ -89,11 +89,11 @@ header { background-image: url("icon-search.png"); background-repeat: no-repeat; background-position: 10px; - padding-left:25px; + padding-left: 25px; font-size: 13px; @include border-radius(3px); border:1px solid #c6c6c6; - box-shadow:none; + box-shadow: none; &:focus { @extend .span3; } @@ -122,7 +122,7 @@ header { width: 28px; height: 28px; display: block; - top:1px; + top: 1px; &:after { content: " "; display: block; diff --git a/app/assets/stylesheets/sections/issues.scss b/app/assets/stylesheets/sections/issues.scss index 93622d6149a..e4aa30179db 100644 --- a/app/assets/stylesheets/sections/issues.scss +++ b/app/assets/stylesheets/sections/issues.scss @@ -3,7 +3,7 @@ .issue_title { @extend .top_box_content; .clearfix { - margin-bottom:0px; + margin-bottom: 0px; input { @extend .span8; } @@ -11,14 +11,14 @@ } .issue_middle_block { @extend .middle_box_content; - height:30px; + height: 30px; .issue_assignee { @extend .span6; - float:left; + float: left; } .issue_milestone { @extend .span4; - float:left; + float: left; } } .issue_description { @@ -31,28 +31,28 @@ padding:7px 10px; .issue_check { - float:left; + float: left; padding: 8px 0; padding-right: 8px; min-width: 15px; } p { - padding-top:0; - padding-bottom:2px; + padding-top: 0; + padding-bottom: 2px; } img.avatar { - width:32px; - margin-top:1px; + width: 32px; + margin-top: 1px; } } } input.check_all_issues { - float:left; + float: left; padding: 0; - margin:0; + margin: 0; margin-right: 10px; position: relative; top: 8px; @@ -82,16 +82,16 @@ input.check_all_issues { } } -@media (min-width: 800px) { .issues_filters select { width:160px; } } -@media (min-width: 1000px) { .issues_filters select { width:200px; } } -@media (min-width: 1200px) { .issues_filters select { width:220px; } } +@media (min-width: 800px) { .issues_filters select { width: 160px; } } +@media (min-width: 1000px) { .issues_filters select { width: 200px; } } +@media (min-width: 1200px) { .issues_filters select { width: 220px; } } #issues-table-holder { .issues_filters { form { - padding:0; - margin:0; + padding: 0; + margin: 0; margin-top:7px } } @@ -99,27 +99,27 @@ input.check_all_issues { .issues_bulk_update { margin: 0; form { - padding:0; - margin:0; + padding: 0; + margin: 0; margin-top:7px } .update_selected_issues { - position:relative; + position: relative; top:-2px; - margin-left:4px; - float:left; + margin-left: 4px; + float: left; } .update_issues_text { - padding:3px; + padding: 3px; line-height: 18px; - float:left; + float: left; } } } #update_status { - width:100px; + width: 100px; } @@ -136,11 +136,11 @@ input.check_all_issues { */ .ui-datepicker { - border:none; - box-shadow:none; + border: none; + box-shadow: none; .ui-datepicker-header { @include solid_shade; - margin-bottom:10px; + margin-bottom: 10px; border:1px solid #bbb; } } diff --git a/app/assets/stylesheets/sections/login.scss b/app/assets/stylesheets/sections/login.scss index 5b8763cfec0..aea57c81948 100644 --- a/app/assets/stylesheets/sections/login.scss +++ b/app/assets/stylesheets/sections/login.scss @@ -27,7 +27,7 @@ body.login-page{ -moz-border-radius-topright: 5px; border-top-left-radius: 5px; border-top-right-radius: 5px; - margin-bottom:0px; + margin-bottom: 0px; } .login-box input.text.bottom{ diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss index 9087e7c2f59..f6816c7dd7d 100644 --- a/app/assets/stylesheets/sections/merge_requests.scss +++ b/app/assets/stylesheets/sections/merge_requests.scss @@ -5,7 +5,7 @@ .mr_branch_box { @extend .ui-box; - margin-bottom:20px; + margin-bottom: 20px; .body { background:#f1f1f1; @@ -23,14 +23,14 @@ } form { - margin-bottom:0; + margin-bottom: 0; .clearfix { - margin-bottom:0; + margin-bottom: 0; } } .accept_group { - float:left; + float: left; border: 1px solid #ADA; padding: 2px; @include border-radius(5px); @@ -38,13 +38,13 @@ background: #CEB; .accept_merge_request { - font-size:13px; - float:left; + font-size: 13px; + float: left; } .remove_branch_holder { - margin-left:20px; - margin-right:10px; - float:left; + margin-left: 20px; + margin-right: 10px; + float: left; } label { color:#444; @@ -60,9 +60,9 @@ .mr_nav_tabs { li { a { - font-weight:bold; + font-weight: bold; padding:8px 20px; - text-align:center; + text-align: center; } } } @@ -87,8 +87,8 @@ li.merge_request { .label_branch { @include round-borders-all(4px); padding:2px 4px; - border:none; - font-size:14px; + border: none; + font-size: 14px; background: #474D57; color:#fff; font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace; @@ -97,8 +97,8 @@ li.merge_request { .mr_source_commit, .mr_target_commit { .commit { - margin:0; - padding:0; + margin: 0; + padding: 0; padding: 5px; margin-bottom: 5px; .avatar { position:relative } @@ -109,11 +109,11 @@ li.merge_request { .dash, .committed_ago, .browse_code_link_holder { - display:none; + display: none; } - list-style:none; + list-style: none; &:hover { - background:none; + background: none; } } } @@ -126,14 +126,14 @@ li.merge_request { @extend .main_box; .merge_requests_middle_box { @extend .middle_box_content; - height:30px; + height: 30px; .merge_requests_assignee { @extend .span6; - float:left; + float: left; } .merge_requests_milestone { @extend .span4; - float:left; + float: left; } } } diff --git a/app/assets/stylesheets/sections/nav.scss b/app/assets/stylesheets/sections/nav.scss index 5707216922c..7c39661d077 100644 --- a/app/assets/stylesheets/sections/nav.scss +++ b/app/assets/stylesheets/sections/nav.scss @@ -5,34 +5,34 @@ ul.main_menu { border-radius: 4px; margin: auto; - margin:30px 0; - border:1px solid #BBB; - height:37px; + margin: 30px 0; + border: 1px solid #BBB; + height: 37px; @include bg-gray-gradient; - position:relative; - overflow:hidden; + position: relative; + overflow: hidden; @include shade; .count { position: relative; - top: -1px; - display: inline-block; - height: 15px; - margin: 0 0 0 5px; - padding: 0 8px 1px 8px; - height: auto; - font-size: 0.82em; - line-height: 14px; - text-align: center; - color: #777; - background: #f2f2f2; - border-top: 1px solid #CCC; - border-radius: 8px; - -moz-border-radius: 8px; + top: -1px; + display: inline-block; + height: 15px; + margin: 0 0 0 5px; + padding: 0 8px 1px 8px; + height: auto; + font-size: 0.82em; + line-height: 14px; + text-align: center; + color: #777; + background: #f2f2f2; + border-top: 1px solid #CCC; + border-radius: 8px; + -moz-border-radius: 8px; } .label { - background:$hover; - text-shadow:none; - color:$style_color; + background: $hover; + text-shadow: none; + color: $style_color; } li { list-style-type: none; @@ -59,8 +59,8 @@ ul.main_menu { border-left: 1px solid #BBB; border-radius: 0 0 1px 1px; &:first-child{ - border-bottom:none; - border-left:none; + border-bottom: none; + border-left: none; } } @@ -68,10 +68,10 @@ ul.main_menu { a { background: url(home_icon.PNG) no-repeat center center; text-indent:-9999px; - min-width:20px; + min-width: 20px; img { - position:relative; - top:4px; + position: relative; + top: 4px; } } } @@ -79,9 +79,9 @@ ul.main_menu { a { display: block; text-align: center; - font-weight:bold; - height:35px; - line-height:36px; + font-weight: bold; + height: 35px; + line-height: 36px; color: $style_color; text-shadow:0 1px 1px white; padding:0 10px; diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss index d24d070df1e..8083898080c 100644 --- a/app/assets/stylesheets/sections/notes.scss +++ b/app/assets/stylesheets/sections/notes.scss @@ -4,30 +4,30 @@ */ #notes-list, #new-notes-list { - display:block; - list-style:none; - margin:0px; - padding:0px; + display: block; + list-style: none; + margin: 0px; + padding: 0px; } .issue_notes, .wiki_notes { .note_content { - float:left; - width:400px; + float: left; + width: 400px; } } /* Note textare */ #note_note { - height:80px; - width:99%; - font-size:14px; + height: 80px; + width: 99%; + font-size: 14px; } #new_note { .attach_holder { - display:none; + display: none; } } @@ -43,27 +43,27 @@ padding: 8px 0; overflow: hidden; display: block; - position:relative; + position: relative; img {float: left; margin-right: 10px;} - img.emoji {float:none;margin:0;} + img.emoji {float: none;margin: 0;} .note-author cite{font-style: italic;} - p { color:$style_color; } + p { color: $style_color; } .note-author { color: $style_color;} - .note-title { margin-left:45px; padding-top: 5px;} + .note-title { margin-left: 45px; padding-top: 5px;} .avatar { - margin-top:3px; + margin-top: 3px; } .delete-note { - display:none; - position:absolute; - right:0; - top:0; + display: none; + position: absolute; + right: 0; + top: 0; } &:hover { - .delete-note { display:block; } + .delete-note { display: block; } } } #notes-list:not(.reversed) .note, @@ -107,17 +107,17 @@ tr.line_notes_row { a.line_note_reply_link { @include round-borders-all(4px); padding: 3px 10px; - margin-left:5px; + margin-left: 5px; color: white; background: #2A79A3; border-color: #2A79A3; } } ul { - margin:0; + margin: 0; li { - padding:0; - border:none; + padding: 0; + border: none; } } } @@ -132,21 +132,21 @@ tr.line_notes_row { border-bottom:1px solid #ddd; } .note_actions { - margin:0; + margin: 0; padding-top: 10px; .buttons { - float:left; - width:300px; + float: left; + width: 300px; } .options { .labels { - float:left; - padding-left:10px; + float: left; + padding-left: 10px; label { padding: 6px 0; margin: 0; - width:120px; + width: 120px; } } } @@ -154,13 +154,13 @@ tr.line_notes_row { } td .line_note_link { - position:absolute; + position: absolute; margin-left:-70px; margin-top:-10px; - z-index:10; + z-index: 10; background: url("comment_add.png") no-repeat left 0; - width:32px; - height:32px; + width: 32px; + height: 32px; opacity: 0.0; filter: alpha(opacity=0); @@ -180,13 +180,13 @@ td .line_note_link { .new_note { .input-file { font: 500px monospace; - opacity:0; + opacity: 0; filter: alpha(opacity=0); position: absolute; z-index: 1; - top:0; - right:0; - padding:0; + top: 0; + right: 0; + padding: 0; margin: 0; } @@ -198,24 +198,24 @@ td .line_note_link { } .attachments { - position:relative; + position: relative; width: 350px; height: 50px; - overflow:hidden; + overflow: hidden; margin:0 0 5px !important; .input_file { .file_upload { position: absolute; - right:14px; - top:7px; + right: 14px; + top: 7px; } .file_name { - line-height:30px; - width:240px; - height:28px; - overflow:hidden; + line-height: 30px; + width: 240px; + height: 28px; + overflow: hidden; } .input-file { width: 260px; @@ -228,5 +228,5 @@ td .line_note_link { .note-text { border: 1px solid #aaa; - box-shadow:none; + box-shadow: none; } diff --git a/app/assets/stylesheets/sections/profile.scss b/app/assets/stylesheets/sections/profile.scss index e945ca00918..5a852eb52df 100644 --- a/app/assets/stylesheets/sections/profile.scss +++ b/app/assets/stylesheets/sections/profile.scss @@ -1,20 +1,20 @@ .profile_history { .event_feed { - min-height:20px; + min-height: 20px; .avatar { - width:20px; + width: 20px; } } } .profile_avatar_holder { - float:left; - width:60px; - height:60px; - margin-right:20px; + float: left; + width: 60px; + height: 60px; + margin-right: 20px; img { - width:60px; - height:60px; + width: 60px; + height: 60px; background:#fff; padding: 1px; border: 1px solid #ddd; diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss index c9d386ab5bb..9ed78a21aee 100644 --- a/app/assets/stylesheets/sections/projects.scss +++ b/app/assets/stylesheets/sections/projects.scss @@ -10,37 +10,37 @@ .groups_box, .projects_box { h5 { - color:$style_color; - font-size:16px; + color: $style_color; + font-size: 16px; text-shadow: 0 1px 1px #fff; padding: 2px 10px; - line-height:32px; - font-size:14px; + line-height: 32px; + font-size: 14px; } ul { li { - padding:0; + padding: 0; a { - display:block; + display: block; .group_name { - font-size:14px; - line-height:18px; + font-size: 14px; + line-height: 18px; } .project_name { color:#4fa2bd; - font-size:14px; - line-height:18px; + font-size: 14px; + line-height: 18px; } .arrow { - float:right; - padding:10px; - margin:0; + float: right; + padding: 10px; + margin: 0; } .last_activity { - padding-top:5px; - display:block; + padding-top: 5px; + display: block; span, strong { - font-size:12px; + font-size: 12px; color:#666; } } @@ -58,21 +58,21 @@ .project_name_holder { input, label { - font-size:16px; - line-height:20px; - padding:8px; + font-size: 16px; + line-height: 20px; + padding: 8px; } label { color:#888; } .btn { padding:6px 10px; - margin-left:10px; - margin-bottom:8px; + margin-left: 10px; + margin-bottom: 8px; } } .adv_settings { - h6 { margin-left:40px; } + h6 { margin-left: 40px; } } } @@ -81,13 +81,13 @@ @include bg-gray-gradient; padding: 4px 7px; border: 1px solid #CCC; - margin-bottom:20px; + margin-bottom: 20px; } .project_clone_holder { input[type="text"], .btn { - font-size:12px; + font-size: 12px; line-height: 18px; margin: 0; padding: 3px 10px; @@ -102,8 +102,8 @@ .save-project-loader { img { - margin-top:50px; - margin-bottom:50px; + margin-top: 50px; + margin-bottom: 50px; } h3 { @extend .page_title; diff --git a/app/assets/stylesheets/sections/themes.scss b/app/assets/stylesheets/sections/themes.scss index 2d121519b02..4e5eaf575ae 100644 --- a/app/assets/stylesheets/sections/themes.scss +++ b/app/assets/stylesheets/sections/themes.scss @@ -6,17 +6,17 @@ } .themes_opts { - padding-left:20px; + padding-left: 20px; label { - width:175px; - margin-right:40px; + width: 175px; + margin-right: 40px; .prev { @extend .thumbnail; - height:30px; - width:175px; - margin-bottom:10px; + height: 30px; + width: 175px; + margin-bottom: 10px; &.classic { background: #31363e; @@ -42,17 +42,17 @@ } .code_highlight_opts { - padding-left:20px; + padding-left: 20px; label { - width:220px; - margin-right:40px; + width: 220px; + margin-right: 40px; .prev { @extend .thumbnail; - height:151px; - width:220px; - margin-bottom:10px; + height: 151px; + width: 220px; + margin-bottom: 10px; } } } diff --git a/app/assets/stylesheets/sections/tree.scss b/app/assets/stylesheets/sections/tree.scss index f6bdb0f3dba..60873b37147 100644 --- a/app/assets/stylesheets/sections/tree.scss +++ b/app/assets/stylesheets/sections/tree.scss @@ -1,14 +1,14 @@ .tree-holder { .tree-content-holder { - float:left; - width:100%; + float: left; + width: 100%; } .tree_progress { - display:none; - margin:20px; + display: none; + margin: 20px; &.loading { - display:block; + display: block; } } @@ -21,17 +21,17 @@ border-top:1px solid #ADF; border-bottom:1px solid #ADF; } - cursor:pointer; + cursor: pointer; } } } .tree-item { .tree-item-file-name { - vertical-align:middle; + vertical-align: middle; a { &:hover { - color:$blue_link; + color: $blue_link; } } @@ -48,7 +48,7 @@ padding: 2px 10px; } td { - line-height:20px; + line-height: 20px; background:#fafafa; } } diff --git a/app/assets/stylesheets/themes/ui_basic.scss b/app/assets/stylesheets/themes/ui_basic.scss index 1f3d3d3d389..3a85b6e9bf6 100644 --- a/app/assets/stylesheets/themes/ui_basic.scss +++ b/app/assets/stylesheets/themes/ui_basic.scss @@ -11,7 +11,7 @@ a { color: $link_color; &:hover { - text-decoration:none; + text-decoration: none; color: $blue_link; } } diff --git a/app/assets/stylesheets/themes/ui_mars.scss b/app/assets/stylesheets/themes/ui_mars.scss index a9d2124130d..f51cc897881 100644 --- a/app/assets/stylesheets/themes/ui_mars.scss +++ b/app/assets/stylesheets/themes/ui_mars.scss @@ -52,7 +52,7 @@ } } .separator { - display:none; + display: none; } } From b825582eb16d7983798f3a35746a8352675d3f23 Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Fri, 23 Nov 2012 17:51:38 +0100 Subject: [PATCH 3/9] replaced redundant -*-border-radius box-shadows and others with corresponding mixins --- app/assets/stylesheets/common.scss | 66 +++++++++---------- .../stylesheets/gitlab_bootstrap/blocks.scss | 30 ++++----- .../stylesheets/gitlab_bootstrap/buttons.scss | 40 +++++------ .../stylesheets/gitlab_bootstrap/common.scss | 20 +++--- .../stylesheets/gitlab_bootstrap/files.scss | 20 +++--- .../stylesheets/gitlab_bootstrap/lists.scss | 6 +- .../stylesheets/gitlab_bootstrap/tables.scss | 8 +-- .../gitlab_bootstrap/typography.scss | 8 +-- app/assets/stylesheets/highlight/dark.scss | 24 +++---- app/assets/stylesheets/highlight/white.scss | 46 +++++++------ app/assets/stylesheets/mixins.scss | 37 +++++------ app/assets/stylesheets/ref_select.scss | 10 ++- app/assets/stylesheets/sections/commits.scss | 35 +++++----- app/assets/stylesheets/sections/editor.scss | 2 +- app/assets/stylesheets/sections/events.scss | 24 +++---- app/assets/stylesheets/sections/graph.scss | 2 +- app/assets/stylesheets/sections/header.scss | 31 ++++----- app/assets/stylesheets/sections/issues.scss | 4 +- app/assets/stylesheets/sections/login.scss | 20 ++---- .../stylesheets/sections/merge_requests.scss | 15 ++--- app/assets/stylesheets/sections/nav.scss | 22 +++---- app/assets/stylesheets/sections/notes.scss | 16 ++--- app/assets/stylesheets/sections/profile.scss | 2 +- app/assets/stylesheets/sections/projects.scss | 8 +-- app/assets/stylesheets/sections/tree.scss | 8 +-- app/assets/stylesheets/themes/ui_mars.scss | 4 +- 26 files changed, 240 insertions(+), 268 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index d5173dcf2ac..c2194297009 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -10,7 +10,7 @@ body { } .container .content { - margin:0 0; + margin: 0 0; } .container .sidebar { @@ -32,7 +32,7 @@ body { text-decoration: underline; font-size: 14px; font-weight: bold; - padding:10px 0; + padding: 10px 0; padding-bottom: 0; } @@ -61,7 +61,7 @@ table a code { } .loading { - margin:20px auto; + margin: 20px auto; background: url(ajax_loader.gif) no-repeat center center; width: 40px; height: 40px; @@ -78,10 +78,10 @@ table a code { overflow: hidden; background: white; cursor: pointer; - border-bottom:1px solid #ccc; + border-bottom: 1px solid #ccc; h4 { - color:#666; + color: #666; font-size: 18px; line-height: 38px; padding-top: 5px; @@ -102,7 +102,7 @@ span.update-author { display: block; } span.update-author { - color:#999; + color: #999; font-weight: normal; font-style: italic; } @@ -122,7 +122,7 @@ span.update-author { display: none; } .user-mention { - color:#2FA0BB; + color: #2FA0BB; font-weight: bold; } @@ -136,9 +136,9 @@ span.update-author { &.label-tag { background: none; border: none; - padding:4px 6px; - color:#444; - text-shadow:0 0 1px #fff; + padding: 4px 6px; + color: #444; + text-shadow: 0 0 1px #fff; &.grouped { float: left; @@ -149,9 +149,9 @@ span.update-author { &.label-issue { background-color: #eee; border: 1px solid #ccc; - padding:4px 6px; - color:#444; - text-shadow:0 0 1px #fff; + padding: 4px 6px; + color: #444; + text-shadow: 0 0 1px #fff; &.grouped { float: left; @@ -213,7 +213,7 @@ ul.breadcrumb { } a { - color:#474D57; + color: #474D57; font-weight: bold; font-size: 14px; } @@ -264,7 +264,7 @@ input.git_clone_url { /** bordered list **/ ul.bordered-list { - margin:5px 0px; + margin: 5px 0px; padding: 0px; li { padding: 5px 0; @@ -310,7 +310,7 @@ p.time { .styled_image { - border:2px solid #ddd; + border: 2px solid #ddd; } @@ -337,22 +337,22 @@ p.time { .leftbar { h5, .title { - padding:5px 10px; + padding: 5px 10px; } h4 { font-size: 14px; - padding:2px 10px; - color:#666; - border-bottom:1px solid #f1f1f1; + padding: 2px 10px; + color: #666; + border-bottom: 1px solid #f1f1f1; } a:last-child h4 { border: none; } a:hover { h4 { - color:#111; + color: #111; background: $hover; - border-color:#CCC; + border-color: #CCC; .ico.project { background-position:-209px -21px; } @@ -420,12 +420,12 @@ p.time { .highlight_word { - background:#EEDC94; + background: #EEDC94; } .status_info { font-size: 14px; - padding:5px 15px; + padding: 5px 15px; line-height: 24px; width: 60px; text-align: center; @@ -450,7 +450,7 @@ p.time { background: #E3E5EA; padding: 5px; margin-top: 5px; - border-radius: 5px; + @include border-radius(5px); text-shadow: none; color: #999; line-height: 16px; @@ -504,7 +504,7 @@ li.note { .team_member_show { td:first-child { - color:#aaa; + color: #aaa; } } @@ -554,12 +554,12 @@ li.note { /* CHZN reset few styles */ .chzn-container-single .chzn-single { - background:#FFF; + background: #FFF; border: 1px solid #bbb; box-shadow: none; } .chzn-container-active .chzn-single { - background:#fff; + background: #fff; } @@ -572,15 +572,15 @@ li.note { .issue { &.today{ background: #EFE; - border-color:#CEC; + border-color: #CEC; } &.closed { background: #F5f5f5; - border-color:#E5E5E5; + border-color: #E5E5E5; } &.merged { background: #F5f5f5; - border-color:#E5E5E5; + border-color: #E5E5E5; } } @@ -612,7 +612,7 @@ li.note { } .active { img { - border:1px solid #ccc; + border: 1px solid #ccc; background: $hover; @include border-radius(5px); } @@ -627,7 +627,7 @@ li.note { .gitlab-promo { a { - color:#aaa; + color: #aaa; margin-right: 30px; } } diff --git a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss index b705f8fb3b1..db149ee7069 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss @@ -41,16 +41,16 @@ } .middle_box_content { - border-radius: 0; + @include border-radius(0); border: none; font-size: 12px; - background-color:#f5f5f5; + background-color: #f5f5f5; border: none; - border-top:1px solid #eee; + border-top: 1px solid #eee; } .bottom_box_content { - border-top:1px solid #eee; + border-top: 1px solid #eee; } } @@ -59,14 +59,14 @@ * */ .ui-box { - background:#F9F9F9; + background: #F9F9F9; margin-bottom: 25px; @include round-borders-all(4px); border-color: #CCC; @include solid_shade; &.white { - background:#fff; + background: #fff; } ul { @@ -87,16 +87,16 @@ } form { - padding:9px 0; + padding: 9px 0; margin: 0px; } .nav-pills { li { - padding:3px 0; + padding: 3px 0; &.active a { background-color: $style_color; } a { - border-radius: 7px; + @include border-radius(7px); } } } @@ -116,20 +116,20 @@ padding: 5px 20px; } .middle_title { - background:#f5f5f5; + background: #f5f5f5; margin:20px -20px; padding: 0 20px; - border-top:1px solid #eee; - border-bottom:1px solid #eee; + border-top: 1px solid #eee; + border-bottom: 1px solid #eee; font-size: 14px; - color:#777; + color: #777; } } .row_title { font-weight: bold; - color:#444; + color: #444; &:hover { - color:#444; + color: #444; text-decoration: underline; } } diff --git a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss index a86e8c51c16..a8d9e5c0929 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss @@ -1,42 +1,42 @@ .btn { @include bg-gradient(#f7f7f7, #d5d5d5); - border-color:#aaa; + border-color: #aaa; &:hover { @include bg-gray-gradient; - border-color:#bbb; - color:#333; + border-color: #bbb; + color: #333; } &.primary { - background:#2a79A3; + background: #2a79A3; @include bg-gradient(#47A7b7, #2585b5); border-color: #2A79A3; - color:#fff; + color: #fff; text-shadow: 0 1px 1px #268; &:hover { background: $blue_link; - color:#fff; + color: #fff; } &.disabled { - color:#fff; - background:#29B; + color: #fff; + background: #29B; } } &.btn-info { - background:#5aB9C3; + background: #5aB9C3; border-color: $blue_link; - color:#fff; + color: #fff; text-shadow: 0 1px 1px #268; &:hover { background: $blue_link; - color:#fff; + color: #fff; } &.disabled { - color:#fff; - background:#29B; + color: #fff; + background: #29B; } } @@ -49,8 +49,8 @@ } &.disabled { - color:#fff; - background:#2b2; + color: #fff; + background: #2b2; } } @@ -73,7 +73,7 @@ border-color: #BD362F; &:hover { - color:#fff; + color: #fff; background: #EE4E49; } } @@ -87,13 +87,13 @@ } &.active { - border-color:#aaa; - background-color:#ccc; + border-color: #aaa; + background-color: #ccc; } &.very_small { font-size: 11px; - padding:2px 6px; + padding: 2px 6px; line-height: 16px; margin: 2px; } @@ -105,6 +105,6 @@ &.padded { margin-right: 3px; - padding:4px 10px 4px; + padding: 4px 10px 4px; } } diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss index 7e41ec9846c..ab00995fb60 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/common.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss @@ -32,22 +32,22 @@ .light { color: #888 } /** PILLS & TABS**/ -.nav-pills a:hover { background-color:#888; } +.nav-pills a:hover { background-color: #888; } .nav-pills .active a { background-color: $style_color; } .nav-tabs > li > a, .nav-pills > li > a { color: $style_color; } .nav.nav-tabs { li { > a { - padding:8px 20px; + padding: 8px 20px; margin-right: 7px; line-height: 19px; border-color: #EEE; - color:#888; + color: #888; border-bottom: 1px solid #ddd; .badge { background-color: #eee; - color:#888; - text-shadow:0 1px 1px #fff; + color: #888; + text-shadow: 0 1px 1px #fff; } i[class^="icon-"] { line-height: 14px; @@ -57,7 +57,7 @@ > a { border-color: #CCC; border-bottom: 1px solid #fff; - color:#333; + color: #333; } } } @@ -69,7 +69,7 @@ .alert-message.error { @extend .alert-error; } /** AVATARS **/ -img.avatar { float: left; margin-right: 12px; width: 40px; border:1px solid #ddd; padding: 1px; } +img.avatar { float: left; margin-right: 12px; width: 40px; border: 1px solid #ddd; padding: 1px; } img.avatar.s16 { width: 16px; height: 16px; margin-right: 6px; } img.avatar.s24 { width: 24px; height: 24px; margin-right: 8px; } img.avatar.s32 { width: 32px; height: 32px; margin-right: 10px; } @@ -77,8 +77,8 @@ img.lil_av { padding-left: 4px; padding-right: 3px; } img.small { width: 80px; } /** HELPERS **/ -.nothing_here_message { text-align: center; padding: 20px; color:#777; } -p.slead { color:#456; font-size: 16px; margin-bottom: 12px; font-weight: 200; line-height: 24px; } +.nothing_here_message { text-align: center; padding: 20px; color: #777; } +p.slead { color: #456; font-size: 16px; margin-bottom: 12px; font-weight: 200; line-height: 24px; } /** FORMS **/ input[type='search'].search-text-input { @@ -87,7 +87,7 @@ input[type='search'].search-text-input { background-position: 10px; padding-left: 25px; @include border-radius(4px); - border:1px solid #ccc; + border: 1px solid #ccc; } fieldset legend { font-size: 17px; } diff --git a/app/assets/stylesheets/gitlab_bootstrap/files.scss b/app/assets/stylesheets/gitlab_bootstrap/files.scss index dc2d19c603f..b392d640c7f 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/files.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/files.scss @@ -3,7 +3,7 @@ * */ .file_holder { - border:1px solid #BBB; + border: 1px solid #BBB; margin-bottom: 1em; @include solid_shade; @@ -28,19 +28,19 @@ font-size: 14px; text-shadow: 0 1px 1px #fff; small { - color:#999; + color: #999; font-size: 13px; } } } .file_content { - background:#fff; + background: #fff; font-size: 11px; &.wiki { font-size: 13px; code { - padding:0 4px; + padding: 0 4px; } padding: 20px; h1, h2 { @@ -52,7 +52,7 @@ } &.image_file { - background:#eee; + background: #eee; text-align: center; img { padding: 100px; @@ -83,12 +83,12 @@ &:last-child { border-right: none; } - background:#fff; + background: #fff; padding: 5px; } .author, .blame_commit { - background:#f5f5f5; + background: #f5f5f5; vertical-align: top; } .lines { @@ -102,7 +102,7 @@ } &.logs { - background:#eee; + background: #eee; max-height: 700px; overflow-y: auto; @@ -113,10 +113,10 @@ margin-bottom: 0; background: white; li { - color:#888; + color: #888; p { margin: 0; - color:#333; + color: #333; line-height: 24px; padding-left: 10px; } diff --git a/app/assets/stylesheets/gitlab_bootstrap/lists.scss b/app/assets/stylesheets/gitlab_bootstrap/lists.scss index c803070b77d..5bd087b080e 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/lists.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/lists.scss @@ -12,10 +12,10 @@ ul { border-bottom: 1px solid #eee; border-bottom: 1px solid rgba(0, 0, 0, 0.05); - &.smoke { background-color:#f5f5f5; } + &.smoke { background-color: #f5f5f5; } &:hover { background: $hover; - border-bottom:1px solid #ADF; + border-bottom: 1px solid #ADF; } &:last-child { border:none } .author { color: #999; } @@ -23,7 +23,7 @@ ul { p { padding-top: 1px; margin: 0; - color:#222; + color: #222; img { position: relative; top: 3px; diff --git a/app/assets/stylesheets/gitlab_bootstrap/tables.scss b/app/assets/stylesheets/gitlab_bootstrap/tables.scss index 1612b3cd20d..e132209901f 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/tables.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/tables.scss @@ -2,7 +2,7 @@ table { @extend .table; @extend .table-striped; @include solid_shade; - border:1px solid #bbb; + border: 1px solid #bbb; width: 100%; &.low { @@ -31,7 +31,7 @@ table { } td { - border-color:#f1f1f1; + border-color: #f1f1f1; line-height: 28px; .s16 { @@ -40,11 +40,11 @@ table { } &:first-child { - border-left:1px solid #bbb; + border-left: 1px solid #bbb; } &:last-child { - border-right:1px solid #bbb; + border-right: 1px solid #bbb; } } diff --git a/app/assets/stylesheets/gitlab_bootstrap/typography.scss b/app/assets/stylesheets/gitlab_bootstrap/typography.scss index dc51fa2fc34..926c5bc82b4 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/typography.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/typography.scss @@ -8,7 +8,7 @@ h3, h4, h5, h6 { line-height: 36px; } h5 { font-size: 14px; } h3.page_title { - color:#456; + color: #456; font-size: 20px; font-weight: normal; line-height: 28px; @@ -25,7 +25,7 @@ pre { &.dark { background: #333; - color:#f5f5f5; + color: #f5f5f5; } } @@ -63,8 +63,8 @@ a { &.supp_diff_link { text-align: center; - padding:20px 0; - background:#f1f1f1; + padding: 20px 0; + background: #f1f1f1; width: 100%; float: left; } diff --git a/app/assets/stylesheets/highlight/dark.scss b/app/assets/stylesheets/highlight/dark.scss index c4153bf3f8c..4196ea7ad29 100644 --- a/app/assets/stylesheets/highlight/dark.scss +++ b/app/assets/stylesheets/highlight/dark.scss @@ -28,29 +28,29 @@ .kn{font-weight: bold;} /* Keyword.Namespace */ .kp{font-weight: bold;} /* Keyword.Pseudo */ .kr{font-weight: bold;} /* Keyword.Reserved */ - .kt{color:#458;font-weight: bold;} /* Keyword.Type */ + .kt{color: #458;font-weight: bold;} /* Keyword.Type */ .m { color: #0000DD; font-weight: bold } /* Literal.Number */ .p { color: #eee; } .s { color: #0AD; background-color: transparent } /* Literal.String */ - .na{color:#008080;} /* Name.Attribute */ - .nb{color:#0086B3;} /* Name.Builtin */ - .nc{color:#ccc;font-weight: bold;} /* Name.Class */ + .na{color: #008080;} /* Name.Attribute */ + .nb{color: #0086B3;} /* Name.Builtin */ + .nc{color: #ccc;font-weight: bold;} /* Name.Class */ .no{color: turquoise;} /* Name.Constant */ - .ni{color:#800080;} - .ne{color:#900;font-weight: bold;} /* Name.Exception */ - .nf{color:#ccc;font-weight: bold;} /* Name.Function */ - .nn{color:#79C3E0;font-weight: bold;} /* Name.Namespace */ - .nt{color:#fc5;} /* Name.Tag */ - .nv{color:#FA4;} /* Name.Variable */ + .ni{color: #800080;} + .ne{color: #900;font-weight: bold;} /* Name.Exception */ + .nf{color: #ccc;font-weight: bold;} /* Name.Function */ + .nn{color: #79C3E0;font-weight: bold;} /* Name.Namespace */ + .nt{color: #fc5;} /* Name.Tag */ + .nv{color: #FA4;} /* Name.Variable */ .py { color: #336699; font-weight: bold } /* Name.Property */ .ow { color: #008800 } /* Operator.Word */ .w { color: #bbbbbb } /* Text.Whitespace */ .mf { color: #7AC; font-weight: bold } /* Literal.Number.Float */ .mh { color: #7AC; font-weight: bold } /* Literal.Number.Hex */ - .mi {color:#099;} /* Literal.Number.Integer */ + .mi {color: #099;} /* Literal.Number.Integer */ .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .sb { color: #dd2200; background-color: transparent; } /* Literal.String.Backtick */ - .sc{color:#d14;} /* Literal.String.Char */ + .sc{color: #d14;} /* Literal.String.Char */ .sd { color: #dd2200; background-color: transparent; } /* Literal.String.Doc */ .s2{color: orange;} /* Literal.String.Double */ .se{color: orange;} /* Literal.String.Escape */ diff --git a/app/assets/stylesheets/highlight/white.scss b/app/assets/stylesheets/highlight/white.scss index 6f937538921..f200e1d7b60 100644 --- a/app/assets/stylesheets/highlight/white.scss +++ b/app/assets/stylesheets/highlight/white.scss @@ -27,37 +27,37 @@ .kn{font-weight: bold;} /* Keyword.Namespace */ .kp{font-weight: bold;} /* Keyword.Pseudo */ .kr{font-weight: bold;} /* Keyword.Reserved */ - .kt{color:#458;font-weight: bold;} /* Keyword.Type */ + .kt{color: #458;font-weight: bold;} /* Keyword.Type */ .m { color: #0000DD; font-weight: bold } /* Literal.Number */ .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */ - .na{color:#008080;} /* Name.Attribute */ - .nb{color:#0086B3;} /* Name.Builtin */ - .nc{color:#458;font-weight: bold;} /* Name.Class */ - .no{color:#008080;} /* Name.Constant */ - .ni{color:#800080;} - .ne{color:#900;font-weight: bold;} /* Name.Exception */ - .nf{color:#900;font-weight: bold;} /* Name.Function */ - .nn{color:#005;font-weight: bold;} /* Name.Namespace */ - .nt{color:#000080;} /* Name.Tag */ - .nv{color:#008080;} /* Name.Variable */ + .na{color: #008080;} /* Name.Attribute */ + .nb{color: #0086B3;} /* Name.Builtin */ + .nc{color: #458;font-weight: bold;} /* Name.Class */ + .no{color: #008080;} /* Name.Constant */ + .ni{color: #800080;} + .ne{color: #900;font-weight: bold;} /* Name.Exception */ + .nf{color: #900;font-weight: bold;} /* Name.Function */ + .nn{color: #005;font-weight: bold;} /* Name.Namespace */ + .nt{color: #000080;} /* Name.Tag */ + .nv{color: #008080;} /* Name.Variable */ .py { color: #336699; font-weight: bold } /* Name.Property */ .ow { color: #008800 } /* Operator.Word */ .w { color: #bbbbbb } /* Text.Whitespace */ .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ - .mi {color:#099;} /* Literal.Number.Integer */ + .mi {color: #099;} /* Literal.Number.Integer */ .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ - .sc{color:#d14;} /* Literal.String.Char */ + .sc{color: #d14;} /* Literal.String.Char */ .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ - .s2{color:#d14;} /* Literal.String.Double */ - .se{color:#d14;} /* Literal.String.Escape */ - .sh{color:#d14;} /* Literal.String.Heredoc */ - .si{color:#d14;} /* Literal.String.Interpol */ - .sx{color:#d14;} /* Literal.String.Other */ - .sr{color:#d14;} /* Literal.String.Regex */ - .s1{color:#d14;} /* Literal.String.Single */ - .ss{color:#d14;} /* Literal.String.Symbol */ + .s2{color: #d14;} /* Literal.String.Double */ + .se{color: #d14;} /* Literal.String.Escape */ + .sh{color: #d14;} /* Literal.String.Heredoc */ + .si{color: #d14;} /* Literal.String.Interpol */ + .sx{color: #d14;} /* Literal.String.Other */ + .sr{color: #d14;} /* Literal.String.Regex */ + .s1{color: #d14;} /* Literal.String.Single */ + .ss{color: #d14;} /* Literal.String.Symbol */ .bp { color: #003388 } /* Name.Builtin.Pseudo */ .vc { color: #336699 } /* Name.Variable.Class */ .vg { color: #dd7700 } /* Name.Variable.Global */ @@ -65,7 +65,5 @@ } .shadow { - -webkit-box-shadow:0 5px 15px #000; - -moz-box-shadow:0 5px 15px #000; - box-shadow:0 5px 15px #000; + @include box-shadow(0 5px 15px #000); } diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss index e66f6095c2c..bdbd59911d5 100644 --- a/app/assets/stylesheets/mixins.scss +++ b/app/assets/stylesheets/mixins.scss @@ -10,37 +10,36 @@ box-shadow: 0 0 0 3px #f1f1f1; } + +@mixin box-shadow($shadow) { + -webkit-box-shadow: $radius; + -moz-box-shadow: $radius; + -ms-box-shadow: $radius; + -o-box-shadow: $radius; + box-shadow: $radius; +} + @mixin border-radius($radius) { - -moz-border-radius: $radius; -webkit-border-radius: $radius; + -moz-border-radius: $radius; + -ms-border-radius: $radius; + -o-border-radius: $radius; border-radius: $radius; } @mixin round-borders-bottom($radius) { border-top: 1px solid #eaeaea; - -webkit-border-bottom-left-radius: $radius; - -webkit-border-bottom-right-radius: $radius; - -moz-border-radius-bottomright: $radius; - -moz-border-radius-bottomleft: $radius; - border-bottom-right-radius: $radius; - border-bottom-left-radius: $radius; + @include border-radius(0 0 $radius $radius); } @mixin round-borders-top($radius) { border-top: 1px solid #eaeaea; - -moz-border-radius-topright: $radius; - -moz-border-radius-topleft: $radius; - border-top-right-radius: $radius; - border-top-left-radius: $radius; - -webkit-border-top-left-radius: $radius; - -webkit-border-top-right-radius: $radius; + @include border-radius($radius $radius 0 0); } @mixin round-borders-all($radius) { border: 1px solid #eaeaea; - -moz-border-radius: $radius; - -webkit-border-radius: $radius; - border-radius: $radius; + @include border-radius($radius); } @mixin bg-gradient($from, $to) { @@ -51,7 +50,7 @@ } @mixin bg-light-gray-gradient { - background:#f1f1f1; + background: #f1f1f1; background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1)); background-image: -webkit-linear-gradient(#f5f5f5 6.6%, #e1e1e1); background-image: -moz-linear-gradient(#f5f5f5 6.6%, #e1e1e1); @@ -59,7 +58,7 @@ } @mixin bg-gray-gradient { - background:#eee; + background: #eee; background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf)); background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf); background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf); @@ -67,7 +66,7 @@ } @mixin bg-dark-gray-gradient { - background:#eee; + background: #eee; background-image: -webkit-linear-gradient(#e9e9e9, #d7d7d7); background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7); background-image: -o-linear-gradient(#e9e9e9, #d7d7d7); diff --git a/app/assets/stylesheets/ref_select.scss b/app/assets/stylesheets/ref_select.scss index 9bcd00906dc..284d1c324e5 100644 --- a/app/assets/stylesheets/ref_select.scss +++ b/app/assets/stylesheets/ref_select.scss @@ -33,17 +33,15 @@ .chzn-container { .chzn-search { input:focus { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; + @include box-shadow(none); } } .chzn-drop { - margin:7px 0; + margin: 7px 0; min-width: 200px; border: 1px solid #bbb; - border-radius: 0; + @include border-radius(0); .chzn-results { margin-top: 5px; @@ -55,7 +53,7 @@ padding: 8px; } .active-result { - border-radius: 0; + @include border-radius(0); &.highlighted { background: $hover; diff --git a/app/assets/stylesheets/sections/commits.scss b/app/assets/stylesheets/sections/commits.scss index ec8c8d1ec8c..5fe53ceb8bd 100644 --- a/app/assets/stylesheets/sections/commits.scss +++ b/app/assets/stylesheets/sections/commits.scss @@ -51,8 +51,8 @@ .committer a { font-size: 14px; line-height: 22px; - text-shadow:0 1px 1px #fff; - color:#777; + text-shadow: 0 1px 1px #fff; + color: #777; &:hover { color: #999; } @@ -70,15 +70,16 @@ * */ .diff_file { - border:1px solid #CCC; + border: 1px solid #CCC; margin-bottom: 1em; .diff_file_header { @extend .clearfix; padding: 5px 5px 5px 10px; color: #555; - border-bottom:1px solid #CCC; + border-bottom: 1px solid #CCC; background: #eee; + // TODO Replace with linear-gradient mixin background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf)); background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf); background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf); @@ -106,18 +107,18 @@ .diff_file_content { overflow: auto; overflow-y: hidden; - background:#fff; - color:#333; + background: #fff; + color: #333; font-size: 12px; font-family: $monospace; .old{ span.idiff{ - background-color:#FAA; + background-color: #FAA; } } .new{ span.idiff{ - background-color:#AFA; + background-color: #AFA; } } @@ -128,7 +129,7 @@ } } .diff_file_content_image { - background:#eee; + background: #eee; text-align: center; .image { display: inline-block; @@ -179,8 +180,8 @@ margin: 0px; padding: 0px; border: none; - background:#EEE; - color:#666; + background: #EEE; + color: #666; padding: 0px 5px; border-right: 1px solid #ccc; text-align: right; @@ -194,7 +195,7 @@ float: left; width: 35px; font-weight: normal; - color:#666; + color: #666; &:hover { text-decoration: underline; } @@ -213,8 +214,8 @@ background: #FDD; } &.matched { - color:#ccc; - background:#fafafa; + color: #ccc; + background: #fafafa; } } } @@ -246,7 +247,7 @@ } code { - background:#FCEEC1; + background: #FCEEC1; color: $style_color; } @@ -295,10 +296,10 @@ .label_commit { @include round-borders-all(4px); - padding:2px 4px; + padding: 2px 4px; border: none; font-size: 13px; background: #474D57; - color:#fff; + color: #fff; font-family: $monospace; } diff --git a/app/assets/stylesheets/sections/editor.scss b/app/assets/stylesheets/sections/editor.scss index 711dc0d8e43..a71e5438936 100644 --- a/app/assets/stylesheets/sections/editor.scss +++ b/app/assets/stylesheets/sections/editor.scss @@ -1,7 +1,7 @@ .file-editor { #editor{ border: none; - border-radius: 0; + @include border-radius(0); height: 500px; margin: 0; padding: 0; diff --git a/app/assets/stylesheets/sections/events.scss b/app/assets/stylesheets/sections/events.scss index 2b90829a931..28551d9a6ee 100644 --- a/app/assets/stylesheets/sections/events.scss +++ b/app/assets/stylesheets/sections/events.scss @@ -4,24 +4,24 @@ */ .event_label { &.pushed { - padding:0 2px; + padding: 0 2px; } &.opened { - padding:0 2px; + padding: 0 2px; } &.closed { - padding:0 2px; + padding: 0 2px; } &.merged { - padding:0 2px; + padding: 0 2px; } &.left, &.joined { - padding:0 2px; + padding: 0 2px; float: none; } } @@ -32,21 +32,21 @@ */ .event-item { min-height: 40px; - border-bottom:1px solid #eee; + border-bottom: 1px solid #eee; .event-title { - color:#333; + color: #333; font-weight: bold; .author_name { - color:#333; + color: #333; } } .event-body { p { - color:#555; + color: #555; padding-top: 5px; } .event-info { - color:#666; + color: #666; } } .avatar { @@ -98,12 +98,12 @@ * */ .event_lp { - color:#777; + color: #777; padding: 10px; min-height: 22px; border-left: 5px solid #5AB9C3; margin-bottom: 20px; - background:#f9f9f9; + background: #f9f9f9; .avatar { width: 24px; diff --git a/app/assets/stylesheets/sections/graph.scss b/app/assets/stylesheets/sections/graph.scss index b285527ce19..5800098ade4 100644 --- a/app/assets/stylesheets/sections/graph.scss +++ b/app/assets/stylesheets/sections/graph.scss @@ -4,7 +4,7 @@ h4 { - padding:0 10px; + padding: 0 10px; border-bottom: 1px solid #bbb; @include bg-gray-gradient; } diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss index 71f11c62f1d..2d5a5dc9b48 100644 --- a/app/assets/stylesheets/sections/header.scss +++ b/app/assets/stylesheets/sections/header.scss @@ -92,7 +92,7 @@ header { padding-left: 25px; font-size: 13px; @include border-radius(3px); - border:1px solid #c6c6c6; + border: 1px solid #c6c6c6; box-shadow: none; &:focus { @extend .span3; @@ -132,7 +132,7 @@ header { left: 0; bottom: 0; float: right; - border-radius: 5px; + @include border-radius(5px); border: 1px solid rgba(255, 255, 255, 0.1); border-bottom: 0; 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 { display: block; } } .account-links { - border-radius: 5px; + @include border-radius(5px); box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); position: relative; &:before { @@ -184,7 +184,7 @@ header { border-bottom: 1px solid #666; font-size: 12px; &:hover { - color:#fff; + color: #fff; background: #333; } } @@ -197,20 +197,13 @@ header { .account-links a { &:first-child { - -webkit-border-top-left-radius: 5px; - -webkit-border-top-right-radius: 5px; - -moz-border-radius-topleft: 5px; - -moz-border-radius-topright: 5px; - border-top-left-radius: 5px; - border-top-right-radius: 5px; } + @include border-radius(5px 5px 0 0); + } &:last-child { - -webkit-border-bottom-right-radius: 5px; - -webkit-border-bottom-left-radius: 5px; - -moz-border-radius-bottomright: 5px; - -moz-border-radius-bottomleft: 5px; - border-bottom-right-radius: 5px; - border-bottom-left-radius: 5px; - border-bottom: 0; } } + @include border-radius(0 0 5px 5px); + border-bottom: 0; + } + } @@ -248,13 +241,13 @@ header { a { h1 { background: url('logo_white.png') no-repeat 0px 2px; - color:#fff; + color: #fff; text-shadow: 0 1px 1px #111; } } } .project_name { - color:#fff; + color: #fff; text-shadow: 0 1px 1px #111; } } diff --git a/app/assets/stylesheets/sections/issues.scss b/app/assets/stylesheets/sections/issues.scss index e4aa30179db..60b3e32afab 100644 --- a/app/assets/stylesheets/sections/issues.scss +++ b/app/assets/stylesheets/sections/issues.scss @@ -28,7 +28,7 @@ .issues_table { .issue { - padding:7px 10px; + padding: 7px 10px; .issue_check { float: left; @@ -141,6 +141,6 @@ input.check_all_issues { .ui-datepicker-header { @include solid_shade; margin-bottom: 10px; - border:1px solid #bbb; + border: 1px solid #bbb; } } diff --git a/app/assets/stylesheets/sections/login.scss b/app/assets/stylesheets/sections/login.scss index aea57c81948..8c21de70013 100644 --- a/app/assets/stylesheets/sections/login.scss +++ b/app/assets/stylesheets/sections/login.scss @@ -1,13 +1,13 @@ /* Login Page */ body.login-page{ padding-top: 10%; - background:#f1f1f1; + background: #f1f1f1; } .login-box{ width: 304px; position: relative; - border-radius: 5px; + @include border-radius(5px); margin: auto; padding: 20px; background: white; @@ -18,25 +18,15 @@ body.login-page{ display: block; } -.login-box input.text{background-color: #f1f1f1; font-size: 16px; border-radius: 0; padding: 14px 10px; width: 280px} +.login-box input.text{background-color: #f1f1f1; font-size: 16px; @include border-radius(0); padding: 14px 10px; width: 280px} .login-box input.text.top{ - -webkit-border-top-left-radius: 5px; - -webkit-border-top-right-radius: 5px; - -moz-border-radius-topleft: 5px; - -moz-border-radius-topright: 5px; - border-top-left-radius: 5px; - border-top-right-radius: 5px; + @include border-radius(5px 5px 0 0); margin-bottom: 0px; } .login-box input.text.bottom{ - -webkit-border-bottom-right-radius: 5px; - -webkit-border-bottom-left-radius: 5px; - -moz-border-radius-bottomright: 5px; - -moz-border-radius-bottomleft: 5px; - border-bottom-right-radius: 5px; - border-bottom-left-radius: 5px; + @include border-radius(0 0 5px 5px); border-top: 0; margin-bottom: 20px; } diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss index f6816c7dd7d..270658315bb 100644 --- a/app/assets/stylesheets/sections/merge_requests.scss +++ b/app/assets/stylesheets/sections/merge_requests.scss @@ -8,7 +8,7 @@ margin-bottom: 20px; .body { - background:#f1f1f1; + background: #f1f1f1; } } @@ -34,7 +34,6 @@ border: 1px solid #ADA; padding: 2px; @include border-radius(5px); - border-radius: 5px; background: #CEB; .accept_merge_request { @@ -47,7 +46,7 @@ float: left; } label { - color:#444; + color: #444; } } @@ -61,14 +60,14 @@ li { a { font-weight: bold; - padding:8px 20px; + padding: 8px 20px; text-align: center; } } } li.merge_request { - padding:7px 10px; + padding: 7px 10px; img.avatar { width: 32px; margin-top: 1px; @@ -86,11 +85,11 @@ li.merge_request { .label_branch { @include round-borders-all(4px); - padding:2px 4px; + padding: 2px 4px; border: none; font-size: 14px; background: #474D57; - color:#fff; + color: #fff; font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace; } @@ -103,7 +102,7 @@ li.merge_request { margin-bottom: 5px; .avatar { position:relative } .row_title { - color:#444; + color: #444; } .commit-author-name, .dash, diff --git a/app/assets/stylesheets/sections/nav.scss b/app/assets/stylesheets/sections/nav.scss index 7c39661d077..595568fc059 100644 --- a/app/assets/stylesheets/sections/nav.scss +++ b/app/assets/stylesheets/sections/nav.scss @@ -3,7 +3,7 @@ * */ ul.main_menu { - border-radius: 4px; + @include border-radius(4px); margin: auto; margin: 30px 0; border: 1px solid #BBB; @@ -26,8 +26,7 @@ ul.main_menu { color: #777; background: #f2f2f2; border-top: 1px solid #CCC; - border-radius: 8px; - -moz-border-radius: 8px; + @include border-radius(8px); } .label { background: $hover; @@ -41,23 +40,18 @@ ul.main_menu { width: 1%; border-right: 1px solid #DDD; border-left: 1px solid #EEE; - border-bottom:2px solid #CFCFCF; + border-bottom: 2px solid #CFCFCF; &:first-child{ - -webkit-border-top-left-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - -moz-border-radius-topleft: 4px; - -moz-border-radius-bottomleft: 4px; - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; + @include border-radius(5px 0 0 5px); border-left: 0; } &.active { - background-color:#D5D5D5; + background-color: #D5D5D5; border-right: 1px solid #BBB; border-left: 1px solid #BBB; - border-radius: 0 0 1px 1px; + @include border-radius(0 0 1px 1px); &:first-child{ border-bottom: none; border-left: none; @@ -83,8 +77,8 @@ ul.main_menu { height: 35px; line-height: 36px; color: $style_color; - text-shadow:0 1px 1px white; - padding:0 10px; + text-shadow: 0 1px 1px white; + padding: 0 10px; } } /* diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss index 8083898080c..50b8bd40ba4 100644 --- a/app/assets/stylesheets/sections/notes.scss +++ b/app/assets/stylesheets/sections/notes.scss @@ -36,7 +36,7 @@ border: 1px solid #ddd; padding: 10px; min-height: 60px; - background:#f5f5f5; + background: #f5f5f5; } .note { @@ -94,15 +94,15 @@ p.notify_controls span{ } tr.line_notes_row { - border-bottom:1px solid #DDD; + border-bottom: 1px solid #DDD; border-left: 7px solid #2A79A3; &.reply { - background:#eee; + background: #eee; border-left: 7px solid #2A79A3; - border-top:1px solid #ddd; + border-top: 1px solid #ddd; td { - padding:7px 10px; + padding: 7px 10px; } a.line_note_reply_link { @include round-borders-all(4px); @@ -125,11 +125,11 @@ tr.line_notes_row { .line_notes_row, .per_line_form { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } .per_line_form { - background:#f5f5f5; - border-top:1px solid #eee; + background: #f5f5f5; + border-top: 1px solid #eee; form { margin: 0; } td { - border-bottom:1px solid #ddd; + border-bottom: 1px solid #ddd; } .note_actions { margin: 0; diff --git a/app/assets/stylesheets/sections/profile.scss b/app/assets/stylesheets/sections/profile.scss index 5a852eb52df..607daf7a97e 100644 --- a/app/assets/stylesheets/sections/profile.scss +++ b/app/assets/stylesheets/sections/profile.scss @@ -15,7 +15,7 @@ img { width: 60px; height: 60px; - background:#fff; + background: #fff; padding: 1px; border: 1px solid #ddd; } diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss index 9ed78a21aee..c592f87cc53 100644 --- a/app/assets/stylesheets/sections/projects.scss +++ b/app/assets/stylesheets/sections/projects.scss @@ -27,7 +27,7 @@ line-height: 18px; } .project_name { - color:#4fa2bd; + color: #4fa2bd; font-size: 14px; line-height: 18px; } @@ -41,7 +41,7 @@ display: block; span, strong { font-size: 12px; - color:#666; + color: #666; } } } @@ -63,10 +63,10 @@ padding: 8px; } label { - color:#888; + color: #888; } .btn { - padding:6px 10px; + padding: 6px 10px; margin-left: 10px; margin-bottom: 8px; } diff --git a/app/assets/stylesheets/sections/tree.scss b/app/assets/stylesheets/sections/tree.scss index 60873b37147..1dbc63611c5 100644 --- a/app/assets/stylesheets/sections/tree.scss +++ b/app/assets/stylesheets/sections/tree.scss @@ -18,8 +18,8 @@ &:hover { td { background: $hover; - border-top:1px solid #ADF; - border-bottom:1px solid #ADF; + border-top: 1px solid #ADF; + border-bottom: 1px solid #ADF; } cursor: pointer; } @@ -49,7 +49,7 @@ } td { line-height: 20px; - background:#fafafa; + background: #fafafa; } } @@ -86,7 +86,7 @@ .tree-btn-group { .btn { margin-right:-3px; - padding:2px 10px; + padding: 2px 10px; } } diff --git a/app/assets/stylesheets/themes/ui_mars.scss b/app/assets/stylesheets/themes/ui_mars.scss index f51cc897881..9e6433c5f9e 100644 --- a/app/assets/stylesheets/themes/ui_mars.scss +++ b/app/assets/stylesheets/themes/ui_mars.scss @@ -47,7 +47,7 @@ a { h1 { background: url('logo_white.png') no-repeat 0px 2px; - color:#eee; + color: #eee; text-shadow: 0 1px 1px #111; } } @@ -57,7 +57,7 @@ } .project_name { - color:#eee; + color: #eee; text-shadow: 0 1px 1px #111; } } From 238c214ac9041da65437862115fe772f2d0ea7f3 Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Sat, 24 Nov 2012 10:57:22 +0100 Subject: [PATCH 4/9] Forgot to rename var --- app/assets/stylesheets/mixins.scss | 22 ++++++++++++--------- app/assets/stylesheets/sections/header.scss | 9 ++++++--- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss index bdbd59911d5..3ee8d0f5b1d 100644 --- a/app/assets/stylesheets/mixins.scss +++ b/app/assets/stylesheets/mixins.scss @@ -12,11 +12,11 @@ @mixin box-shadow($shadow) { - -webkit-box-shadow: $radius; - -moz-box-shadow: $radius; - -ms-box-shadow: $radius; - -o-box-shadow: $radius; - box-shadow: $radius; + -webkit-box-shadow: $shadow; + -moz-box-shadow: $shadow; + -ms-box-shadow: $shadow; + -o-box-shadow: $shadow; + box-shadow: $shadow; } @mixin border-radius($radius) { @@ -27,6 +27,13 @@ border-radius: $radius; } +@mixin linear-gradient($from, $to) { + background-image: -webkit-gradient(linear, 0 0, 0 100%, from($from), to($to)); + background-image: -webkit-linear-gradient($from, $to); + background-image: -moz-linear-gradient($from, $to); + background-image: -o-linear-gradient($from, $to); +} + @mixin round-borders-bottom($radius) { border-top: 1px solid #eaeaea; @include border-radius(0 0 $radius $radius); @@ -43,10 +50,7 @@ } @mixin bg-gradient($from, $to) { - background-image: -webkit-gradient(linear, 0 0, 0 100%, from($from), to($to)); - background-image: -webkit-linear-gradient($from, $to); - background-image: -moz-linear-gradient($from, $to); - background-image: -o-linear-gradient($from, $to); + @include linear-gradient($from, $to); } @mixin bg-light-gray-gradient { diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss index 2d5a5dc9b48..4171c00ab8b 100644 --- a/app/assets/stylesheets/sections/header.scss +++ b/app/assets/stylesheets/sections/header.scss @@ -135,9 +135,12 @@ header { @include border-radius(5px); border: 1px solid rgba(255, 255, 255, 0.1); border-bottom: 0; - 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))); - 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)); - 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)); + 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))); + 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)); + 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)); -webkit-background-origin: border-box; -moz-background-origin: border; background-origin: border-box; } } } From 81175073a0604633bfec08b95c1ed19d054b48b5 Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Sun, 25 Nov 2012 18:30:18 +0100 Subject: [PATCH 5/9] removed overqualified mixins round-borders-* --- .../stylesheets/gitlab_bootstrap/blocks.scss | 14 +++++++++----- app/assets/stylesheets/mixins.scss | 15 --------------- app/assets/stylesheets/sections/commits.scss | 3 +-- .../stylesheets/sections/merge_requests.scss | 2 +- app/assets/stylesheets/sections/notes.scss | 3 ++- 5 files changed, 13 insertions(+), 24 deletions(-) diff --git a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss index db149ee7069..251b11e9f87 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss @@ -61,7 +61,10 @@ .ui-box { background: #F9F9F9; margin-bottom: 25px; - @include round-borders-all(4px); + + border: 1px solid #eaeaea; + @include border-radius(4px); + border-color: #CCC; @include solid_shade; @@ -75,8 +78,9 @@ h5, .title { padding: 0 10px; - @include round-borders-top(4px); + @include border-radius(4px 4px 0 0); @include bg-gray-gradient; + border-top: 1px solid #eaeaea; border-bottom: 1px solid #bbb; &.small { @@ -104,7 +108,7 @@ .bottom { @include bg-gray-gradient; - @include round-borders-bottom(4px); + @include border-radius(0 0 4px 4px); border-bottom: none; border-top: 1px solid #bbb; } @@ -137,12 +141,12 @@ li, .wll { padding: 10px; &:first-child { - @include round-borders-top(4px); + @include border-radius(4px 4px 0 0); border-top: none; } &:last-child { - @include round-borders-bottom(4px); + @include border-radius(0 0 4px 4px); border: none; } } diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss index 3ee8d0f5b1d..c704de064f3 100644 --- a/app/assets/stylesheets/mixins.scss +++ b/app/assets/stylesheets/mixins.scss @@ -34,21 +34,6 @@ background-image: -o-linear-gradient($from, $to); } -@mixin round-borders-bottom($radius) { - border-top: 1px solid #eaeaea; - @include border-radius(0 0 $radius $radius); -} - -@mixin round-borders-top($radius) { - border-top: 1px solid #eaeaea; - @include border-radius($radius $radius 0 0); -} - -@mixin round-borders-all($radius) { - border: 1px solid #eaeaea; - @include border-radius($radius); -} - @mixin bg-gradient($from, $to) { @include linear-gradient($from, $to); } diff --git a/app/assets/stylesheets/sections/commits.scss b/app/assets/stylesheets/sections/commits.scss index 5fe53ceb8bd..bf405bfcd51 100644 --- a/app/assets/stylesheets/sections/commits.scss +++ b/app/assets/stylesheets/sections/commits.scss @@ -295,9 +295,8 @@ } .label_commit { - @include round-borders-all(4px); + @include border-radius(4px); padding: 2px 4px; - border: none; font-size: 13px; background: #474D57; color: #fff; diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss index 270658315bb..a5ec1756e5f 100644 --- a/app/assets/stylesheets/sections/merge_requests.scss +++ b/app/assets/stylesheets/sections/merge_requests.scss @@ -84,7 +84,7 @@ li.merge_request { } .label_branch { - @include round-borders-all(4px); + @include border-radius(4px); padding: 2px 4px; border: none; font-size: 14px; diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss index 50b8bd40ba4..0c2a56d62f5 100644 --- a/app/assets/stylesheets/sections/notes.scss +++ b/app/assets/stylesheets/sections/notes.scss @@ -105,7 +105,8 @@ tr.line_notes_row { padding: 7px 10px; } a.line_note_reply_link { - @include round-borders-all(4px); + border: 1px solid #eaeaea; + @include border-radius(4px); padding: 3px 10px; margin-left: 5px; color: white; From df0bd0c212a76ed6ce4e0e90b8101a9a164c34fa Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Sun, 25 Nov 2012 19:25:33 +0100 Subject: [PATCH 6/9] Removed bg-gradient, now directly using linear-gradient --- app/assets/stylesheets/common.scss | 4 ++-- app/assets/stylesheets/gitlab_bootstrap/buttons.scss | 4 ++-- app/assets/stylesheets/mixins.scss | 4 ---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index c2194297009..4b7af54e4c4 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -374,12 +374,12 @@ p.time { height: 100%; } .bar-success { + @include linear-gradient(#62C462, #51A351); background-color: #468847; - @include bg-gradient(#62C462, #51A351); } .bar-danger { + @include linear-gradient(#EE5F5B, #BD362F); background-color: #B94A48; - @include bg-gradient(#EE5F5B, #BD362F); } } .upvotes { diff --git a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss index a8d9e5c0929..bb2cfbb954d 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss @@ -1,5 +1,5 @@ .btn { - @include bg-gradient(#f7f7f7, #d5d5d5); + @include linear-gradient(#f7f7f7, #d5d5d5); border-color: #aaa; &:hover { @include bg-gray-gradient; @@ -9,7 +9,7 @@ &.primary { background: #2a79A3; - @include bg-gradient(#47A7b7, #2585b5); + @include linear-gradient(#47A7b7, #2585b5); border-color: #2A79A3; color: #fff; text-shadow: 0 1px 1px #268; diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss index c704de064f3..11a8535d257 100644 --- a/app/assets/stylesheets/mixins.scss +++ b/app/assets/stylesheets/mixins.scss @@ -34,10 +34,6 @@ background-image: -o-linear-gradient($from, $to); } -@mixin bg-gradient($from, $to) { - @include linear-gradient($from, $to); -} - @mixin bg-light-gray-gradient { background: #f1f1f1; background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1)); From d7e9eda24d26dfe5782e503f3e3d7d523000ce05 Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Sun, 25 Nov 2012 20:03:14 +0100 Subject: [PATCH 7/9] renamed blue_link var to primary_color --- app/assets/stylesheets/common.scss | 2 +- app/assets/stylesheets/gitlab_bootstrap/buttons.scss | 6 +++--- app/assets/stylesheets/gitlab_bootstrap/typography.scss | 2 +- app/assets/stylesheets/sections/tree.scss | 2 +- app/assets/stylesheets/themes/ui_basic.scss | 2 +- app/assets/stylesheets/variables.scss | 5 ++--- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 4b7af54e4c4..3abc796ae6d 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -467,7 +467,7 @@ p.time { padding: 10px; } .current { - border-bottom:2px solid $style_color; + border-bottom: 2px solid $style_color; } } diff --git a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss index bb2cfbb954d..883a8773962 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss @@ -14,7 +14,7 @@ color: #fff; text-shadow: 0 1px 1px #268; &:hover { - background: $blue_link; + background: $primary_color; color: #fff; } @@ -26,11 +26,11 @@ &.btn-info { background: #5aB9C3; - border-color: $blue_link; + border-color: $primary_color; color: #fff; text-shadow: 0 1px 1px #268; &:hover { - background: $blue_link; + background: $primary_color; color: #fff; } diff --git a/app/assets/stylesheets/gitlab_bootstrap/typography.scss b/app/assets/stylesheets/gitlab_bootstrap/typography.scss index 926c5bc82b4..81fb79a43f2 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/typography.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/typography.scss @@ -38,7 +38,7 @@ a { color: $link_color; &:hover { text-decoration: none; - color: $blue_link; + color: $primary_color; } &.btn { diff --git a/app/assets/stylesheets/sections/tree.scss b/app/assets/stylesheets/sections/tree.scss index 1dbc63611c5..b0d795f4d5a 100644 --- a/app/assets/stylesheets/sections/tree.scss +++ b/app/assets/stylesheets/sections/tree.scss @@ -31,7 +31,7 @@ vertical-align: middle; a { &:hover { - color: $blue_link; + color: $primary_color; } } diff --git a/app/assets/stylesheets/themes/ui_basic.scss b/app/assets/stylesheets/themes/ui_basic.scss index 3a85b6e9bf6..fee179899ce 100644 --- a/app/assets/stylesheets/themes/ui_basic.scss +++ b/app/assets/stylesheets/themes/ui_basic.scss @@ -12,7 +12,7 @@ color: $link_color; &:hover { text-decoration: none; - color: $blue_link; + color: $primary_color; } } diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/variables.scss index 8e5394c84a0..ba78c8351f4 100644 --- a/app/assets/stylesheets/variables.scss +++ b/app/assets/stylesheets/variables.scss @@ -1,6 +1,5 @@ /** Colors **/ +$primary_color: #2FA0BB; $link_color: #3A89A3; -$blue_link: #2FA0BB; $style_color: #474D57; -$hover: #D9EDF7; -$hover_border: #ADF; +$hover: #D9EDF7; \ No newline at end of file From 0f31392712eb17ea95a63f9285359ac11f880855 Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Wed, 28 Nov 2012 00:30:26 +0100 Subject: [PATCH 8/9] Mixins are now all with dashes instead of underscores (there really should be some convention for all gitlab css) --- .../stylesheets/gitlab_bootstrap/blocks.scss | 4 +-- .../stylesheets/gitlab_bootstrap/files.scss | 2 +- .../stylesheets/gitlab_bootstrap/tables.scss | 2 +- app/assets/stylesheets/mixins.scss | 30 ++++++++++--------- app/assets/stylesheets/sections/issues.scss | 2 +- 5 files changed, 21 insertions(+), 19 deletions(-) diff --git a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss index 251b11e9f87..ecd6cf7e4e8 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss @@ -16,7 +16,7 @@ @extend .prepend-top-20; @extend .append-bottom-20; border-width: 1px; - @include solid_shade; + @include solid-shade; img { max-width: 100%; } @@ -66,7 +66,7 @@ @include border-radius(4px); border-color: #CCC; - @include solid_shade; + @include solid-shade; &.white { background: #fff; diff --git a/app/assets/stylesheets/gitlab_bootstrap/files.scss b/app/assets/stylesheets/gitlab_bootstrap/files.scss index b392d640c7f..e4924a49456 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/files.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/files.scss @@ -5,7 +5,7 @@ .file_holder { border: 1px solid #BBB; margin-bottom: 1em; - @include solid_shade; + @include solid-shade; .file_title { border-bottom: 1px solid #bbb; diff --git a/app/assets/stylesheets/gitlab_bootstrap/tables.scss b/app/assets/stylesheets/gitlab_bootstrap/tables.scss index e132209901f..5905efd3aae 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/tables.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/tables.scss @@ -1,7 +1,7 @@ table { @extend .table; @extend .table-striped; - @include solid_shade; + @include solid-shade; border: 1px solid #bbb; width: 100%; diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss index 11a8535d257..441a85f3410 100644 --- a/app/assets/stylesheets/mixins.scss +++ b/app/assets/stylesheets/mixins.scss @@ -1,17 +1,7 @@ -@mixin shade { - -moz-box-shadow: 0 0 3px #ddd; - -webkit-box-shadow: 0 0 3px #ddd; - box-shadow: 0 0 3px #ddd; -} - -@mixin solid_shade { - -moz-box-shadow: 0 0 0 3px #f1f1f1; - -webkit-box-shadow: 0 0 0 3px #f1f1f1; - box-shadow: 0 0 0 3px #f1f1f1; -} - - -@mixin box-shadow($shadow) { +/** + * Generic mixins + */ + @mixin box-shadow($shadow) { -webkit-box-shadow: $shadow; -moz-box-shadow: $shadow; -ms-box-shadow: $shadow; @@ -34,6 +24,10 @@ background-image: -o-linear-gradient($from, $to); } +/** + * Prefilled mixins + * Mixins with fixed values + */ @mixin bg-light-gray-gradient { background: #f1f1f1; background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1)); @@ -56,3 +50,11 @@ background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7); background-image: -o-linear-gradient(#e9e9e9, #d7d7d7); } + +@mixin shade { + @include box-shadow(0 0 3px #ddd); +} + +@mixin solid-shade { + @include box-shadow(0 0 0 3px #f1f1f1); +} \ No newline at end of file diff --git a/app/assets/stylesheets/sections/issues.scss b/app/assets/stylesheets/sections/issues.scss index 60b3e32afab..ca1aab44916 100644 --- a/app/assets/stylesheets/sections/issues.scss +++ b/app/assets/stylesheets/sections/issues.scss @@ -139,7 +139,7 @@ input.check_all_issues { border: none; box-shadow: none; .ui-datepicker-header { - @include solid_shade; + @include solid-shade; margin-bottom: 10px; border: 1px solid #bbb; } From 1481bae55913593145cd594c451cd60194e93d0a Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Thu, 29 Nov 2012 15:37:28 +0100 Subject: [PATCH 9/9] Selective responsive bootstrap --- app/assets/stylesheets/main.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index e707de02201..bc7a74406ef 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -3,9 +3,11 @@ $baseFontSize: 13px !default; $baseLineHeight: 18px !default; // BOOTSTRAP -// ------------------ @import "bootstrap"; -@import "bootstrap-responsive"; +@import "bootstrap/responsive-utilities"; +@import "bootstrap/responsive-1200px-min"; + +// FONT AWESOME @import "font-awesome"; /**