diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-06-11 20:36:45 +0000 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2018-06-12 11:37:45 +0200 |
| commit | 99acf6d33deb0059a5f366dd4628cd32968033a1 (patch) | |
| tree | 5f1b46a0e0c8440c5d17a045c0b020e12e3bf19d | |
| parent | 9a0ccbf7475f667141fde6719a061924880e162f (diff) | |
| download | gitlab-ce-99acf6d33deb0059a5f366dd4628cd32968033a1.tar.gz | |
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 |