summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-12-09 18:13:04 +0000
committerFatih Acet <acetfatih@gmail.com>2016-12-09 18:13:04 +0000
commite837df80fbd296a3927644fc4e0521c99d2ea02c (patch)
tree1a4f00751596a833aa66737dc7386732998b5d90
parent5bb43bb9531422545f974df8a6cf5616b7631f51 (diff)
parent4f264c793046307f67b2b3a365cb2a41f1fc0eda (diff)
downloadgitlab-ce-e837df80fbd296a3927644fc4e0521c99d2ea02c.tar.gz
Merge branch 'update-button-font-weight' into 'master'
Updates the font weight of button styles because of the change to system fonts ## What does this MR do? Updates the font weight of button styles because of the change to system fonts ## Are there points in the code the reviewer needs to double check? - ## Why was this MR needed? Because of the change to system fonts the font weight for buttons needed to be toned down a bit. Seems only buttons styles were affected. ## Screenshots (if relevant) left = result ![image](/uploads/c75868dca76561cafd559fb721be0601/image.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? cc: @cperessini See merge request !8012
-rw-r--r--app/assets/stylesheets/framework/buttons.scss2
-rw-r--r--changelogs/unreleased/update-button-font-weight.yml4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index 8da3da2ad08..1c7b2f4df7c 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -1,7 +1,7 @@
@mixin btn-default {
border-radius: 3px;
font-size: $gl-font-size;
- font-weight: 500;
+ font-weight: 400;
padding: $gl-vert-padding $gl-btn-padding;
&:focus,
diff --git a/changelogs/unreleased/update-button-font-weight.yml b/changelogs/unreleased/update-button-font-weight.yml
new file mode 100644
index 00000000000..ddb3c1c8da4
--- /dev/null
+++ b/changelogs/unreleased/update-button-font-weight.yml
@@ -0,0 +1,4 @@
+---
+title: Updates the font weight of button styles because of the change to system fonts
+merge_request:
+author: