From 02f7149e57af8b76e8b6d54d67f57a53f08409de Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Sat, 31 Oct 2015 16:10:06 +1100 Subject: [PATCH] Allow btn-group to work inside form-buttons --- modules/system/assets/ui/less/form.less | 8 ++++++++ modules/system/assets/ui/storm.css | 2 ++ 2 files changed, 10 insertions(+) diff --git a/modules/system/assets/ui/less/form.less b/modules/system/assets/ui/less/form.less index 27e8b9106..b11cf6556 100644 --- a/modules/system/assets/ui/less/form.less +++ b/modules/system/assets/ui/less/form.less @@ -347,6 +347,14 @@ } } + .btn-group { + margin-right: 10px; + + .btn { + margin-right: 0; + } + } + .pull-right { margin-right: 0; margin-left: 10px; diff --git a/modules/system/assets/ui/storm.css b/modules/system/assets/ui/storm.css index 9dc00468c..d8939e99f 100644 --- a/modules/system/assets/ui/storm.css +++ b/modules/system/assets/ui/storm.css @@ -2271,6 +2271,8 @@ html.cssanimations .cursor-loading-indicator.hide{display:none} .form-buttons:after{clear:both} .form-buttons .btn{margin-right:10px} .form-buttons .btn.no-margin-right{margin-right:0} +.form-buttons .btn-group{margin-right:10px} +.form-buttons .btn-group .btn{margin-right:0} .form-buttons .pull-right{margin-right:0;margin-left:10px} .form-buttons.buttons-offset{padding-left:20px} body.slim-container .form-buttons{padding:0 20px 20px}