summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-03-31 16:18:45 +0100
committerPhil Hughes <me@iamphill.com>2016-03-31 16:18:45 +0100
commit4a503cb8b3b36046ff7f0304e1f7719a5972637d (patch)
tree6ab021cd30748de46ec0a774cf7aac70ce6ec984
parentd0c08cc5e04b7f9a626dee77857fddabbc9e5c69 (diff)
downloadgitlab-ce-notes-actions-colours.tar.gz
Fixed alignment of iconsnotes-actions-colours
-rw-r--r--app/assets/stylesheets/framework/variables.scss3
-rw-r--r--app/assets/stylesheets/pages/notes.scss9
2 files changed, 10 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index cfe9cd6e36c..7c3e4c1956b 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -212,5 +212,6 @@ $location-active-bg: $search-input-border-color;
* Notes
*/
$notes-light-color: #8e8e8e;
-$notes-action-color: #8f8f8f;
+$notes-action-color: #c3c3c3;
+$notes-role-color: #8e8e8e;
$notes-role-border-color: #e4e4e4;
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 775b7857c49..072de68c8e2 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -197,6 +197,13 @@ ul.notes {
line-height: 24px;
.fa {
+ position: relative;
+ top: 1px;
+ font-size: 17px;
+ }
+
+ .fa-trash-o {
+ top: 0;
font-size: 16px;
}
}
@@ -219,7 +226,7 @@ ul.notes {
display: inline-block;
padding-left: 4px;
padding-right: 4px;
- color: $notes-action-color;
+ color: $notes-role-color;
font-size: 12px;
line-height: 20px;
border: 1px solid $notes-role-border-color;