summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-11-30 18:54:49 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-11-30 18:54:49 +0000
commitd2ba27993ea16ff56e065d2e42ebcd8fb705b0f4 (patch)
tree814f8d4eb45ddbec8a01f7045bf7626132bad596
parent509b5d45f241ad602a033d0d5198ebd094869b15 (diff)
parent28638356a20e64d5fb1ac6016fbe0f3645b16ecd (diff)
downloadgitlab-ce-d2ba27993ea16ff56e065d2e42ebcd8fb705b0f4.tar.gz
Merge branch '24894-style-system-note-in-commit-discussion' into 'master'
new system note design for commit discussion ## What does this MR do? This MR implement new system notes design for discussion on a commit. ## Are there points in the code the reviewer needs to double check? NR ## Why was this MR needed? It improves UX and coherent style in UI ## Screenshots (if relevant) **before** ![commit-discussion-before](/uploads/b68ab7cce583a18ac066691448f955e7/commit-discussion-before.png) **After** ![commit-discussion-after](/uploads/e9c0cb48c29fdd9b6de6f23a3c588d03/commit-discussion-after.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 - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 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 #24894 See merge request !7721
-rw-r--r--app/assets/stylesheets/pages/notes.scss4
-rw-r--r--changelogs/unreleased/24894-style-system-note-in-commit-discussion.yml4
2 files changed, 8 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index e66c1f8d072..dd079859630 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -172,6 +172,10 @@ ul.notes {
&.timeline-entry {
padding: 14px 10px;
}
+
+ .system-note {
+ padding: 0;
+ }
}
&.is-editting {
diff --git a/changelogs/unreleased/24894-style-system-note-in-commit-discussion.yml b/changelogs/unreleased/24894-style-system-note-in-commit-discussion.yml
new file mode 100644
index 00000000000..7ddf0b46d4c
--- /dev/null
+++ b/changelogs/unreleased/24894-style-system-note-in-commit-discussion.yml
@@ -0,0 +1,4 @@
+---
+title: Fixes system note style in commit discussion
+merge_request: 7721
+author: