Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-09-02 01:05:33 +0300
committerFatih Acet <acetfatih@gmail.com>2016-09-02 01:05:33 +0300
commit2c3e1ae432f66738cfd73b56f2c657fb313dc7fb (patch)
treed781979a4d8b0cd4090d45f4c2b3688f3e19cef1
parent9921f25295152f5cccacf63a94606b0877348a18 (diff)
parent2560fc5adbc533d87e8ca56b471ed56bc84d95f9 (diff)
Merge branch 'remove-inconsistent-font-weight-sidebar-label' into 'master'
Remove inconsistent font weight for sidebar's labels ## What does this MR do? Removes the `.bold` css class from the sidebar label default value so that it is no longer bold :smile: **None** => None ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Fixes a UI inconsistency ## What are the relevant issue numbers? Closes #21141 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-24_at_9.41.11_AM](/uploads/3e416d45531b7322474922c569225c03/Screen_Shot_2016-08-24_at_9.41.11_AM.png) After: ![Screen_Shot_2016-08-24_at_9.40.57_AM](/uploads/a4d60d4cd0a57142ad6c0c8a25be5342/Screen_Shot_2016-08-24_at_9.40.57_AM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5984
-rw-r--r--CHANGELOG1
-rw-r--r--app/views/shared/issuable/_sidebar.html.haml2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index e87d96d52fc..9b8b9031773 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -40,6 +40,7 @@ v 8.12.0 (unreleased)
- Don't expose a user's token in the `/api/v3/user` API (!6047)
- Remove redundant js-timeago-pending from user activity log (ClemMakesApps)
- Ability to manage project issues, snippets, wiki, merge requests and builds access level
+ - Remove inconsistent font weight for sidebar's labels (ClemMakesApps)
- Added tests for diff notes
- Add a button to download latest successful artifacts for branches and tags !5142
- Remove redundant pipeline tooltips (ClemMakesApps)
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index c1b50e65af5..b13daaf43c9 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -118,7 +118,7 @@
= icon('spinner spin', class: 'block-loading')
- if can_edit_issuable
= link_to 'Edit', '#', class: 'edit-link pull-right'
- .value.bold.issuable-show-labels.hide-collapsed{ class: ("has-labels" if issuable.labels_array.any?) }
+ .value.issuable-show-labels.hide-collapsed{ class: ("has-labels" if issuable.labels_array.any?) }
- if issuable.labels_array.any?
- issuable.labels_array.each do |label|
= link_to_label(label, type: issuable.to_ability_name)