feat(bootstrap): upgrade from v3.2 to v3.3.1

[Finishes #80779088]
pivotal-cf · Nov 19, 2014 · ff1701d · ff1701d
1 parent 9db28a9
commit ff1701d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 38 deletions.
diff --git a/package.json b/package.json
@@ -51,7 +51,7 @@
   "version": "1.1.1",
   "main": "Gruntfile.js",
   "dependencies": {
-    "bootstrap-sass": "~3.2.0",
+    "bootstrap-sass": "~3.3.0",
     "envify": "^1.2.1",
     "font-awesome": "^4.2.0",
     "jquery": "^2.1.1",

diff --git a/src/pivotal-ui/components/media.scss b/src/pivotal-ui/components/media.scss
@@ -187,40 +187,3 @@ For example, `.media-stackable-xs` is stacked on screen sizes from 0-480px and t
     width: 1000000px;
   }
 }
-
-/* To be removed when Bootstrap accepts PR #14801 and releases a new version */
-.media {
-  // Proper spacing between instances of .media
-  margin-top: 15px;
-
-  // Proper spacing of .media-right
-  .media-right,
-  .pull-right {
-    padding-left: 10px;
-  }
-
-  // Proper spacing of .media-left
-  .media-left,
-  .pull-left {
-    padding-right: 10px;
-  }
-
-  &:first-child {
-    margin-top: 0;
-  }
-
-  .media-left,
-  .media-right,
-  .media-body {
-    display: table-cell;
-    vertical-align: top;
-  }
-
-  .media-middle {
-    vertical-align: middle;
-  }
-
-  .media-bottom {
-    vertical-align: bottom;
-  }
-}
diff --git a/src/pivotal-ui/components/variables.scss b/src/pivotal-ui/components/variables.scss
@@ -109,6 +109,7 @@ $neutral-11: $gray-11;
 // Grays (Bootstrap only, don't use directly) TODO: can we eliminate these entirely without modifying bootstrap base files?
 // -------------------------
 
+$gray-base:              #000 !default;
 $gray-darker:            lighten(#000, 13.5%) !default; // #222 bootstrap only
 $gray-dark:              lighten(#000, 20%) !default;   // #333 bootstrap only
 $gray:                   lighten(#000, 33.5%) !default; // #555 bootstrap only
@@ -217,6 +218,7 @@ $text-color:            $gray-3 !default;
 
 $link-color:                              $blue-2;
 $link-hover-color:                        $dark-1;
+$link-hover-decoration:                   underline !default;
 
 $link-lowlight-color:                     $blue-4;
 $link-lowlight-hover-color:               $blue-2;
@@ -443,10 +445,13 @@ $btn-link-disabled-color:        $gray-light !default;
 
 $input-bg:                       #fff !default;
 $input-bg-disabled:              $gray-lighter !default;
+$progress-border-radius:         $border-radius-base !default;
 
 $input-color:                    $gray !default;
 $input-border:                   #ccc !default;
 $input-border-radius:            $border-radius-small !default;
+$input-border-radius-large:      $border-radius-large !default;
+$input-border-radius-small:      $border-radius-small !default;
 $input-border-focus:             $blue-3 !default;
 $input-border-width:             1px !default;
 
@@ -461,6 +466,7 @@ $legend-border-color:            #e5e5e5 !default;
 
 $input-group-addon-bg:           $gray-lighter !default;
 $input-group-addon-border-color: $input-border !default;
+$cursor-disabled:                not-allowed !default;
 
 
 // Dropdowns