diff options
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; } } |