diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-08-19 17:05:54 +0300 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-08-19 17:05:54 +0300 |
commit | e303df2e27296edb6f5ee96e1ce69c266cb10805 (patch) | |
tree | 0fbd0bb09cd36c8a33e81e2e6797167463799a25 /app/assets | |
parent | 296a729aac95774d707f29d8f723b316beef34a8 (diff) | |
parent | fdf283ab2e504a40aaac3ff5c38a8445d2047c44 (diff) |
Merge branch 'fix-gfm-commit-font' into 'master'
Fix commit mention font inconsistency
## What does this MR do?
Removes the mono font styling for the auto linked commit hashes.
## Are there points in the code the reviewer needs to double check?
Shouldn't be
## Why was this MR needed?
Resolve existing UI inconsistency
## What are the relevant issue numbers?
Closes #20936
## Screenshots (if relevant)
Before:
![Screen_Shot_2016-08-15_at_1.48.13_PM](/uploads/9f8728e91442b087f723e73edfe8893e/Screen_Shot_2016-08-15_at_1.48.13_PM.png)
After:
![Screen_Shot_2016-08-15_at_1.48.26_PM](/uploads/d48d877337f9f3673cdffd434ff368cb/Screen_Shot_2016-08-15_at_1.48.26_PM.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 !5817
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/framework/gfm.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/gfm.scss b/app/assets/stylesheets/framework/gfm.scss index f4d35c4b4b1..c0de09f3968 100644 --- a/app/assets/stylesheets/framework/gfm.scss +++ b/app/assets/stylesheets/framework/gfm.scss @@ -2,7 +2,7 @@ * Styles that apply to all GFM related forms. */ -.gfm-commit, .gfm-commit_range { +.gfm-commit_range { font-family: $monospace_font; font-size: 90%; } |