diff options
| author | Marcel van Remmerden <mvanremmerden@gitlab.com> | 2019-05-07 04:19:05 +0000 |
|---|---|---|
| committer | Marcel van Remmerden <mvanremmerden@gitlab.com> | 2019-05-07 04:19:05 +0000 |
| commit | 0619e111a450722ea182a1373aa57604bedca2af (patch) | |
| tree | ebda951e206b7753de6e237d0220c6c07064c5fd | |
| parent | a0c4c12102d875320abc519de4683b6a6148c2f7 (diff) | |
| download | gitlab-ce-0619e111a450722ea182a1373aa57604bedca2af.tar.gz | |
Adapt code to style guidelines
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 14 | ||||
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index d7b56670140..12b5251291b 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -85,23 +85,23 @@ padding: 2px 8px; margin: 5px 2px 5px -8px; border-radius: $border-radius-default; - - &.js-canary-badge { - padding: 0; + + &.badge { font-size: 12px; border-radius: 100px; margin-top: 6px; - + &:hover, &:active, &:focus { background-color: $green-500; } - - span { + + .color-label { line-height: 15px; } - span:hover { + + .color-label:hover { text-decoration: none; } } diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index bcff69fc3cf..a0c375c2379 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -17,8 +17,8 @@ - if logo_text.present? %span.logo-text.d-none.d-lg-block.prepend-left-8 = logo_text - = link_to 'https://next.gitlab.com', class: 'label-link js-canary-badge badge badge-pill green-badge align-self-center', target: :_blank do - %span.badge.color-label.has-tooltip + = link_to 'https://next.gitlab.com', class: 'label-link js-canary-badge badge badge-pill green-badge align-self-center p-0', target: :_blank do + %span.color-label.has-tooltip = _('Next') - if current_user |