summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages/note_form.scss
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-10-25 13:52:26 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-10-25 13:52:26 +0000
commit3b93574a356b77419672c564f6046ecd751a7e35 (patch)
tree7ff7b08f1c926fcd24c92b18f14913e21d1bbfa6 /app/assets/stylesheets/pages/note_form.scss
parent9a6770388c0e93f98952a40cc88bb7f5ecd23631 (diff)
parent791c9d0dd3464eb471262b73a62632ed39d47eb2 (diff)
downloadgitlab-ce-3b93574a356b77419672c564f6046ecd751a7e35.tar.gz
Merge branch 'enable-scss-lint-single-line-per-selector' into 'master'
Enable SingleLinePerSelector in scss-lint ## What does this MR do? Enables `SingleLinePerSelector` in `.scss-lint.yml` ## Are there points in the code the reviewer needs to double check? This MR touches a lot of files, just need another pair of eyes to look through and make sure I didn't break anything. ## Why was this MR needed? Improve SCSS maintainability and consistency ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - Tests - [x] 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? #23485 See merge request !7081
Diffstat (limited to 'app/assets/stylesheets/pages/note_form.scss')
-rw-r--r--app/assets/stylesheets/pages/note_form.scss3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 25c1bbdc1c9..16ddef481bd 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -24,7 +24,8 @@
display: none;
}
-.new-note, .note-edit-form {
+.new-note,
+.note-edit-form {
.note-form-actions {
margin-top: $gl-padding;
}