Automatic merge of gitlab-org/gitlab-ce master

4a6d48e1 · GitLab Bot · 4fbac195 · 84a39659 · 4a6d48e1 · 4a6d48e1
Commit 4a6d48e1 authored May 30, 2019 by GitLab Bot
Showing with 11 additions and 0 deletions

app/assets/stylesheets/framework/forms.scss app/assets/stylesheets/framework/forms.scss +6 -0

changelogs/unreleased/62485-label-weights.yml changelogs/unreleased/62485-label-weights.yml +5 -0

No files found.
--- a/app/assets/stylesheets/framework/forms.scss
+++ b/app/assets/stylesheets/framework/forms.scss
@@ -27,10 +27,16 @@ input[type='text'].danger {
 }

 label {
+  font-weight: $gl-font-weight-bold;
+
  &.inline-label {
    margin: 0;
  }

+  &.form-check-label {
+    font-weight: $gl-font-weight-normal;
+  }
+
  &.label-bold {
    font-weight: $gl-font-weight-bold;
  }

--- a/changelogs/unreleased/62485-label-weights.yml
+++ b/changelogs/unreleased/62485-label-weights.yml
+---
+title: Give labels consistent weight
+merge_request: 28895
+author:
+type: fixed