diff --git a/rhodecode/public/css/main.less b/rhodecode/public/css/main.less --- a/rhodecode/public/css/main.less +++ b/rhodecode/public/css/main.less @@ -237,7 +237,7 @@ input.inline[type="file"] { position: relative; vertical-align: bottom; padding: 0 @header-padding; - background-color: @grey2; + background-color: @grey1; color: @grey5; .title { diff --git a/rhodecode/public/css/navigation.less b/rhodecode/public/css/navigation.less --- a/rhodecode/public/css/navigation.less +++ b/rhodecode/public/css/navigation.less @@ -2,10 +2,21 @@ // For use in RhodeCode applications; // see style guide documentation for guidelines. +// TOP MAIN DARK NAVIGATION + +.header .main_nav.horizontal-list { + float: right; + color: @grey4; + > li { + a { + color: @grey4; + } + } +} + // HEADER NAVIGATION .horizontal-list { - float: right; display: block; margin: 0; padding: 0; @@ -18,6 +29,7 @@ li { line-height: 1em; list-style-type: none; + margin: 0 20px 0 0; a { padding: 0 .5em; @@ -80,10 +92,6 @@ } } - &.active { - border-bottom: 5px solid @rcblue; - } - &.open { a { @@ -118,14 +126,13 @@ > a, &.has_select2 a { display: block; - padding: 10px 0 2px; + padding: 10px 0; } .menulabel { - padding: 0 .5em; + padding: 0 0 0.4em 0; line-height: 1em; // for this specifically we do not use a variable - border-right: 1px solid @grey4; } .pr_notifications { @@ -141,7 +148,7 @@ &.open, &.active { a { - color: @grey1; + color: @rcblue; } } } @@ -503,8 +510,7 @@ display: block; margin: 0 auto; padding: 0 @header-padding; - background-color: @grey6; - border-bottom: @border-thickness solid @grey5; + background-color: @grey7; .clear { clear: both; @@ -513,19 +519,23 @@ ul#context-pages { li { - line-height: 1em; + line-height: 2em; list-style-type: none; a { color: @grey3; + + &:hover { + color: @grey2; + } } &.active { // special case, non-variable color - border-bottom: 4px solid @nav-grey; + border-bottom: 2px solid @rcblue; a { - color: @grey1; + color: @rcblue; } } } @@ -631,14 +641,11 @@ ul#context-pages { .main_filter_help_box { padding: 7px 7px; - border-top: 1px solid @grey4; - border-right: 1px solid @grey4; - border-bottom: 1px solid @grey4; display: inline-block; vertical-align: top; background: inherit; position: absolute; - right: 8px; + right: 0; top: 9px; } @@ -661,21 +668,24 @@ ul#context-pages { padding: 0 10px; } -.main_filter_input { - padding: 5px; - min-width: 260px; - color: @nav-grey; - background: @grey3; - min-height: 18px; - +input { - &:active { - color: @grey2 !important; - background: white !important; - } - &:focus { - color: @grey2 !important; - background: white !important; + &.main_filter_input { + padding: 5px 10px; + min-width: 260px; + color: @grey7; + background: @black; + min-height: 18px; + border: 0; + + &:active { + color: @grey2 !important; + background: white !important; + } + &:focus { + color: @grey2 !important; + background: white !important; + } } } diff --git a/rhodecode/public/css/type.less b/rhodecode/public/css/type.less --- a/rhodecode/public/css/type.less +++ b/rhodecode/public/css/type.less @@ -231,7 +231,7 @@ mark, clear: both; float: left; width: 100%; - margin: @pagepadding/2 0 @pagepadding; + margin: @pagepadding/2 0 @pagepadding/4; .breadcrumbs { float: left; diff --git a/rhodecode/public/css/variables.less b/rhodecode/public/css/variables.less --- a/rhodecode/public/css/variables.less +++ b/rhodecode/public/css/variables.less @@ -8,13 +8,15 @@ @rchighlightblue: lighten(@rcblue, 35%); // Secondary Colors (greyscale) -@grey1: #202020; //midnight -@grey2: #323232; //charcoal -@grey3: #666666; //tungsten -@grey4: #979797; //light grey +@black: #000; +@white: #fff; +@grey1: #2B2B2D; //midnight +@grey2: #5C5C5C; //charcoal +@grey3: #7E7F7F; //tungsten +@grey4: #949494; //light grey @grey5: #dbd9da; //greyish @grey6: #eeeeee; //silver -@grey7: #f9f9f9; //light silver +@grey7: #F5F5F5; //light silver // special for navigation @nav-grey: #CDCCCD; @@ -131,7 +133,7 @@ @button-padding: .9em; // DEFAULT WIDTHS -@wrapper-maxwidth: 1200px; +@wrapper-maxwidth: 1600px; @sidebar-width: 145px; @sidebar-all-width: @sidebar-width + 2 * @sidebarpadding; @sidebar-small-width: 100px; diff --git a/rhodecode/templates/changelog/changelog.mako b/rhodecode/templates/changelog/changelog.mako --- a/rhodecode/templates/changelog/changelog.mako +++ b/rhodecode/templates/changelog/changelog.mako @@ -30,7 +30,6 @@