diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-22 20:33:07 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-22 20:33:07 +0000 |
| commit | 5a349efcab3d9dac3df50018e4062e09d000eaf2 (patch) | |
| tree | 95757fa42f47ed1ecac16f59b3f08a94da3ebf5c | |
| parent | 16f05230a6daa569ff33c36b9e0850ad7a17e4d2 (diff) | |
| parent | b4f97b93a926d4c71d0536675a0af19c37af2e30 (diff) | |
| download | gitlab-ce-5a349efcab3d9dac3df50018e4062e09d000eaf2.tar.gz | |
Merge branch 'header-mobile-overflow' into 'master'
Fixes issue with signin button overflowing on mobile
Closes #14477
See merge request !3342
| -rw-r--r-- | app/assets/stylesheets/framework/common.scss | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 5 | ||||
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 7 |
3 files changed, 13 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index 7285ccec797..8625817fdab 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -292,8 +292,11 @@ table { } .btn-sign-in { - margin-top: 10px; text-shadow: none; + + @media (min-width: $screen-sm-min) { + margin-top: 11px; + } } .side-filters { diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 71a7ecab8ef..6a68bb5c115 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -70,6 +70,11 @@ header { .header-content { height: $header-height; + padding-right: 20px; + + @media (min-width: $screen-sm-min) { + padding-right: 0; + } .title { margin: 0; diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index bfa5937cf3f..0f3b8119379 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -6,7 +6,7 @@ = icon('bars') .navbar-collapse.collapse - %ul.nav.navbar-nav.pull-right + %ul.nav.navbar-nav %li.hidden-sm.hidden-xs = render 'layouts/search' %li.visible-sm.visible-xs @@ -38,8 +38,9 @@ = link_to destroy_user_session_path, class: 'logout', method: :delete, title: 'Sign out', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do = icon('sign-out') - else - .pull-right - = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in btn-success' + %li + %div + = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in btn-success' %h1.title= title |