diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-05 14:55:42 +0100 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-05 14:55:42 +0100 |
commit | db6cb39963eff7d48fa99afaa8c2ab4603c98f6d (patch) | |
tree | 67961c47e286df11057aa1c7335b0c2e107a36bc | |
parent | 363900a3e7902cbda8f62b55eb2c30881b3dae3f (diff) | |
parent | b6f89c3490f8c31607073c9761de3ebb30ae244e (diff) | |
download | gitlab-ce-db6cb39963eff7d48fa99afaa8c2ab4603c98f6d.tar.gz |
Merge pull request #9804 from trimentor/9722-fix-alignment-of-event-items-and-its-children
9722 fix alignment of event items and its children
-rw-r--r-- | app/assets/stylesheets/pages/events.scss | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss index dfb901652bf..282aaf2219b 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; + 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; @@ -16,10 +16,7 @@ top: -2px; } - .event-title { - line-height: 44px; - } - + .event-title, .event-item-timestamp { line-height: 44px; } @@ -30,7 +27,7 @@ } .avatar { - margin-right: 15px; + margin-left: -($gl-avatar-size + 15px); } .event-title { @@ -43,8 +40,7 @@ } .event-body { - margin-left: 63px; - margin-right: 80px; + margin-right: 174px; .event-note { margin-top: 5px; @@ -155,6 +151,8 @@ @media (max-width: $screen-xs-max) { .event-item { + padding-left: $gl-padding; + .event-title { white-space: normal; overflow: visible; |