From 542cbf5718670bf65f2054245778a34dcbf8ac8c Mon Sep 17 00:00:00 2001 From: Kevin Ross Date: Wed, 13 Jan 2016 15:42:48 -0600 Subject: [PATCH] button sizing required some padding and font adjustments to be in-spec --- scss/_buttons.scss | 5 ++--- scss/variables/bootstrap/_buttons.scss | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/scss/_buttons.scss b/scss/_buttons.scss index 643107d5..a0b5877e 100644 --- a/scss/_buttons.scss +++ b/scss/_buttons.scss @@ -121,7 +121,6 @@ } } - // Icon buttons &.mdb-btn-icon { width: $mdb-btn-icon-size; @@ -156,11 +155,11 @@ // Size variations &.btn-lg, .btn-group-lg & { - font-size: $mdb-btn-font-size-lg; + @include button-size($btn-padding-y-lg, $btn-padding-x-lg, $mdb-btn-font-size-lg, $line-height-lg, $btn-border-radius-lg); } &.btn-sm, .btn-group-sm & { - padding: 5px 20px; + @include button-size($btn-padding-y-sm, $btn-padding-x-sm, $mdb-btn-font-size-sm, $line-height-sm, $btn-border-radius-sm); font-size: $mdb-btn-font-size-sm; } } diff --git a/scss/variables/bootstrap/_buttons.scss b/scss/variables/bootstrap/_buttons.scss index 3b816e40..3659c433 100644 --- a/scss/variables/bootstrap/_buttons.scss +++ b/scss/variables/bootstrap/_buttons.scss @@ -1,7 +1,7 @@ // Buttons: $mdb-btn-font-size: .875rem !default; // 14px -$mdb-btn-font-size-lg: 1rem !default; -$mdb-btn-font-size-sm: .75rem !default; // 12px +$mdb-btn-font-size-lg: 1.25rem !default; +$mdb-btn-font-size-sm: .8125rem !default; // 13px $mdb-btn-margin-bottom: .3125rem !default; // 5px // default btn with no specific type designation @@ -31,8 +31,8 @@ $mdb-btn-icon-font-size-sm: (.75 * $mdb-btn-fab-font-size) !default; // // For each of Bootstrap's buttons, define text, background and border color. -$btn-padding-x: 1.875rem !default; // 1rem -$btn-padding-y: .5rem !default; // .375rem +$btn-padding-x: 1rem !default; // 1rem +$btn-padding-y: .46875rem !default; // .375rem achieve a 36dp height $btn-font-weight: 500 !default; // normal // //$btn-primary-color: #fff !default; @@ -62,7 +62,7 @@ $btn-secondary-bg: $body-bg !default; // #fff //$btn-link-disabled-color: $gray-light !default; // //$btn-padding-x-sm: .75rem !default; -//$btn-padding-y-sm: .25rem !default; +$btn-padding-y-sm: .40625rem !default; // achieve a 32dp height was .25rem // //$btn-padding-x-lg: 1.25rem !default; //$btn-padding-y-lg: .75rem !default;