Commit 9af2bc89 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'header_layout_issue' into 'master'

Fix layout issue in header title truncation.

@douwe Thanks for reviewing this fix for the issue mentioned in https://dev.gitlab.org/gitlab/gitlabhq/issues/2314#note_48539.

**BEFORE**

![before](https://dev.gitlab.org/gitlab/gitlabhq/uploads/4ffb35f77155a92c64cfe36c66987eb0/before.gif)

**AFTER**

![after](https://dev.gitlab.org/gitlab/gitlabhq/uploads/2bb2d0c4a93164f6d47e24cdcb9a106b/after.gif)

See merge request !1867
parents 63969337 d8209aeb
...@@ -98,16 +98,16 @@ header { ...@@ -98,16 +98,16 @@ header {
height: $header-height; height: $header-height;
.title { .title {
position: relative;
float: left;
margin: 0; margin: 0;
margin-left: 35px; padding: 0 15px 0 35px;
overflow: hidden;
font-size: 18px; font-size: 18px;
line-height: $header-height; line-height: $header-height;
font-weight: bold; font-weight: bold;
color: #444; color: #444;
text-overflow: ellipsis;
@include str-truncated(37%); vertical-align: top;
white-space: nowrap;
a { a {
color: #444; color: #444;
...@@ -116,6 +116,10 @@ header { ...@@ -116,6 +116,10 @@ header {
} }
} }
} }
.navbar-collapse {
float: right;
}
} }
.search { .search {
...@@ -167,10 +171,6 @@ header { ...@@ -167,10 +171,6 @@ header {
} }
@media (max-width: $screen-md-max) { @media (max-width: $screen-md-max) {
header .container .title {
max-width: 43%;
}
.header-collapsed, .header-expanded { .header-collapsed, .header-expanded {
@include collapsed-header; @include collapsed-header;
} }
...@@ -190,7 +190,6 @@ header { ...@@ -190,7 +190,6 @@ header {
font-size: 18px; font-size: 18px;
.title { .title {
max-width: 70%;
} }
.navbar-nav { .navbar-nav {
......
...@@ -61,8 +61,7 @@ ...@@ -61,8 +61,7 @@
} }
.container .title { .container .title {
margin-left: 15px !important; padding-left: 15px !important;
max-width: 70% !important;
} }
.issue-info, .merge-request-info { .issue-info, .merge-request-info {
......
...@@ -5,9 +5,6 @@ ...@@ -5,9 +5,6 @@
= brand_header_logo = brand_header_logo
%h3 GitLab %h3 GitLab
.header-content .header-content
%h1.title
= title
%button.navbar-toggle %button.navbar-toggle
%span.sr-only Toggle navigation %span.sr-only Toggle navigation
= icon('bars') = icon('bars')
...@@ -43,4 +40,6 @@ ...@@ -43,4 +40,6 @@
= link_to destroy_user_session_path, class: 'logout', method: :delete, title: 'Sign out', data: {toggle: 'tooltip', placement: 'bottom'} do = link_to destroy_user_session_path, class: 'logout', method: :delete, title: 'Sign out', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('sign-out') = icon('sign-out')
%h1.title= title
= render 'shared/outdated_browser' = render 'shared/outdated_browser'
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
= brand_header_logo = brand_header_logo
%h3 GitLab %h3 GitLab
.header-content .header-content
%h1.title= title
- unless current_controller?('sessions') - unless current_controller?('sessions')
.pull-right .pull-right
= link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in btn-success btn-sm' = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in btn-success btn-sm'
%h1.title= title
= render 'shared/outdated_browser' = render 'shared/outdated_browser'
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment