summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/buttons.scss
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-06-08 17:20:07 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-06-08 17:20:07 +0300
commit1dc001730b7d08100c0af8c210b5768c7dfbdd32 (patch)
tree4b6bbc90aa80ed7f68f3c14f0929bffc1e601e2d /app/assets/stylesheets/framework/buttons.scss
parent366ad9ff72b44df384bffe562ac66f85aff24c65 (diff)
downloadgitlab-ce-1dc001730b7d08100c0af8c210b5768c7dfbdd32.tar.gz
Cleanup and imrpove issue/mr buttons
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets/stylesheets/framework/buttons.scss')
-rw-r--r--app/assets/stylesheets/framework/buttons.scss15
1 files changed, 13 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index 467f3b35d74..625200cbcad 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -142,15 +142,26 @@
}
&.btn-grouped {
- margin-right: 7px;
+ margin-right: $btn-side-margin;
float: left;
+
+ &.inline {
+ float: none;
+ }
+
&:last-child {
margin-right: 0;
}
+
+ &.btn-sm {
+ margin-right: $btn-sm-side-margin;
+ }
+
&.btn-xs {
- margin-right: 3px;
+ margin-right: $btn-xs-side-margin;
}
}
+
&.disabled {
pointer-events: auto !important;
}