BS renaming (#1175)

This commit is contained in:
Emmanuel Veyrat 2017-05-03 13:14:10 +02:00 committed by Federico Zivolo
parent 14068a9438
commit 38d19b2818
4 changed files with 23 additions and 23 deletions

View File

@ -165,11 +165,11 @@
// Size variations
&.btn-lg,
.btn-group-lg & {
@include button-size($btn-padding-y-lg, $btn-padding-x-lg, $bmd-btn-font-size-lg, $btn-border-radius-lg);
@include button-size($input-btn-padding-y-lg, $input-btn-padding-x-lg, $bmd-btn-font-size-lg, $line-height-lg, $btn-border-radius-lg);
}
&.btn-sm,
.btn-group-sm & {
@include button-size($btn-padding-y-sm, $btn-padding-x-sm, $bmd-btn-font-size-sm, $btn-border-radius-sm);
@include button-size($input-btn-padding-y-sm, $input-btn-padding-x-sm, $bmd-btn-font-size-sm, $line-height-sm, $btn-border-radius-sm);
font-size: $bmd-btn-font-size-sm;
}
}

View File

@ -13,11 +13,11 @@
// default margin - no form-group required
@include input-group-button-variation(input-padding-y);
&.bmd-form-group-sm {
.bmd-form-group-sm {
@include input-group-button-variation($input-padding-y-sm);
}
&.bmd-form-group-lg {
.bmd-form-group-lg {
@include input-group-button-variation($input-padding-y-lg);
}

View File

@ -185,22 +185,22 @@
@mixin bmd-raised-button-color() {
&.btn-primary {
@include bmd-raised-button-variant($btn-primary-color, $btn-primary-bg, $btn-primary-border);
@include bmd-raised-button-variant($btn-primary-color, $btn-primary-bg, $btn-primary-border-color);
}
&.btn-secondary {
@include bmd-raised-button-variant($btn-secondary-color, $btn-secondary-bg, $btn-secondary-border);
@include bmd-raised-button-variant($btn-secondary-color, $btn-secondary-bg, $btn-secondary-border-color);
}
&.btn-info {
@include bmd-raised-button-variant($btn-info-color, $btn-info-bg, $btn-info-border);
@include bmd-raised-button-variant($btn-info-color, $btn-info-bg, $btn-info-border-color);
}
&.btn-success {
@include bmd-raised-button-variant($btn-success-color, $btn-success-bg, $btn-success-border);
@include bmd-raised-button-variant($btn-success-color, $btn-success-bg, $btn-success-border-color);
}
&.btn-warning {
@include bmd-raised-button-variant($btn-warning-color, $btn-warning-bg, $btn-warning-border);
@include bmd-raised-button-variant($btn-warning-color, $btn-warning-bg, $btn-warning-border-color);
}
&.btn-danger {
@include bmd-raised-button-variant($btn-danger-color, $btn-danger-bg, $btn-danger-border);
@include bmd-raised-button-variant($btn-danger-color, $btn-danger-bg, $btn-danger-border-color);
}
}

View File

@ -30,9 +30,9 @@ $bmd-btn-icon-font-size-sm: (.75 * $bmd-btn-fab-font-size) !default;
// Buttons
//
// For each of Bootstrap's buttons, define text, background and border color.
$btn-padding-x: 1rem !default; // 1rem
$btn-padding-y: .46875rem !default; // .5rem achieve a 36dp height
//$btn-line-height: 1 !default; //1.25
$input-btn-padding-x: 1rem !default; // 1rem
$input-btn-padding-y: .46875rem !default; // .5rem achieve a 36dp height
//$input-btn-line-height: 1 !default; //1.25
$btn-font-weight: 500 !default; // normal
$btn-box-shadow: none !default;
$btn-active-box-shadow: none !default; // inset 0 3px 5px rgba(0,0,0,.125)
@ -40,35 +40,35 @@ $btn-active-box-shadow: none !default; // inset 0 3px 5px rgba(0,0,0,.1
//
//$btn-primary-color: #fff !default;
//$btn-primary-bg: $brand-primary !default;
//$btn-primary-border: $btn-primary-bg !default;
//$btn-primary-border-color: $btn-primary-bg !default;
//
$btn-secondary-color: $gray-dark !default;
$btn-secondary-bg: $body-bg !default; // #fff
//$btn-secondary-border: #ccc !default;
//$btn-secondary-border-color: #ccc !default;
//
//$btn-info-color: #fff !default;
//$btn-info-bg: $brand-info !default;
//$btn-info-border: $btn-info-bg !default;
//$btn-info-border-color: $btn-info-bg !default;
//
//$btn-success-color: #fff !default;
//$btn-success-bg: $brand-success !default;
//$btn-success-border: $btn-success-bg !default;
//$btn-success-border-color: $btn-success-bg !default;
//
//$btn-warning-color: #fff !default;
//$btn-warning-bg: $brand-warning !default;
//$btn-warning-border: $btn-warning-bg !default;
//$btn-warning-border-color: $btn-warning-bg !default;
//
//$btn-danger-color: #fff !default;
//$btn-danger-bg: $brand-danger !default;
//$btn-danger-border: $btn-danger-bg !default;
//$btn-danger-border-color: $btn-danger-bg !default;
//
//$btn-link-disabled-color: $gray-light !default;
//
//$btn-padding-x-sm: .5rem !default;
$btn-padding-y-sm: .40625rem !default; // achieve a 32dp height was .25rem
//$input-btn-padding-x-sm: .5rem !default;
$input-btn-padding-y-sm: .40625rem !default; // achieve a 32dp height was .25rem
//
//$btn-padding-x-lg: 1.5rem !default;
//$btn-padding-y-lg: .75rem !default;
//$input-btn-padding-x-lg: 1.5rem !default;
//$input-btn-padding-y-lg: .75rem !default;
//
//// Allows for customizing button radius independently from global border radius
//$btn-border-radius: $border-radius !default;