summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages/events.scss
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-09-02 17:50:40 +0000
committerFatih Acet <acetfatih@gmail.com>2016-09-02 17:50:40 +0000
commitfda07a25240135273761abe1331fd0e320dd290b (patch)
tree0d80c2bfbfcb717520b8ae7dd0b592d5907f77b7 /app/assets/stylesheets/pages/events.scss
parent2390a6924e815a180606d59af5fc0b97961ff497 (diff)
parent740234798102050382d8dff96fb9cb0af7e3d0a8 (diff)
downloadgitlab-ce-fda07a25240135273761abe1331fd0e320dd290b.tar.gz
Merge branch 'commit-message-scroll' into 'master'
Commit message blocks #### What does this MR do? * Wraps code commit message blocks * Consolidates similar shades of gray (cc @cperessini @tauriedavis) Related to #20831 #### Screenshots (if relevant) Before: ![Screen_Shot_2016-08-19_at_10.41.07_AM](/uploads/4529d178123e18b0aad35a252061902b/Screen_Shot_2016-08-19_at_10.41.07_AM.png) After: ![Screen_Shot_2016-08-19_at_10.40.42_AM](/uploads/499818f360e7c3cd9d31bc335cae1a82/Screen_Shot_2016-08-19_at_10.40.42_AM.png) See merge request !5906
Diffstat (limited to 'app/assets/stylesheets/pages/events.scss')
-rw-r--r--app/assets/stylesheets/pages/events.scss4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss
index 0cd45fb90bf..1d00da1266c 100644
--- a/app/assets/stylesheets/pages/events.scss
+++ b/app/assets/stylesheets/pages/events.scss
@@ -60,7 +60,7 @@
pre {
border: none;
- background: #f9f9f9;
+ background: $gray-light;
border-radius: 0;
color: #777;
margin: 0 20px;
@@ -92,7 +92,7 @@
border: 1px solid #eee;
padding: 5px;
@include border-radius(5px);
- background: #f9f9f9;
+ background: $gray-light;
margin-left: 10px;
top: -6px;
img {