Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-07-15 16:49:10 +0300
committerFatih Acet <acetfatih@gmail.com>2016-07-15 16:49:10 +0300
commit50abec8ca36c5cbdb1f7878b3ac956211fc67d3d (patch)
treef423788a95f602a0487e2765539e3feb167ea1b0
parent877c77ccdb4af63e90a17c712ad2050296d198d4 (diff)
parentd3653f07227e73e3035c7895ab12a5e0345af744 (diff)
Merge branch 'collapse-diffs-more' into 'master'
Reduce padding on collapsed diff message ## What does this MR do? Reduce the padding on the collapsed diff message so it takes up less space. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Collapsed diffs took up too much space before. ## Screenshots (if relevant) Before: ![image](/uploads/62c6fe19439bc3bc91bde83df72e7004/image.png) After: ![image](/uploads/ec89230065c37fc4022d949d1233a90d/image.png) ## Does this MR meet the acceptance criteria? - ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 [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 !5256
-rw-r--r--app/assets/stylesheets/framework/blocks.scss6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss
index 24b1ebab4b0..ad94e457cfd 100644
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -16,8 +16,14 @@
font-weight: normal;
font-size: 16px;
line-height: 36px;
+
&.diff-collapsed {
+ padding: 5px;
cursor: pointer;
+
+ &:hover {
+ background-color: $row-hover;
+ }
}
}