summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-06-20 20:06:35 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-06-20 20:06:35 +0000
commitb635980d9704b12ffe2697e35859484f1343aae3 (patch)
treecce306c8c3667822d7e12b9bf0d3749df602eafa
parent3b05752fbfde9b26fa60c1abc0d08614c251b3fd (diff)
parentcd95389ac3151c9c3eb390f2adfd73678bb558d8 (diff)
downloadgitlab-ce-b635980d9704b12ffe2697e35859484f1343aae3.tar.gz
Merge branch 'diff-commit-id-weight' into 'master'
Fixes font weight of commit id on view file button ## What does this MR do? Changes the weight to normal. With the new commit UI - this had turned bold and didn't match the designs. Should it also be our normal font family? According to designs it is - but everywhere else there is a commit ID it has the monospace font. ## Screenshots (if relevant) ![Screen_Shot_2016-06-16_at_17.25.33](/uploads/bb76d576c10be65172d5f4e9790ca766/Screen_Shot_2016-06-16_at_17.25.33.png) See merge request !4713
-rw-r--r--app/assets/stylesheets/pages/diff.scss5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 1a7d5f9666e..5286b73cc50 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -4,6 +4,11 @@
margin-bottom: $gl-padding;
border-radius: 3px;
+ .commit-short-id {
+ font-family: $regular_font;
+ font-weight: 400;
+ }
+
.diff-header {
position: relative;
background: $background-color;