diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-03 13:44:54 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-03 13:46:11 +0200 |
commit | 63ba17c4db4984bb3d060fdf33d25b7038aa1856 (patch) | |
tree | d84854f119f734903d04ccc861e7d1fab6ac83d3 /app/assets/stylesheets/pages/events.scss | |
parent | 59d9dc44088b7d4cd75c57b89a24497335c20895 (diff) | |
download | gitlab-ce-63ba17c4db4984bb3d060fdf33d25b7038aa1856.tar.gz |
Redesign activity feed on dashboard and project pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets/stylesheets/pages/events.scss')
-rw-r--r-- | app/assets/stylesheets/pages/events.scss | 74 |
1 files changed, 23 insertions, 51 deletions
diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss index d4af7506d5b..c570bb1e430 100644 --- a/app/assets/stylesheets/pages/events.scss +++ b/app/assets/stylesheets/pages/events.scss @@ -1,39 +1,13 @@ /** - * Events labels - * - */ -.event_label { - &.pushed { - padding: 0 2px; - } - - &.opened { - padding: 0 2px; - } - - &.closed { - padding: 0 2px; - } - - &.merged { - padding: 0 2px; - } - - &.left, - &.joined { - padding: 0 2px; - float: none; - } -} - -/** * Dashboard events feed * */ .event-item { - &:first-child { - padding-top: 0; - } + font-size: 16px; + padding: 18px; + margin: 0 -15px; + border-bottom: 1px solid #f1f2f4; + color: #7f8fa4; &.event-inline { .avatar { @@ -42,29 +16,35 @@ } } - padding: 12px 0px; - border-bottom: 1px solid #eee; + a { + color: #4c4e54; + } + + .avatar { + margin-right: 15px; + } + .event-title { - max-width: 70%; @include str-truncated(calc(100% - 174px)); + + max-width: 70%; font-weight: 500; - font-size: 14px; + .author_name { color: #333; } } + .event-body { - font-size: 13px; - margin-left: 35px; + margin-left: 60px; margin-right: 80px; - color: #777; .event-note { margin-top: 5px; word-wrap: break-word; .md { - font-size: 13px; + font-size: 16px; iframe.twitter-share-button { vertical-align: bottom; @@ -116,7 +96,7 @@ &:last-child { border:none } .event_commits { - margin-top: 5px; + margin-top: 9px; li { &.commit { @@ -125,10 +105,12 @@ padding-left: 0; border: none; .commit-row-title { - font-size: 12px; + font-size: 16px; } } + &.commits-stat { + margin-top: 3px; display: block; padding: 3px; padding-left: 0; @@ -142,7 +124,6 @@ .event-item-timestamp { float: right; - color: #999; line-height: 22px; } } @@ -186,12 +167,3 @@ } } } - -.event_filter { - li a { - font-size: 13px; - padding: 5px 10px; - background: $background-color; - margin-left: 4px; - } -} |