kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge conflict fixes

Browse source
This commit is contained in:
Annabel Dunstone 2016-04-01 13:55:50 -05:00
parent 87b3c73ea5
commit 3cfeb37558
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/assets/stylesheets/pages/notes.scss
View file

@ -194,6 +194,21 @@ ul.notes {
float: right;
margin-left: 10px;
color: $notes-action-color;
.js-note-delete {
&:hover {
@extend .cgray;
&.danger { @extend .cred; }
}
}
.js-note-edit {
i {
&:hover {
color: $gl-link-color;
}
}
}
}
.note-action-button,
@ -212,21 +227,6 @@ ul.notes {
top: 0;
font-size: 16px;
}
.js-note-delete {
&:hover {
@extend .cgray;
&.danger { @extend .cred; }
}
}
.js-note-edit {
i {
&:hover {
color: $gl-link-color;
}
}
}
}
.discussion-toggle-button {