Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev

6 files changed, 65 insertions, 1 deletions

diff --git a/README.md b/README.md
index 1e21c9a2a..250d2ed0c 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@
 [![npm version](https://img.shields.io/npm/v/bootstrap.svg)](https://www.npmjs.com/package/bootstrap)
 [![Build Status](https://img.shields.io/travis/twbs/bootstrap/master.svg)](https://travis-ci.org/twbs/bootstrap)
 [![devDependency Status](https://img.shields.io/david/dev/twbs/bootstrap.svg)](https://david-dm.org/twbs/bootstrap#info=devDependencies)
+[![NuGet](https://img.shields.io/nuget/vpre/bootstrap.svg)](https://www.nuget.org/packages/bootstrap/4.0.0-alpha)
 [![Selenium Test Status](https://saucelabs.com/browser-matrix/bootstrap.svg)](https://saucelabs.com/u/bootstrap)
 
 Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created by [Mark Otto](https://twitter.com/mdo) and [Jacob Thornton](https://twitter.com/fat), and maintained by the [core team](https://github.com/orgs/twbs/people) with the massive support and involvement of the community.
diff --git a/nuget/MyGet.ps1 b/nuget/MyGet.ps1
new file mode 100644
index 000000000..ad17dea91
--- /dev/null
+++ b/nuget/MyGet.ps1
@@ -0,0 +1,8 @@
+$nuget = $env:NuGet
+
+#parse the version number out of package.json
+$bsversion = ((Get-Content $env:SourcesPath\package.json) -join "`n" | ConvertFrom-Json).version
+
+#create packages
+& $nuget pack "nuget\bootstrap.nuspec" -Verbosity detailed -NonInteractive -NoPackageAnalysis -BasePath $env:SourcesPath -Version $bsversion
+& $nuget pack "nuget\bootstrap.less.nuspec" -Verbosity detailed -NonInteractive -NoPackageAnalysis -BasePath $env:SourcesPath -Version $bsversion
\ No newline at end of file
diff --git a/nuget/bootstrap.nuspec b/nuget/bootstrap.nuspec
new file mode 100644
index 000000000..835388b03
--- /dev/null
+++ b/nuget/bootstrap.nuspec
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    <id>bootstrap</id>
+    <version>4.0.0-alpha</version>
+    <title>Bootstrap CSS</title>
+    <authors>Twitter, Inc.</authors>
+    <owners>bootstrap</owners>
+	<description>The most popular front-end framework for developing responsive, mobile first projects on the web.</description>
+	<releaseNotes>http://blog.getbootstrap.com</releaseNotes>
+	<summary>Bootstrap framework in CSS. Includes fonts and JavaScript</summary>
+	<language>en-us</language>
+	<projectUrl>http://getbootstrap.com</projectUrl>
+    <iconUrl>http://getbootstrap.com/apple-touch-icon.png</iconUrl>
+	<licenseUrl>https://github.com/twbs/bootstrap/blob/master/LICENSE</licenseUrl>
+    <copyright>Copyright 2015</copyright>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <dependencies>
+      <dependency id="jQuery" version="2.0.0" />
+    </dependencies>
+	<tags>css js less mobile-first responsive front-end framework web</tags>
+  </metadata>
+  <files>
+    <file src="dist\css\*.*" target="content\Content" />
+    <file src="dist\js\bootstrap*.js" target="content\Scripts" />
+  </files>
+</package>
\ No newline at end of file
diff --git a/nuget/bootstrap.sass.nuspec b/nuget/bootstrap.sass.nuspec
new file mode 100644
index 000000000..fb31ed526
--- /dev/null
+++ b/nuget/bootstrap.sass.nuspec
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    <id>bootstrap.sass</id>
+    <version>4.0.0-alpha</version>
+    <title>Bootstrap Sass</title>
+    <authors>Twitter, Inc.</authors>
+    <owners>bootstrap</owners>
+	<description>The most popular front-end framework for developing responsive, mobile first projects on the web.</description>
+    <releaseNotes>http://blog.getbootstrap.com</releaseNotes>
+	<summary>Bootstrap framework in Sass. Includes fonts and JavaScript</summary>
+	<language>en-us</language>
+	<projectUrl>http://getbootstrap.com</projectUrl>
+    <iconUrl>http://getbootstrap.com/apple-touch-icon.png</iconUrl>
+	<licenseUrl>https://github.com/twbs/bootstrap/blob/master/LICENSE</licenseUrl>
+    <copyright>Copyright 2015</copyright>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <dependencies>
+      <dependency id="jQuery" version="2.0.0" />
+    </dependencies>
+	<tags>css js less mobile-first responsive front-end framework web</tags>
+  </metadata>
+  <files>
+    <file src="scss\**\*.scss" target="content\Content\bootstrap" />
+    <file src="dist\js\bootstrap*.js" target="content\Scripts" />
+  </files>
+</package>
\ No newline at end of file
diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss
index 17b6a5e48..6e013fbec 100644
--- a/scss/_custom-forms.scss
+++ b/scss/_custom-forms.scss
@@ -135,6 +135,7 @@
   padding: .375rem 1.75rem .375rem .75rem;
   padding-right: .75rem \9;
   vertical-align: middle;
+  color: $input-color;
   background: #fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAUCAMAAACzvE1FAAAADFBMVEUzMzMzMzMzMzMzMzMKAG/3AAAAA3RSTlMAf4C/aSLHAAAAPElEQVR42q3NMQ4AIAgEQTn//2cLdRKppSGzBYwzVXvznNWs8C58CiussPJj8h6NwgorrKRdTvuV9v16Afn0AYFOB7aYAAAAAElFTkSuQmCC) no-repeat right .75rem center;
   background-image: none \9;
   background-size: 8px 10px;
diff --git a/scss/_pagination.scss b/scss/_pagination.scss
index f2716aa53..d0c3765df 100644
--- a/scss/_pagination.scss
+++ b/scss/_pagination.scss
@@ -50,7 +50,7 @@
   color: $pagination-color;
   text-decoration: none;
   background-color: $pagination-bg;
-  border: 1px solid $pagination-border-color;
+  border: $pagination-border-width solid $pagination-border-color;
 
   @include hover-focus {
     color: $pagination-hover-color;