diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-04-18 19:04:01 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-04-25 16:36:56 +0100 |
| commit | d275336b0b68f8b3c4e65cf754d5062d18ad9da4 (patch) | |
| tree | 3768eeef168c4646a6473ed05f3a1603d45398fc /app/assets/stylesheets/framework | |
| parent | e7c494cc08de77a8898a561016bd38abc903a5d8 (diff) | |
| download | gitlab-ce-d275336b0b68f8b3c4e65cf754d5062d18ad9da4.tar.gz | |
Adds information about Canary env46048-canary-next
This commit adds a badge to the navbar
that indicates if Canary is being used
When canary is not being used, it renders a link
to next.gitlab.com
Diffstat (limited to 'app/assets/stylesheets/framework')
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 1e025b3a67d..a6179e2a96e 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -447,30 +447,29 @@ } } +.title-container, .navbar-nav { - li { - .badge.badge-pill { - position: inherit; - font-weight: $gl-font-weight-normal; - margin-left: -6px; - font-size: 11px; - color: $white-light; - padding: 0 5px; - line-height: 12px; - border-radius: 7px; - box-shadow: 0 1px 0 rgba($gl-header-color, 0.2); - - &.issues-count { - background-color: $green-500; - } + .badge.badge-pill { + position: inherit; + font-weight: $gl-font-weight-normal; + margin-left: -6px; + font-size: 11px; + color: $white-light; + padding: 0 5px; + line-height: 12px; + border-radius: 7px; + box-shadow: 0 1px 0 rgba($gl-header-color, 0.2); + + &.green-badge { + background-color: $green-500; + } - &.merge-requests-count { - background-color: $orange-600; - } + &.merge-requests-count { + background-color: $orange-600; + } - &.todos-count { - background-color: $blue-500; - } + &.todos-count { + background-color: $blue-500; } } } |