From fec2a1d10f050a44de7092cd79a79c45f96c8298 Mon Sep 17 00:00:00 2001 From: Catalin Zalog Date: Wed, 14 Oct 2015 19:50:03 +0300 Subject: [PATCH 1/4] v4 - .c-select on background inherits white This: ```
``` render this: http://s.zalog.ro/2015-10-14-19-45-11.png --- scss/_custom-forms.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index 1fec265c60..6cefd7c943 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; From 470ec4cece78a94b5b64918a27c2081ecf7b0cab Mon Sep 17 00:00:00 2001 From: Supergibbs Date: Thu, 15 Oct 2015 17:03:56 -0700 Subject: [PATCH 2/4] Added NuGet version badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 2eb9b3a883..d5428250c8 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. From d0ebe80c3d6bef98458bfed217e85d7b7644d2c7 Mon Sep 17 00:00:00 2001 From: Supergibbs Date: Fri, 16 Oct 2015 13:33:18 -0700 Subject: [PATCH 3/4] Added nuspec files so MyGet can build and publish NuGet packages --- nuget/MyGet.ps1 | 8 ++++++++ nuget/bootstrap.nuspec | 27 +++++++++++++++++++++++++++ nuget/bootstrap.sass.nuspec | 27 +++++++++++++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 nuget/MyGet.ps1 create mode 100644 nuget/bootstrap.nuspec create mode 100644 nuget/bootstrap.sass.nuspec diff --git a/nuget/MyGet.ps1 b/nuget/MyGet.ps1 new file mode 100644 index 0000000000..ad17dea91f --- /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 0000000000..835388b036 --- /dev/null +++ b/nuget/bootstrap.nuspec @@ -0,0 +1,27 @@ + + + + bootstrap + 4.0.0-alpha + Bootstrap CSS + Twitter, Inc. + bootstrap + The most popular front-end framework for developing responsive, mobile first projects on the web. + http://blog.getbootstrap.com + Bootstrap framework in CSS. Includes fonts and JavaScript + en-us + http://getbootstrap.com + http://getbootstrap.com/apple-touch-icon.png + https://github.com/twbs/bootstrap/blob/master/LICENSE + Copyright 2015 + false + + + + css js less mobile-first responsive front-end framework web + + + + + + \ No newline at end of file diff --git a/nuget/bootstrap.sass.nuspec b/nuget/bootstrap.sass.nuspec new file mode 100644 index 0000000000..fb31ed5262 --- /dev/null +++ b/nuget/bootstrap.sass.nuspec @@ -0,0 +1,27 @@ + + + + bootstrap.sass + 4.0.0-alpha + Bootstrap Sass + Twitter, Inc. + bootstrap + The most popular front-end framework for developing responsive, mobile first projects on the web. + http://blog.getbootstrap.com + Bootstrap framework in Sass. Includes fonts and JavaScript + en-us + http://getbootstrap.com + http://getbootstrap.com/apple-touch-icon.png + https://github.com/twbs/bootstrap/blob/master/LICENSE + Copyright 2015 + false + + + + css js less mobile-first responsive front-end framework web + + + + + + \ No newline at end of file From 8b0d737a56a7f92f926479fb361e7cd95e64ee1b Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 8 Dec 2015 00:01:44 -0800 Subject: [PATCH 4/4] scss/_pagination.scss: Reassert #18257 [skip sauce] --- scss/_pagination.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_pagination.scss b/scss/_pagination.scss index f2716aa539..d0c3765df8 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;