summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-01 17:10:04 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-01 17:10:04 +0200
commita74dfa6e74947a97f10b6c13bf77a135df29ad56 (patch)
tree59e8bedcf1a3b21289d765b252a38c88e6d52725 /app
parente7e07fab5d64db8b2881d7fa3477553807b0d3e1 (diff)
downloadgitlab-ce-a74dfa6e74947a97f10b6c13bf77a135df29ad56.tar.gz
Fix header overflow for big title
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/generic/common.scss2
-rw-r--r--app/assets/stylesheets/generic/header.scss27
2 files changed, 6 insertions, 23 deletions
diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss
index b69c5c4b574..1419a9cded9 100644
--- a/app/assets/stylesheets/generic/common.scss
+++ b/app/assets/stylesheets/generic/common.scss
@@ -307,7 +307,7 @@ table {
}
.btn-sign-in {
- margin-top: 5px;
+ margin-top: 7px;
text-shadow: none;
}
diff --git a/app/assets/stylesheets/generic/header.scss b/app/assets/stylesheets/generic/header.scss
index 3a227d11ee0..5e6102e14ab 100644
--- a/app/assets/stylesheets/generic/header.scss
+++ b/app/assets/stylesheets/generic/header.scss
@@ -97,7 +97,6 @@ header {
border-bottom: 1px solid #EEE;
padding-right: 35px;
height: $header-height;
- overflow: hidden;
.title {
position: relative;
@@ -131,6 +130,7 @@ header {
}
.search-input {
+ width: 220px;
background-image: image-url("icon-search.png");
background-repeat: no-repeat;
background-position: 10px;
@@ -151,10 +151,6 @@ header {
}
}
-.search .search-input {
- width: 300px;
-}
-
@mixin collapsed-header {
.header-logo {
width: $sidebar_collapsed_width;
@@ -171,19 +167,11 @@ header {
}
}
-@media (max-width: 1200px) {
- .search .search-input {
- width: 200px;
- }
-}
-
-@media (max-width: $screen-xs-max) {
- #nprogress .spinner {
- right: 35px !important;
+@media (max-width: $screen-md-max) {
+ header .container .title {
+ max-width: 43%;
}
-}
-@media (max-width: $screen-md-max) {
.header-collapsed, .header-expanded {
@include collapsed-header;
}
@@ -200,15 +188,10 @@ header {
@media (max-width: $screen-xs-max) {
header .container {
- border-width: 0;
font-size: 18px;
.title {
- @include str-truncated(70%);
- }
-
- .navbar-collapse {
- margin-top: 47px;
+ max-width: 70%;
}
.navbar-nav {