root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2021-04-26 06:09:44 +00:00
parent 926428e5ab
commit 6819cb95c9
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/stylesheets/components/whats_new.scss
View File

@ -59,13 +59,3 @@
.whats-new-modal-backdrop { .whats-new-modal-backdrop {
z-index: 699; z-index: 699;
} }
.whats-new-notification-count {
@include gl-bg-gray-900;
@include gl-font-sm;
@include gl-line-height-normal;
@include gl-text-white;
@include gl-vertical-align-top;
border-radius: 20px;
padding: 3px 10px;
}

2
app/views/layouts/header/_whats_new_dropdown_item.html.haml
View File

@ -2,5 +2,5 @@
%li %li
%button.gl-justify-content-space-between.gl-align-items-center.js-whats-new-trigger{ type: 'button', class: 'gl-display-flex!' } %button.gl-justify-content-space-between.gl-align-items-center.js-whats-new-trigger{ type: 'button', class: 'gl-display-flex!' }
= _("What's new") = _("What's new")
%span.js-whats-new-notification-count.whats-new-notification-count %span.js-whats-new-notification-count.gl-badge.badge.sm.badge-dark.badge-pill
= whats_new_most_recent_release_items_count = whats_new_most_recent_release_items_count

5
changelogs/unreleased/whats-new-notification-count-badge.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Switch to gl-badge in whats new dropdown
merge_request: 58235
author: Yogi (@yo)
type: changed