summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-04-06 16:59:56 +0000
committerFilipa Lacerda <filipa@gitlab.com>2017-04-06 16:59:56 +0000
commit86d5f1f8105e52795c1e0f43a02770f9a3f28ac1 (patch)
treeaa6cb5f9ceab39aaaad3ab61faf0eb01f60d0884 /app/assets
parente3f2c01020931a6bffb7c55102992ccb3132af18 (diff)
parentd4377b8c12e106892098d66321059ca6bc1affdd (diff)
downloadgitlab-ce-86d5f1f8105e52795c1e0f43a02770f9a3f28ac1.tar.gz
Merge branch '29128-profile-page-icons' into 'master'
Resolve "Add system note icons to profile page" Closes #29128 See merge request !10387
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/pages/events.scss34
1 files changed, 27 insertions, 7 deletions
diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss
index 08398bb43a2..e7f9bbbc62f 100644
--- a/app/assets/stylesheets/pages/events.scss
+++ b/app/assets/stylesheets/pages/events.scss
@@ -4,14 +4,14 @@
*/
.event-item {
font-size: $gl-font-size;
- padding: $gl-padding-top 0 $gl-padding-top ($gl-avatar-size + $gl-padding-top);
+ padding: $gl-padding-top 0 $gl-padding-top 40px;
border-bottom: 1px solid $white-normal;
color: $list-text-color;
+ position: relative;
&.event-inline {
- .avatar {
- position: relative;
- top: -2px;
+ .profile-icon {
+ top: 20px;
}
.event-title,
@@ -24,8 +24,28 @@
color: $gl-text-color;
}
- .avatar {
- margin-left: -($gl-avatar-size + $gl-padding-top);
+ .profile-icon {
+ position: absolute;
+ left: 0;
+ top: 14px;
+
+ svg {
+ width: 20px;
+ height: auto;
+ fill: $gl-text-color-secondary;
+ }
+
+ &.open-icon svg {
+ fill: $green-300;
+ }
+
+ &.closed-icon svg {
+ fill: $red-300;
+ }
+
+ &.fork-icon svg {
+ fill: $blue-300;
+ }
}
.event-title {
@@ -163,7 +183,7 @@
max-width: 100%;
}
- .avatar {
+ .profile-icon {
display: none;
}