summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorKjel Delaey <kjel_delaey@hotmail.com>2015-11-04 16:40:22 +0100
committerKjel Delaey <kjel_delaey@hotmail.com>2015-11-04 16:40:22 +0100
commit530c9519d4d0760848daf5026f93fbcbff348656 (patch)
tree69bd441da0bd511c01ec9dfcc7649e34fd56c926 /app
parent3f2955de3bf08ef1ec378d323fb2360547a4ca16 (diff)
downloadgitlab-ce-530c9519d4d0760848daf5026f93fbcbff348656.tar.gz
Make sure that multi-commit rows inside event bodies are aligned properly..
Prevent the second, third, ... rows from having a different indentation than the first commit row. Adding the extra "15px padding" to the event item prevents this. Having a 15px margin on the avatar only doesn't prevent this from happening.
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/pages/events.scss5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss
index f8d1afda73e..c150b4ac19f 100644
--- a/app/assets/stylesheets/pages/events.scss
+++ b/app/assets/stylesheets/pages/events.scss
@@ -4,7 +4,7 @@
*/
.event-item {
font-size: $gl-font-size;
- padding: $gl-padding $gl-padding $gl-padding ($gl-padding + $gl-avatar-size);
+ padding: $gl-padding $gl-padding $gl-padding ($gl-padding + $gl-avatar-size + 15px);
margin-left: -$gl-padding;
margin-right: -$gl-padding;
border-bottom: 1px solid $table-border-color;
@@ -27,8 +27,7 @@
}
.avatar {
- margin-left: -$gl-avatar-size;
- margin-right: 15px;
+ margin-left: -($gl-avatar-size + 15px);
}
.event-title {