Download as
Browse Code »

Commit 2ecf83191d4ae7a158d70f8cfa11ec9f2744b0ce

Authored by Dmitriy Zaporozhets
1 parent 6cbadc95
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Fix header 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 3 changed files with 16 additions and 15 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap/lists.scss
  Diff comments   View file @2ecf831
@@ -4,7 +4,9 @@ @@ -4,7 +4,9 @@
4 */ 4 */
5 .well-list { 5 .well-list {
6 margin: 0; 6 margin: 0;
  7 + padding: 0;
7 list-style: none; 8 list-style: none;
  9 +
8 li { 10 li {
9 padding: 10px; 11 padding: 10px;
10 min-height: 20px; 12 min-height: 20px;
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
  Diff comments   View file @2ecf831
@@ -79,7 +79,7 @@ @@ -79,7 +79,7 @@
79 color: $style_color; 79 color: $style_color;
80 text-shadow: 0 1px 1px #FFF; 80 text-shadow: 0 1px 1px #FFF;
81 font-size: 16px; 81 font-size: 16px;
82 - line-height: 40px; 82 + line-height: 44px;
83 font-weight: normal; 83 font-weight: normal;
84 } 84 }
85 85
app/assets/stylesheets/sections/header.scss
  Diff comments   View file @2ecf831
@@ -5,20 +5,23 @@ @@ -5,20 +5,23 @@
5 header { 5 header {
6 &.navbar-gitlab { 6 &.navbar-gitlab {
7 margin-bottom: 0; 7 margin-bottom: 0;
8 - height: 40px;  
9 - overflow: hidden; 8 + min-height: 40px;
10 9
11 .navbar-inner { 10 .navbar-inner {
12 - /*height: 40px;*/  
13 - padding: 3px;  
14 background: #F1F1F1; 11 background: #F1F1F1;
  12 + border-bottom: 1px solid #DDD;
15 filter: none; 13 filter: none;
16 14
17 .nav > li > a { 15 .nav > li > a {
18 color: $style_color; 16 color: $style_color;
19 text-shadow: 0 1px 0 #fff; 17 text-shadow: 0 1px 0 #fff;
20 font-size: 14px; 18 font-size: 14px;
21 - padding: 10px; 19 + line-height: 32px;
  20 + padding: 6px 10px;
  21 +
  22 + &:hover {
  23 + background: none;
  24 + }
22 } 25 }
23 26
24 /** NAV block with links and profile **/ 27 /** NAV block with links and profile **/
@@ -39,9 +42,6 @@ header { @@ -39,9 +42,6 @@ header {
39 .app_logo { 42 .app_logo {
40 float: left; 43 float: left;
41 margin-right: 9px; 44 margin-right: 9px;
42 - position: relative;  
43 - top: -3px;  
44 - padding-top: 3px;  
45 45
46 a { 46 a {
47 float: left; 47 float: left;
@@ -53,7 +53,7 @@ header { @@ -53,7 +53,7 @@ header {
53 background: url('logo-black.png') no-repeat center center; 53 background: url('logo-black.png') no-repeat center center;
54 background-size: 32px; 54 background-size: 32px;
55 float: left; 55 float: left;
56 - height: 40px; 56 + height: 46px;
57 width: 40px; 57 width: 40px;
58 @include header-font; 58 @include header-font;
59 text-indent: -9999px; 59 text-indent: -9999px;
@@ -79,7 +79,7 @@ header { @@ -79,7 +79,7 @@ header {
79 79
80 .profile-pic { 80 .profile-pic {
81 position: relative; 81 position: relative;
82 - top: -4px; 82 + top: -1px;
83 img { 83 img {
84 width: 26px; 84 width: 26px;
85 height: 26px; 85 height: 26px;
@@ -95,7 +95,7 @@ header { @@ -95,7 +95,7 @@ header {
95 .search { 95 .search {
96 margin-right: 10px; 96 margin-right: 10px;
97 margin-left: 10px; 97 margin-left: 10px;
98 - margin-top: 5px; 98 + margin-top: 8px;
99 99
100 form { 100 form {
101 margin: 0; 101 margin: 0;
@@ -115,7 +115,7 @@ header { @@ -115,7 +115,7 @@ header {
115 box-shadow: none; 115 box-shadow: none;
116 @include transition(all 0.15s ease-in 0s); 116 @include transition(all 0.15s ease-in 0s);
117 &:focus { 117 &:focus {
118 - @extend .col-md-4; 118 + width: 400px;
119 } 119 }
120 } 120 }
121 } 121 }
@@ -192,10 +192,9 @@ header { @@ -192,10 +192,9 @@ header {
192 .separator { 192 .separator {
193 float: left; 193 float: left;
194 height: 46px; 194 height: 46px;
195 - width: 1px; 195 + width: 2px;
196 background: white; 196 background: white;
197 border-left: 1px solid #DDD; 197 border-left: 1px solid #DDD;
198 - margin-top: -3px;  
199 margin-left: 10px; 198 margin-left: 10px;
200 margin-right: 10px; 199 margin-right: 10px;
201 } 200 }