diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-05-15 03:46:48 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-05-15 03:46:48 +0000 |
| commit | 6bf5af2acd5e046d4235dee6473c214e91d86379 (patch) | |
| tree | f74c822a87217c1c0353b516dd20fa9cfc4e9314 | |
| parent | 36e15a866df5ca70e9c8209925acad412f2c6538 (diff) | |
| parent | b998e9b088c37366d39d147d6d36145f143e295b (diff) | |
| download | gitlab-ce-6bf5af2acd5e046d4235dee6473c214e91d86379.tar.gz | |
Merge branch 'next-badge-link' into 'master'
Add link to next badge
Closes #61503
See merge request gitlab-org/gitlab-ce!28162
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 16 | ||||
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 5 |
2 files changed, 19 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index a57cd6737f8..1bc597bd4ae 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -472,6 +472,22 @@ background-color: $blue-500; } } + + .canary-badge { + .badge { + font-size: $gl-font-size-small; + line-height: $gl-line-height; + padding: 0 $grid-size; + } + + &:hover { + text-decoration: none; + + .badge { + text-decoration: none; + } + } + } } @include media-breakpoint-down(xs) { diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 724c9976954..1c1d1ea4645 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -18,8 +18,9 @@ %span.logo-text.d-none.d-lg-block.prepend-left-8 = logo_text - if Gitlab.com? - %span.js-canary-badge.badge.badge-pill.green-badge.align-self-center - = _('Next') + = link_to 'https://next.gitlab.com', class: 'label-link js-canary-badge canary-badge bg-transparent', target: :_blank do + %span.color-label.has-tooltip.badge.badge-pill.green-badge + = _('Next') - if current_user = render "layouts/nav/dashboard" |