summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorKjel Delaey <kjel_delaey@hotmail.com>2015-11-04 16:22:27 +0100
committerKjel Delaey <kjel_delaey@hotmail.com>2015-11-04 16:22:27 +0100
commit8b0906c86d10ff02865e99400f2c0e3bdd1ac6fe (patch)
tree50d8a9456809cab6dd65851d207cf92fbcdead08 /app/assets
parent8508be74d2063bb86e39d1cc8667e8adb9dfe63e (diff)
downloadgitlab-ce-8b0906c86d10ff02865e99400f2c0e3bdd1ac6fe.tar.gz
Apply the same rules to block event items..
Try to avoid alignment issues as well.
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/pages/events.scss13
1 files changed, 3 insertions, 10 deletions
diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss
index d2ca106cc8d..02401c7c73a 100644
--- a/app/assets/stylesheets/pages/events.scss
+++ b/app/assets/stylesheets/pages/events.scss
@@ -4,19 +4,16 @@
*/
.event-item {
font-size: $gl-font-size;
- padding: $gl-padding;
+ padding: $gl-padding $gl-padding $gl-padding ($gl-padding + $gl-avatar-size);
margin-left: -$gl-padding;
margin-right: -$gl-padding;
border-bottom: 1px solid $table-border-color;
color: #7f8fa4;
&.event-inline {
- padding-left: $gl-padding + $gl-avatar-size;
-
.avatar {
position: relative;
top: -2px;
- margin-left: -$gl-avatar-size;
}
.event-title {
@@ -33,6 +30,7 @@
}
.avatar {
+ margin-left: -$gl-avatar-size;
margin-right: 15px;
}
@@ -46,9 +44,6 @@
}
.event-body {
- margin-left: 63px;
- margin-right: 80px;
-
.event-note {
margin-top: 5px;
word-wrap: break-word;
@@ -158,9 +153,7 @@
@media (max-width: $screen-xs-max) {
.event-item {
- &.event-inline {
- padding-left: $gl-padding;
- }
+ padding-left: $gl-padding;
.event-title {
white-space: normal;