summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/variables.scss
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-06-23 10:44:10 +0100
committerPhil Hughes <me@iamphill.com>2017-06-23 10:44:10 +0100
commit6fb7fb5c1a44926511914080334774b21a5ee9af (patch)
tree4fdf8530c98576fd19c306a3c74540998bee9fd0 /app/assets/stylesheets/framework/variables.scss
parent3b53b553b78d20268d228afa596b53d18046f98e (diff)
parent801cf92310e9f6950dddba848ef1e6a3d1e48ef0 (diff)
downloadgitlab-ce-6fb7fb5c1a44926511914080334774b21a5ee9af.tar.gz
Merge branch 'master' into experimental-top-nav
Diffstat (limited to 'app/assets/stylesheets/framework/variables.scss')
-rw-r--r--app/assets/stylesheets/framework/variables.scss1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 1fcd8f39922..988463990e3 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -327,6 +327,7 @@ $note-disabled-comment-color: #b2b2b2;
$note-targe3-outside: #fffff0;
$note-targe3-inside: #ffffd3;
$note-line2-border: #ddd;
+$note-icon-gutter-width: 55px;
/*