bootstrap 4.0.0.alpha2 → 4.0.0.alpha3

data/assets/stylesheets/bootstrap/mixins/_cards.scss

@@ -0,0 +1,38 @@
+// Card variants
+
+@mixin card-variant($background, $border) {
+  background-color: $background;
+  border-color: $border;
+}
+
+@mixin card-outline-variant($color) {
+  background-color: transparent;
+  border-color: $color;
+}
+
+//
+// Inverse text within a card for use with dark backgrounds
+//
+
+@mixin card-inverse {
+  .card-header,
+  .card-footer {
+    border-bottom: $card-border-width solid rgba(255,255,255,.2);
+  }
+  .card-header,
+  .card-footer,
+  .card-title,
+  .card-blockquote {
+    color: #fff;
+  }
+  .card-link,
+  .card-text,
+  .card-blockquote > footer {
+    color: rgba(255,255,255,.65);
+  }
+  .card-link {
+    @include hover-focus {
+      color: $card-link-hover-color;
+    }
+  }
+}

data/assets/stylesheets/bootstrap/mixins/_pagination.scss

@@ -1,22 +1,20 @@
 // Pagination
 
 @mixin pagination-size($padding-vertical, $padding-horizontal, $font-size, $line-height, $border-radius) {
-  > li {
-    > a,
-    > span {
-      padding: $padding-vertical $padding-horizontal;
-      font-size: $font-size;
-      line-height: $line-height;
-    }
+  .page-link {
+    padding: $padding-vertical $padding-horizontal;
+    font-size: $font-size;
+    line-height: $line-height;
+  }
+
+  .page-item {
     &:first-child {
-      > a,
-      > span {
+      .page-link {
         @include border-left-radius($border-radius);
       }
     }
     &:last-child {
-      > a,
-      > span {
+      .page-link {
         @include border-right-radius($border-radius);
       }
     }

data/lib/bootstrap/version.rb

@@ -1,4 +1,4 @@
 module Bootstrap
-  VERSION       = '4.0.0.alpha2'
-  BOOTSTRAP_SHA = '4d92e2c7ec600d07d4dceb2e9c83d9bcf0ba9268'
+  VERSION       = '4.0.0.alpha3'
+  BOOTSTRAP_SHA = '48938155eb24b4ccdde09426066869504c6dab3c'
 end

data/templates/project/_bootstrap-variables.scss

@@ -1,4 +1,4 @@
-// Override Bootstrap variables here (defaults from bootstrap v4.0.0-alpha):
+// Override Bootstrap variables here (defaults from bootstrap v4.0.0-alpha.2):
 
 //
 // Copy settings from this file into the provided `_custom.scss` to override
@@ -61,6 +61,24 @@
 // $spacer:                     1rem;
 // $spacer-x:                   $spacer;
 // $spacer-y:                   $spacer;
+// $spacers: (
+//   0: (
+//     x:   0,
+//     y:   0
+//   ),
+//   1: (
+//     x:   $spacer-x,
+//     y:   $spacer-y
+//   ),
+//   2: (
+//     x:   ($spacer-x * 1.5),
+//     y:   ($spacer-y * 1.5)
+//   ),
+//   3: (
+//     x:   ($spacer-x * 3),
+//     y:   ($spacer-y * 3)
+//   )
+// );
 // $border-width:               1px;
 
 
@@ -177,10 +195,16 @@
 // $hr-border-color:             rgba(0,0,0,.1);
 // $hr-border-width:             $border-width;
 
+// $dt-font-weight:              bold;
+
+// $nested-kbd-font-weight:      bold;
+
+// $list-inline-padding:         5px;
+
 
 // Components
 //
-// Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
+// Define common padding and border radius sizes and more.
 
 // $line-height-lg:         (4 / 3);
 // $line-height-sm:         1.5;
@@ -208,6 +232,7 @@
 // $table-bg-hover:                #f5f5f5;
 // $table-bg-active:               $table-bg-hover;
 
+// $table-border-width:            $border-width;
 // $table-border-color:            $gray-lighter;
 
 
@@ -266,7 +291,8 @@
 // $input-bg-disabled:              $gray-lighter;
 
 // $input-color:                    $gray;
-// $input-border:                   #ccc;
+// $input-border-color:             #ccc;
+// $input-btn-border-width:         $border-width; // For form controls and buttons
 // $input-box-shadow:               inset 0 1px 1px rgba(0,0,0,.075);
 
 // $input-border-radius:            $border-radius;
@@ -291,7 +317,7 @@
 // $form-group-margin-bottom:       $spacer-y;
 
 // $input-group-addon-bg:           $gray-lighter;
-// $input-group-addon-border-color: $input-border;
+// $input-group-addon-border-color: $input-border-color;
 
 // $cursor-disabled:                not-allowed;
 
@@ -306,7 +332,8 @@
 // Dropdown menu container and contents.
 
 // $dropdown-bg:                    #fff;
-// $dropdown-border:                rgba(0,0,0,.15);
+// $dropdown-border-color:          rgba(0,0,0,.15);
+// $dropdown-border-width:          $border-width;
 // $dropdown-divider-bg:            #e5e5e5;
 
 // $dropdown-link-color:            $gray-dark;
@@ -325,8 +352,6 @@
 //
 // Warning: Avoid customizing these values. They're used for a bird's eye view
 // of components dependent on the z-axis and are designed to all work together.
-//
-// Note: These variables are not generated into the Customizer.
 
 // $zindex-navbar:            1000;
 // $zindex-dropdown:          1000;
@@ -365,6 +390,7 @@
 
 // $nav-tabs-border-color:                     #ddd;
 
+// $nav-tabs-link-border-width:                $border-width;
 // $nav-tabs-link-hover-border-color:          $gray-lighter;
 
 // $nav-tabs-active-link-hover-bg:             $body-bg;
@@ -391,7 +417,8 @@
 
 // $pagination-color:                     $link-color;
 // $pagination-bg:                        #fff;
-// $pagination-border:                    #ddd;
+// $pagination-border-width:              $border-width;
+// $pagination-border-color:              #ddd;
 
 // $pagination-hover-color:               $link-hover-color;
 // $pagination-hover-bg:                  $gray-lighter;
@@ -409,7 +436,8 @@
 // Pager
 
 // $pager-bg:                             $pagination-bg;
-// $pager-border:                         $pagination-border;
+// $pager-border-width:                   $border-width;
+// $pager-border-color:                   $pagination-border-color;
 // $pager-border-radius:                  15px;
 
 // $pager-hover-bg:                       $pagination-hover-bg;
@@ -450,10 +478,10 @@
 // Cards
 // $card-spacer-x:            1.25rem;
 // $card-spacer-y:            .75rem;
-// $card-border-width:        .0625rem;
+// $card-border-width:        1px;
 // $card-border-radius:       $border-radius;
 // $card-border-color:        #e5e5e5;
-// $card-border-radius-inner: ($card-border-radius - $card-border-width);
+// $card-border-radius-inner: $card-border-radius;
 // $card-cap-bg:              #f5f5f5;
 // $card-bg:                  #fff;
 
@@ -475,6 +503,7 @@
 
 // $popover-bg:                          #fff;
 // $popover-max-width:                   276px;
+// $popover-border-width:                $border-width;
 // $popover-border-color:                rgba(0,0,0,.2);
 
 // $popover-title-bg:                    darken($popover-bg, 3%);
@@ -497,6 +526,7 @@
 
 // $label-color:                 #fff;
 // $label-link-hover-color:      #fff;
+// $label-font-weight:           bold;
 
 
 // Modals
@@ -562,7 +592,8 @@
 // List group
 
 // $list-group-bg:                 #fff;
-// $list-group-border:             #ddd;
+// $list-group-border-color:       #ddd;
+// $list-group-border-width:       $border-width;
 // $list-group-border-radius:      $border-radius;
 
 // $list-group-hover-bg:           #f5f5f5;
@@ -584,7 +615,8 @@
 
 // $thumbnail-padding:           .25rem;
 // $thumbnail-bg:                $body-bg;
-// $thumbnail-border:            #ddd;
+// $thumbnail-border-width:      $border-width;
+// $thumbnail-border-color:      #ddd;
 // $thumbnail-border-radius:     $border-radius;
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha2
+  version: 4.0.0.alpha3
 platform: ruby
 authors:
 - Twitter, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-23 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -296,6 +296,7 @@ files:
 - assets/stylesheets/bootstrap/mixins/_border-radius.scss
 - assets/stylesheets/bootstrap/mixins/_breakpoints.scss
 - assets/stylesheets/bootstrap/mixins/_buttons.scss
+- assets/stylesheets/bootstrap/mixins/_cards.scss
 - assets/stylesheets/bootstrap/mixins/_center-block.scss
 - assets/stylesheets/bootstrap/mixins/_clearfix.scss
 - assets/stylesheets/bootstrap/mixins/_forms.scss