From: Mark Otto <markdotto@gmail.com>
Date: Tue, 23 Jun 2015 01:57:56 +0000 (-0700)
Subject: drop more -base, clean up var spacing
X-Git-Tag: v4.0.0-alpha~161
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75cf69a1ab9bf36147ab237c937b46751b981200;p=thirdparty%2Fbootstrap.git

drop more -base, clean up var spacing
---

diff --git a/scss/_buttons.scss b/scss/_buttons.scss
index 8ce527a00c..e743fab121 100644
--- a/scss/_buttons.scss
+++ b/scss/_buttons.scss
@@ -17,7 +17,7 @@
   cursor: pointer;
   user-select: none;
   border: $border-width solid transparent;
-  @include button-size($padding-base-y, $padding-base-x, $font-size-base, $line-height-base, $btn-border-radius);
+  @include button-size($padding-y, $padding-x, $font-size-base, $line-height-base, $btn-border-radius);
   transition: all .2s ease-in-out;
 
   &,
diff --git a/scss/_forms.scss b/scss/_forms.scss
index 6f7d7f962c..1632c38987 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -12,7 +12,7 @@
   width: 100%;
   // // Make inputs at least the height of their button counterpart (base line-height + padding + border)
   // height: $input-height;
-  padding: $padding-base-y $padding-base-x;
+  padding: $padding-y $padding-x;
   font-size: $font-size-base;
   line-height: $line-height-base;
   color: $input-color;
@@ -83,7 +83,7 @@
 // For use with horizontal and inline forms, when you need the label text to
 // align with the form controls.
 .form-control-label {
-  padding: ($padding-base-y + $border-width) $padding-base-x;
+  padding: ($padding-y + $border-width) $padding-x;
   margin-bottom: 0; // Override the `<label>` default
 }
 
@@ -127,8 +127,8 @@
 .form-control-static {
   min-height: $input-height;
   // Size it appropriately next to real form controls
-  padding-top: ($padding-base-y + $border-width);
-  padding-bottom: ($padding-base-y + $border-width);
+  padding-top: ($padding-y + $border-width);
+  padding-bottom: ($padding-y + $border-width);
   // Remove default margin from `p`
   margin-bottom: 0;
 
diff --git a/scss/_input-group.scss b/scss/_input-group.scss
index 5e8ac13800..b69fafb708 100644
--- a/scss/_input-group.scss
+++ b/scss/_input-group.scss
@@ -85,7 +85,7 @@
 //
 
 .input-group-addon {
-  padding: $padding-base-y $padding-base-x;
+  padding: $padding-y $padding-x;
   font-size: $font-size-base;
   font-weight: normal;
   line-height: 1;
diff --git a/scss/_pagination.scss b/scss/_pagination.scss
index d6d4fda828..11b306e619 100644
--- a/scss/_pagination.scss
+++ b/scss/_pagination.scss
@@ -17,7 +17,7 @@
     > span {
       position: relative;
       float: left; // Collapse white-space
-      padding: $padding-base-y $padding-base-x;
+      padding: $padding-y $padding-x;
       margin-left: -1px;
       line-height: $line-height-base;
       color: $pagination-color;
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 3b199ccbd7..930bed7bad 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -96,29 +96,29 @@ $headings-color:             inherit !default;
 //
 // Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
 
-$padding-base-y:     .5rem !default;
-$padding-base-x:   .75rem !default;
+$padding-y:              .5rem !default;
+$padding-x:              .75rem !default;
 
-$padding-lg-y:    .75rem !default;
-$padding-lg-x:  1.5rem !default;
+$padding-lg-y:           .75rem !default;
+$padding-lg-x:           1.5rem !default;
 
-$padding-sm-y:    .275rem !default;
-$padding-sm-x:  .75rem !default;
+$padding-sm-y:           .275rem !default;
+$padding-sm-x:           .75rem !default;
 
-$padding-xs-y:       .2rem !default;
-$padding-xs-x:     .5rem !default;
+$padding-xs-y:           .2rem !default;
+$padding-xs-x:           .5rem !default;
 
 $line-height-lg:         (4/3) !default;
 $line-height-sm:         1.5 !default;
 
-$border-radius:        .25rem !default;
+$border-radius:          .25rem !default;
 $border-radius-lg:       .3rem !default;
 $border-radius-sm:       .2rem !default;
 
-$component-active-color:    #fff !default;
-$component-active-bg:       $brand-primary !default;
+$component-active-color: #fff !default;
+$component-active-bg:    $brand-primary !default;
 
-$caret-width:          .3em !default;
+$caret-width:            .3em !default;
 $caret-width-lg:         $caret-width !default;
 
 
@@ -170,7 +170,7 @@ $btn-danger-border:              darken($btn-danger-bg, 5%) !default;
 $btn-link-disabled-color:        $gray-light !default;
 
 // Allows for customizing button radius independently from global border radius
-$btn-border-radius:         $border-radius;
+$btn-border-radius:              $border-radius;
 $btn-border-radius-lg:           $border-radius-lg;
 $btn-border-radius-sm:           $border-radius-sm;
 
@@ -192,7 +192,7 @@ $input-box-shadow-focus:         rgba(102,175,233,.6) !default;
 
 $input-color-placeholder:        #999 !default;
 
-$input-height:              (($font-size-base * $line-height-base) + ($padding-base-y * 2) + ($border-width * 2)) !default;
+$input-height:                   (($font-size-base * $line-height-base) + ($padding-y * 2) + ($border-width * 2)) !default;
 $input-height-lg:                (($font-size-lg * $line-height-lg) + ($padding-lg-y * 2) + ($border-width * 2)) !default;
 $input-height-sm:                (($font-size-sm * $line-height-sm) + ($padding-sm-y * 2) + ($border-width * 2)) !default;