summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-05-14 12:18:19 +0200
committerDouwe Maan <douwe@gitlab.com>2015-05-14 12:18:19 +0200
commit74770137f68d98ced85b3c579e7663bc049c0bb7 (patch)
tree973c0a2939564036dcea5a2db703e51bae735f5e /app/assets
parent910794bae5a91479f41468ebc345db680a33b20e (diff)
downloadgitlab-ce-74770137f68d98ced85b3c579e7663bc049c0bb7.tar.gz
Always show note action icons.
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/pages/notes.scss35
1 files changed, 18 insertions, 17 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 61b907e39be..e943be67dbf 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -33,7 +33,16 @@ ul.notes {
&:before {
content: "\00b7";
}
+
font-size: 13px;
+
+ a {
+ @extend .cgray;
+
+ &:hover {
+ text-decoration: underline;
+ }
+ }
}
.author {
color: #333;
@@ -47,7 +56,7 @@ ul.notes {
.note-role {
float: right;
- margin-top: 2px;
+ margin-top: 1px;
border: 1px solid #bbb;
background-color: transparent;
color: #999;
@@ -142,31 +151,23 @@ ul.notes {
.discussion,
.note {
- &.note:hover {
- .note-actions { display: block; }
- .note-actions + .note-role { display: none; }
- }
- .discussion-header:hover {
- .discussion-actions { display: block; }
- }
-
.discussion-actions,
.note-actions {
- display: none;
float: right;
-
- i.fa {
- font-size: 16px;
- line-height: 16px;
- vertical-align: middle;
- }
+ margin-left: 10px;
a {
margin-left: 5px;
- @extend .cgray;
+ color: #999;
+
+ i.fa {
+ font-size: 16px;
+ line-height: 16px;
+ }
&:hover {
+ @extend .cgray;
&.danger { @extend .cred; }
}
}