diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-04-12 21:41:15 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-04-12 21:41:15 +0000 |
commit | 3e19ecae1774f4bbe234c54b0b41c25c78021813 (patch) | |
tree | b1341a1c7fefade0a70eef8986aacd165b192cef /app/assets/stylesheets/pages | |
parent | d5143af98e5e0f919ea08d8341a5d5b00e4a3095 (diff) | |
parent | 8552d120d1665ff32948de9657b86a923c7bd4d6 (diff) | |
download | gitlab-ce-3e19ecae1774f4bbe234c54b0b41c25c78021813.tar.gz |
Merge branch 'use-avatars-in-activity-view' into 'master'
Use avatars instead of icons in activity view
See merge request !10596
Diffstat (limited to 'app/assets/stylesheets/pages')
-rw-r--r-- | app/assets/stylesheets/pages/events.scss | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss index 79da490675a..5b723f7c722 100644 --- a/app/assets/stylesheets/pages/events.scss +++ b/app/assets/stylesheets/pages/events.scss @@ -10,10 +10,14 @@ position: relative; &.event-inline { - .profile-icon { + .system-note-image { top: 20px; } + .user-avatar { + top: 14px; + } + .event-title, .event-item-timestamp { line-height: 40px; @@ -24,7 +28,7 @@ color: $gl-text-color; } - .profile-icon { + .system-note-image { position: absolute; left: 0; top: 14px; @@ -35,15 +39,18 @@ fill: $gl-text-color-secondary; } - &.open-icon svg { - fill: $green-300; + &.opened-icon, + &.created-icon { + svg { + fill: $green-300; + } } &.closed-icon svg { fill: $red-300; } - &.fork-icon svg { + &.accepted-icon svg { fill: $blue-300; } } @@ -128,8 +135,7 @@ li { &.commit { background: transparent; - padding: 3px; - padding-left: 0; + padding: 0; border: none; .commit-row-title { @@ -183,7 +189,7 @@ max-width: 100%; } - .profile-icon { + .system-note-image { display: none; } |