update less and mvc package to latest release

update to latest v3.0.2 source and dist release
sirkirby · Nov 13, 2013 · 3d08d04 · 3d08d04
1 parent 89e9a95
commit 3d08d04
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 58 deletions.
diff --git a/Twitter.Bootstrap.Less/Twitter.Bootstrap.Less.nuspec b/Twitter.Bootstrap.Less/Twitter.Bootstrap.Less.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>Twitter.Bootstrap.Less</id>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
         <title>Bootstrap Less Source</title>
         <authors>Jacob Thornton,Mark Otto</authors>
         <owners>sirkirby</owners>
@@ -15,9 +15,7 @@
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.</summary>
-        <releaseNotes>http://blog.getbootstrap.com/2013/10/29/bootstrap-3-0-1-released/
-
-- removed bundled less.js and replaced with package dependency</releaseNotes>
+        <releaseNotes>http://blog.getbootstrap.com/2013/11/06/bootstrap-3-0-2-released/</releaseNotes>
         <language>en-US</language>
         <tags>twitter less css css3 html5 bootstrap responsive</tags>
         <dependencies>

diff --git a/Twitter.Bootstrap.Less/bootstrap.js b/Twitter.Bootstrap.Less/bootstrap.js
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v3.0.1 by @fat and @mdo
+ * Bootstrap v3.0.2 by @fat and @mdo
  * Copyright 2013 Twitter, Inc.
  * Licensed under http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -9,7 +9,7 @@
 if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") }
 
 /* ========================================================================
- * Bootstrap: transition.js v3.0.0
+ * Bootstrap: transition.js v3.0.2
  * http://getbootstrap.com/javascript/#transitions
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -63,10 +63,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     $.support.transition = transitionEnd()
   })
 
-}(window.jQuery);
+}(jQuery);
 
 /* ========================================================================
- * Bootstrap: alert.js v3.0.0
+ * Bootstrap: alert.js v3.0.2
  * http://getbootstrap.com/javascript/#alerts
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -162,10 +162,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 
   $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
 
-}(window.jQuery);
+}(jQuery);
 
 /* ========================================================================
- * Bootstrap: button.js v3.0.0
+ * Bootstrap: button.js v3.0.2
  * http://getbootstrap.com/javascript/#buttons
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -272,10 +272,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     e.preventDefault()
   })
 
-}(window.jQuery);
+}(jQuery);
 
 /* ========================================================================
- * Bootstrap: carousel.js v3.0.0
+ * Bootstrap: carousel.js v3.0.2
  * http://getbootstrap.com/javascript/#carousel
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -490,10 +490,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     })
   })
 
-}(window.jQuery);
+}(jQuery);
 
 /* ========================================================================
- * Bootstrap: collapse.js v3.0.0
+ * Bootstrap: collapse.js v3.0.2
  * http://getbootstrap.com/javascript/#collapse
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -670,10 +670,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     $target.collapse(option)
   })
 
-}(window.jQuery);
+}(jQuery);
 
 /* ========================================================================
- * Bootstrap: dropdown.js v3.0.0
+ * Bootstrap: dropdown.js v3.0.2
  * http://getbootstrap.com/javascript/#dropdowns
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -825,10 +825,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     .on('click.bs.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
     .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
 
-}(window.jQuery);
+}(jQuery);
 
 /* ========================================================================
- * Bootstrap: modal.js v3.0.0
+ * Bootstrap: modal.js v3.0.2
  * http://getbootstrap.com/javascript/#modals
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -1072,10 +1072,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     .on('show.bs.modal',  '.modal', function () { $(document.body).addClass('modal-open') })
     .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
 
-}(window.jQuery);
+}(jQuery);
 
 /* ========================================================================
- * Bootstrap: tooltip.js v3.0.0
+ * Bootstrap: tooltip.js v3.0.2
  * http://getbootstrap.com/javascript/#tooltip
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ========================================================================
@@ -1459,10 +1459,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     return this
   }
 
-}(window.jQuery);
+}(jQuery);
 
 /* ========================================================================
- * Bootstrap: popover.js v3.0.0
+ * Bootstrap: popover.js v3.0.2
  * http://getbootstrap.com/javascript/#popovers
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -1577,10 +1577,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     return this
   }
 
-}(window.jQuery);
+}(jQuery);
 
 /* ========================================================================
- * Bootstrap: scrollspy.js v3.0.0
+ * Bootstrap: scrollspy.js v3.0.2
  * http://getbootstrap.com/javascript/#scrollspy
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -1736,10 +1736,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     })
   })
 
-}(window.jQuery);
+}(jQuery);
 
 /* ========================================================================
- * Bootstrap: tab.js v3.0.0
+ * Bootstrap: tab.js v3.0.2
  * http://getbootstrap.com/javascript/#tabs
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -1872,10 +1872,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     $(this).tab('show')
   })
 
-}(window.jQuery);
+}(jQuery);
 
 /* ========================================================================
- * Bootstrap: affix.js v3.0.0
+ * Bootstrap: affix.js v3.0.2
  * http://getbootstrap.com/javascript/#affix
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -1999,4 +1999,4 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     })
   })
 
-}(window.jQuery);
+}(jQuery);
diff --git a/Twitter.Bootstrap.Less/bootstrap.min.js b/Twitter.Bootstrap.Less/bootstrap.min.js
diff --git a/Twitter.Bootstrap.Less/forms.less b/Twitter.Bootstrap.Less/forms.less
@@ -92,14 +92,6 @@ output {
   vertical-align: middle;
 }
 
-// Placeholder
-//
-// Placeholder text gets special styles because when browsers invalidate entire
-// lines if it doesn't understand a selector/
-.form-control {
-  .placeholder();
-}
-
 
 // Common form controls
 //
@@ -142,6 +134,12 @@ output {
   // Customize the `:focus` state to imitate native WebKit styles.
   .form-control-focus();
 
+  // Placeholder
+  //
+  // Placeholder text gets special styles because when browsers invalidate entire
+  // lines if it doesn't understand a selector/
+  .placeholder();
+
   // Disabled and read-only inputs
   // Note: HTML5 says that controls under a fieldset > legend:first-child won't
   // be disabled if the fieldset is disabled. Due to implementation difficulty,

diff --git a/Twitter.Bootstrap.Less/mixins.less b/Twitter.Bootstrap.Less/mixins.less
@@ -750,7 +750,7 @@
   .col(1); // kickstart it
 }
 
-.calc-grid(@index, @class, @type) when (@type = width) {
+.calc-grid(@index, @class, @type) when (@type = width) and (@index > 0) {
   .col-@{class}-@{index} {
     width: percentage((@index / @grid-columns));
   }
@@ -772,7 +772,7 @@
 }
 
 // Basic looping in LESS
-.make-grid(@index, @class, @type) when (@index > 0) {
+.make-grid(@index, @class, @type) when (@index >= 0) {
   .calc-grid(@index, @class, @type);
   // next iteration
   .make-grid(@index - 1, @class, @type);

diff --git a/Twitter.Bootstrap.Less/panels.less b/Twitter.Bootstrap.Less/panels.less
@@ -96,7 +96,7 @@
   border-bottom: 1px solid transparent;
   .border-top-radius(@panel-border-radius - 1);
 
-  & > .dropdown .dropdown-toggle {
+  > .dropdown .dropdown-toggle {
     color: inherit;
   }
 }

diff --git a/Twitter.Bootstrap.Less/thumbnails.less b/Twitter.Bootstrap.Less/thumbnails.less
@@ -14,18 +14,17 @@
     margin-left: auto;
     margin-right: auto;
   }
-}
-
 
-// Add a hover state for linked versions only
-a.thumbnail:hover,
-a.thumbnail:focus,
-a.thumbnail.active {
-  border-color: @link-color;
-}
+  // Add a hover state for linked versions only
+  a&:hover,
+  a&:focus,
+  a&.active {
+    border-color: @link-color;
+  }
 
-// Image captions
-.thumbnail .caption {
-  padding: @thumbnail-caption-padding;
-  color: @thumbnail-caption-color;
+  // Image captions
+  .caption {
+    padding: @thumbnail-caption-padding;
+    color: @thumbnail-caption-color;
+  }
 }
diff --git a/Twitter.Bootstrap.MVC/Twitter.Bootstrap.MVC.nuspec b/Twitter.Bootstrap.MVC/Twitter.Bootstrap.MVC.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>Twitter.Bootstrap.MVC</id>
-        <version>2.1.2</version>
+        <version>2.1.3</version>
         <title>Bootstrap for MVC 5</title>
         <authors>Chris Kirby</authors>
         <owners>sirkirby</owners>
@@ -11,14 +11,15 @@
         <iconUrl>http://blog.getbootstrap.com/public/ico/apple-touch-icon-144-precomposed.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>This package is meant to complement those using the Twitter.Bootstrap library in their MVC 5 application. Upon installation it adds bundling and minification support for easy integration into your shared layouts and views. Issues? Please post them here https://github.com/sirkirby/twitter-bootstrap-nuget/issues</description>
-        <releaseNotes>- new release for Bootstrap v3.0.1
-- Now takes dependency on Outercurve Bootstrap package.</releaseNotes>
+        <releaseNotes>- new release for Bootstrap v3.0.2
+
+http://blog.getbootstrap.com/2013/11/06/bootstrap-3-0-2-released/</releaseNotes>
         <tags>twitter boostrap mvc mvc5 bundles javascript css</tags>
         <dependencies>
             <dependency id="Microsoft.AspNet.Mvc" version="5.0.0" />
             <dependency id="Microsoft.AspNet.Web.Optimization" version="1.1.1" />
             <dependency id="WebActivatorEx" version="2.0.3" />
-            <dependency id="bootstrap" version="3.0.1" />
+            <dependency id="bootstrap" version="3.0.2" />
         </dependencies>
     </metadata>
     <files>