summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages/notes.scss
diff options
context:
space:
mode:
authorAnnabel Dunstone <annabel.dunstone@gmail.com>2016-04-01 14:27:39 -0500
committerAnnabel Dunstone <annabel.dunstone@gmail.com>2016-04-07 15:33:18 -0700
commitdab4ac54b691f1c832b1fe444859c3183a231411 (patch)
tree0e3cd6fe0fc30060e19090bc18ab753731f23e1f /app/assets/stylesheets/pages/notes.scss
parent3cfeb3755828871813cd12c771fa7efddf67edb5 (diff)
downloadgitlab-ce-dab4ac54b691f1c832b1fe444859c3183a231411.tar.gz
Diff design updates
Diffstat (limited to 'app/assets/stylesheets/pages/notes.scss')
-rw-r--r--app/assets/stylesheets/pages/notes.scss44
1 files changed, 18 insertions, 26 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 93fcb81321a..7295fe51121 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -58,6 +58,7 @@ ul.notes {
.note {
display: block;
position: relative;
+ border-bottom: 1px solid $table-border-gray;
&.is-editting {
.note-header,
@@ -117,9 +118,6 @@ ul.notes {
padding-bottom: 3px;
}
- &:last-child {
- border-bottom: 1px solid $border-color;
- }
}
}
@@ -137,14 +135,14 @@ ul.notes {
font-family: $regular_font;
td {
- border: 1px solid #ddd;
+ border: 1px solid $table-border-gray;
border-left: none;
&.notes_line {
vertical-align: middle;
text-align: center;
padding: 10px 0;
- background: #fff;
+ background: $background-color;
color: $text-color;
}
&.notes_line2 {
@@ -175,9 +173,6 @@ ul.notes {
}
}
- .author_link {
- font-weight: 600;
- }
}
.note-headline-light,
@@ -194,21 +189,6 @@ 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,
@@ -218,14 +198,26 @@ ul.notes {
line-height: 24px;
.fa {
+ color: $notes-action-color;
position: relative;
top: 1px;
font-size: 17px;
}
- .fa-trash-o {
- top: 0;
- font-size: 16px;
+ &.js-note-delete {
+ i {
+ &:hover {
+ color: $gl-text-red;
+ }
+ }
+ }
+
+ &.js-note-edit {
+ i {
+ &:hover {
+ color: $gl-link-color;
+ }
+ }
}
}