From e1910e4325955e8da1097993aa5bf062dd7f68bc Mon Sep 17 00:00:00 2001 From: Sam Georges Date: Sun, 27 Jul 2014 14:33:32 +1000 Subject: [PATCH] Plump up the button size by overriding Bootstrap instead --- modules/backend/assets/css/october.css | 7 +++++-- modules/backend/assets/less/controls/button.less | 3 +-- modules/backend/assets/less/core/mixins.less | 10 ++++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css index bc59da87b..a347a6d6d 100644 --- a/modules/backend/assets/css/october.css +++ b/modules/backend/assets/css/october.css @@ -1945,6 +1945,7 @@ select[multiple].input-lg { border: 1px solid transparent; white-space: nowrap; padding: 9px 11px; + padding: 9px 16.5px; font-size: 14px; line-height: 1.428571429; border-radius: 2px; @@ -2264,6 +2265,7 @@ fieldset[disabled] .btn-link:focus { .btn-lg, .btn-group-lg > .btn { padding: 10px 16px; + padding: 10px 24px; font-size: 18px; line-height: 1.33; border-radius: 6px; @@ -2271,6 +2273,7 @@ fieldset[disabled] .btn-link:focus { .btn-sm, .btn-group-sm > .btn { padding: 5px 10px; + padding: 5px 15px; font-size: 12px; line-height: 1.5; border-radius: 3px; @@ -2278,6 +2281,7 @@ fieldset[disabled] .btn-link:focus { .btn-xs, .btn-group-xs > .btn { padding: 1px 5px; + padding: 1px 7.5px; font-size: 12px; line-height: 1.5; border-radius: 3px; @@ -10197,8 +10201,7 @@ html.cssanimations .cursor-loading-indicator.hide { font-size: 13px; border: none; text-align: left; - outline: none!important; - padding: 9px 18px; + outline: none !important; } .btn[class^="oc-icon-"]:before, .btn[class*=" oc-icon-"]:before { diff --git a/modules/backend/assets/less/controls/button.less b/modules/backend/assets/less/controls/button.less index 344235418..0366cba93 100644 --- a/modules/backend/assets/less/controls/button.less +++ b/modules/backend/assets/less/controls/button.less @@ -6,8 +6,7 @@ font-size: 13px; border: none; text-align: left; - outline: none!important; - padding: 9px 18px; + outline: none !important; &[class^="oc-icon-"], &[class*=" oc-icon-"] { diff --git a/modules/backend/assets/less/core/mixins.less b/modules/backend/assets/less/core/mixins.less index c28549113..4058c6b67 100644 --- a/modules/backend/assets/less/core/mixins.less +++ b/modules/backend/assets/less/core/mixins.less @@ -1,3 +1,13 @@ +// +// Override Bootstrap mixins +// -------------------------------------------------- + +.button-size(@padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) { + padding: @padding-vertical (@padding-horizontal * 1.5); + font-size: @font-size; + line-height: @line-height; + border-radius: @border-radius; +} // Triangles // --------------------------------------------------