diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2018-06-11 23:36:45 +0300 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2018-06-11 23:36:45 +0300 |
commit | e5fb14806e2429a94f4486d43c2480e34a6bbd0d (patch) | |
tree | 555ead34e0537cbd44d1e9189dbf52595e360309 | |
parent | 35c73ef9cd1541d167cb9a6cd928f5d22a4b6ad0 (diff) | |
parent | a7fa60083c11ea838d49d77a2b53b77756b67d82 (diff) |
Merge branch '47338-sign-in-btn' into 'master'
Fix alignment of sign in/sign up button
Closes #47338
See merge request gitlab-org/gitlab-ce!19587
-rw-r--r-- | app/assets/stylesheets/framework/common.scss | 8 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/header.scss | 6 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/search.scss | 2 | ||||
-rw-r--r-- | app/views/layouts/header/_default.html.haml | 2 |
4 files changed, 7 insertions, 11 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index 996e5c1512d..e5197e27b82 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -305,14 +305,6 @@ img.emoji { margin-bottom: 10px; } -.btn-sign-in { - text-shadow: none; - - @include media-breakpoint-up(sm) { - margin-top: 8px; - } -} - .side-filters { fieldset { margin-bottom: 15px; diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 6fbc624dee4..1d5bdaa8961 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -447,12 +447,16 @@ .btn-sign-in { background-color: $indigo-100; color: $indigo-900; - margin-top: 3px; font-weight: $gl-font-weight-bold; + line-height: 18px; &:hover { background-color: $white-light; } + + @include media-breakpoint-down(xs) { + margin-top: $gl-padding-4; + } } .navbar-nav { diff --git a/app/assets/stylesheets/pages/search.scss b/app/assets/stylesheets/pages/search.scss index 5f15795a8e3..765c926751a 100644 --- a/app/assets/stylesheets/pages/search.scss +++ b/app/assets/stylesheets/pages/search.scss @@ -29,7 +29,7 @@ input[type="checkbox"]:hover { } .search { - margin: 4px 8px 0; + margin: 0 8px; form { @extend .form-control; diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 1bca837a311..5cec443e969 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -61,7 +61,7 @@ - if header_link?(:sign_in) %li.nav-item %div - = link_to "Sign in / Register", new_session_path(:user, redirect_to_referer: 'yes'), class: 'nav-link btn btn-sign-in' + = link_to "Sign in / Register", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in' %button.navbar-toggler.d-block.d-sm-none{ type: 'button' } %span.sr-only Toggle navigation |