summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-04-07 20:03:55 -0500
committerDouwe Maan <douwe@selenight.nl>2017-04-07 20:03:55 -0500
commitf058b52b50c76de9557b167a1a31a5c9ba446f31 (patch)
tree047f04c2b0ed83ed71a6b39e64f55c40eded838b /app/assets
parent130a1e86e215d5d43cd3c53a44589aa5b8c69aab (diff)
parent7d3f37b0b879af562dc7c499bdbfcb230ed718a4 (diff)
downloadgitlab-ce-f058b52b50c76de9557b167a1a31a5c9ba446f31.tar.gz
Merge branch 'master' into new-resolvable-discussion
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/pages/events.scss2
-rw-r--r--app/assets/stylesheets/pages/notes.scss2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss
index e7f9bbbc62f..79da490675a 100644
--- a/app/assets/stylesheets/pages/events.scss
+++ b/app/assets/stylesheets/pages/events.scss
@@ -31,7 +31,7 @@
svg {
width: 20px;
- height: auto;
+ height: 20px;
fill: $gl-text-color-secondary;
}
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index c1be78fcd6e..94ea4c5c8c6 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -19,7 +19,7 @@ ul.notes {
svg {
width: 18px;
- height: auto;
+ height: 18px;
fill: $gray-darkest;
position: absolute;
left: 30px;