summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-11-30 19:58:16 +0000
committerFatih Acet <acetfatih@gmail.com>2016-11-30 19:58:16 +0000
commitd62ee364728abf093d45fd3cf0b1a557ae074e5b (patch)
tree06471b17c9103d1f4ae20e5851fe82bb9e0deadb
parente618990af47d07d27e37cffd36e04537421d7e54 (diff)
parent49ae66fe95fb898129635aace008dcd510e677d9 (diff)
downloadgitlab-ce-d62ee364728abf093d45fd3cf0b1a557ae074e5b.tar.gz
Merge branch '25092-change-font-commit-list-in-system-note' into 'master'
Resolve "Change font of commit list in a system note according to proposed design" ## What does this MR do? This MR closes #25092 ## Are there points in the code the reviewer needs to double check? NR ## Why was this MR needed? To improve `UX` ## Screenshots (if relevant) **Before** ![before](/uploads/50b72a1f818c5a5dc633b06eee3eff92/before.png) **After** ![after](/uploads/7a488fe22a942af8846fcd202da8f400/after.png) ## Does this MR meet the acceptance criteria? - [ ] [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 - [x] 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? Closes #25092 See merge request !7822
-rw-r--r--app/assets/stylesheets/pages/notes.scss6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index dd079859630..15ec8be831e 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -90,14 +90,14 @@ ul.notes {
}
&.system-note-commit-list {
- max-height: 63px;
+ max-height: 70px;
overflow: hidden;
display: block;
ul {
- margin: 3px 0 3px 15px !important;
+ margin: 3px 0 3px 16px !important;
- li {
+ .gfm-commit {
font-family: $monospace_font;
font-size: 12px;
}