summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-03-31 16:09:58 -0500
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-04-03 08:34:36 -0500
commit32bb33f717ccae968949d30d058e828e31d72cf2 (patch)
tree37ae9252042cbc493647caa775fa642c11f84c1a /app/assets
parent633457563a9e9ef9473a00019dd243430aa08e80 (diff)
downloadgitlab-ce-32bb33f717ccae968949d30d058e828e31d72cf2.tar.gz
Change color of icons
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/pages/events.scss43
1 files changed, 31 insertions, 12 deletions
diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss
index 35571748118..14ad26bcd6b 100644
--- a/app/assets/stylesheets/pages/events.scss
+++ b/app/assets/stylesheets/pages/events.scss
@@ -4,11 +4,16 @@
*/
.event-item {
font-size: $gl-font-size;
- padding: $gl-padding 0;
+ padding: $gl-padding-top 0 $gl-padding-top ($gl-avatar-size + $gl-padding-top);
border-bottom: 1px solid $white-normal;
color: $list-text-color;
+ position: relative;
&.event-inline {
+ .profile-icon {
+ top: 20px;
+ }
+
.event-title,
.event-item-timestamp {
line-height: 40px;
@@ -19,22 +24,36 @@
color: $gl-text-color;
}
+ .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 {
@include str-truncated(calc(100% - 174px));
font-weight: 600;
color: $list-text-color;
}
- .event-icon {
- display: inline-block;
- margin: 0 10px;
- }
-
- svg {
- height: 16px;
- width: 16px;
- }
-
.event-body {
margin-right: 174px;
@@ -164,7 +183,7 @@
max-width: 100%;
}
- .avatar {
+ .profile-icon {
display: none;
}