summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/variables.scss
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2016-06-10 10:31:20 +0530
committerTimothy Andrew <mail@timothyandrew.net>2016-06-10 10:31:20 +0530
commitd754d99179f1ffe846fcc1d8e858163b39efc5dc (patch)
tree1359c07166aa7a71038e17fbd4b2c788c6ab66da /app/assets/stylesheets/framework/variables.scss
parente18a08fd89f59088db22208069370a85f6a33001 (diff)
parentcea3cf177c68bb1fa9326d4e88631b7737ae8a98 (diff)
downloadgitlab-ce-d754d99179f1ffe846fcc1d8e858163b39efc5dc.tar.gz
Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens
Diffstat (limited to 'app/assets/stylesheets/framework/variables.scss')
-rw-r--r--app/assets/stylesheets/framework/variables.scss5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 8db50063233..8fd39adb6da 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -57,6 +57,7 @@ $code_line_height: 1.5;
*/
$gl-padding: 16px;
$gl-btn-padding: 10px;
+$gl-input-padding: 10px;
$gl-vert-padding: 6px;
$gl-padding-top: 10px;
@@ -79,8 +80,8 @@ $provider-btn-not-active-color: #4688f1;
$link-underline-blue: #4a8bee;
$layout-link-gray: #7e7c7c;
$todo-alert-blue: #428bca;
-$btn-side-margin: 7px;
-$btn-sm-side-margin: 5px;
+$btn-side-margin: 10px;
+$btn-sm-side-margin: 7px;
$btn-xs-side-margin: 5px;
/*