From 2428904b4b2c293525b3a13bbe88ac60d9c7d5c2 Mon Sep 17 00:00:00 2001 From: Francisco arenas Date: Thu, 24 Jan 2013 03:37:52 -0200 Subject: [PATCH 1/9] Update less/mixins.less horizontal three color gradient added --- less/mixins.less | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/less/mixins.less b/less/mixins.less index b734bab2dc..6980ab3cfd 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -437,6 +437,17 @@ background-image: -o-linear-gradient(@deg, @startColor, @endColor); // Opera 11.10 background-image: linear-gradient(@deg, @startColor, @endColor); // Standard, IE10 } + .horizontal-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) { + background-color: mix(@midColor, @endColor, 80%); + background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor)); + background-image: -webkit-linear-gradient(left, @startColor, @midColor @colorStop, @endColor); + background-image: -moz-linear-gradient(left, @startColor, @midColor @colorStop, @endColor); + background-image: -o-linear-gradient(left, @startColor, @midColor @colorStop, @endColor); + background-image: linear-gradient(to right, @startColor, @midColor @colorStop, @endColor); + background-repeat: no-repeat; + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down, gets no color-stop at all for proper fallback + } + .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) { background-color: mix(@midColor, @endColor, 80%); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor)); From e38d08d4c0c23e678549b10f96286b37a7d8c7ed Mon Sep 17 00:00:00 2001 From: RJ Regenold Date: Thu, 31 Jan 2013 09:06:37 -0600 Subject: [PATCH 2/9] fixes jankiness with anchor tags in carousel. --- docs/assets/css/bootstrap.css | 4 +++- less/carousel.less | 12 +++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c0c5ac91e3..6c568a9180 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5917,7 +5917,9 @@ a.badge:hover { transition: 0.6s ease-in-out left; } -.carousel-inner > .item > img { +.carousel-inner > .item > img, +.carousel-inner > .item > a, +.carousel-inner > .item > img > a { display: block; line-height: 1; } diff --git a/less/carousel.less b/less/carousel.less index b321e5bb5a..f87bf489cf 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -21,12 +21,14 @@ display: none; position: relative; .transition(.6s ease-in-out left); - } - // Account for jankitude on images - > .item > img { - display: block; - line-height: 1; + // Account for jankitude on images + > img, + > a, + > img > a { + display: block; + line-height: 1; + } } > .active, From ed2cf5b3e3e195d5ccf77b9e36c9508a877ccdd6 Mon Sep 17 00:00:00 2001 From: RJ Regenold Date: Thu, 31 Jan 2013 11:04:12 -0600 Subject: [PATCH 3/9] its not dyslexic being easy. --- less/carousel.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/less/carousel.less b/less/carousel.less index f87bf489cf..6280e6a146 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -25,7 +25,7 @@ // Account for jankitude on images > img, > a, - > img > a { + > a > img { display: block; line-height: 1; } From 6014e630547d08dcc9610546e4f04aaac0c30be5 Mon Sep 17 00:00:00 2001 From: RJ Regenold Date: Thu, 31 Jan 2013 11:10:41 -0600 Subject: [PATCH 4/9] lets see how much i can mess this pull request up. :| --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 6c568a9180..bb05c79d51 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5919,7 +5919,7 @@ a.badge:hover { .carousel-inner > .item > img, .carousel-inner > .item > a, -.carousel-inner > .item > img > a { +.carousel-inner > .item > a > img { display: block; line-height: 1; } From 2f44d8d2dac855ecaeb0ad4ac460c83bb2ca321b Mon Sep 17 00:00:00 2001 From: RJ Regenold Date: Thu, 31 Jan 2013 12:49:53 -0600 Subject: [PATCH 5/9] removes anchor tag definition. --- docs/assets/css/bootstrap.css | 1 - less/carousel.less | 1 - 2 files changed, 2 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index bb05c79d51..e09e1e23a0 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5918,7 +5918,6 @@ a.badge:hover { } .carousel-inner > .item > img, -.carousel-inner > .item > a, .carousel-inner > .item > a > img { display: block; line-height: 1; diff --git a/less/carousel.less b/less/carousel.less index 6280e6a146..83045e541a 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -24,7 +24,6 @@ // Account for jankitude on images > img, - > a, > a > img { display: block; line-height: 1; From b7b2e4f8a1bda965442668869e1dc5e5118fd985 Mon Sep 17 00:00:00 2001 From: Nikhil Dabas Date: Sat, 2 Feb 2013 02:04:30 +0530 Subject: [PATCH 6/9] Fixing inline lists for IE7 --- docs/assets/css/bootstrap.css | 2 ++ less/type.less | 1 + 2 files changed, 3 insertions(+) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c0c5ac91e3..ca9c699b61 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -835,8 +835,10 @@ ol.inline { ul.inline > li, ol.inline > li { display: inline-block; + *display: inline; padding-right: 5px; padding-left: 5px; + *zoom: 1; } dl { diff --git a/less/type.less b/less/type.less index 9afff93ac5..7eabfd9ad6 100644 --- a/less/type.less +++ b/less/type.less @@ -125,6 +125,7 @@ ol.inline { list-style: none; > li { display: inline-block; + .ie7-inline-block(); padding-left: 5px; padding-right: 5px; } From d2ea2cdeddbfda468f9d972e7d76c29525bd7cd5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 1 Feb 2013 21:41:02 -0800 Subject: [PATCH 7/9] add horizontal-three-color gradient test --- less/tests/css-tests.css | 13 ++++++++++++- less/tests/css-tests.html | 3 +++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/less/tests/css-tests.css b/less/tests/css-tests.css index 9edaf69bfb..0f5604ee68 100644 --- a/less/tests/css-tests.css +++ b/less/tests/css-tests.css @@ -136,4 +136,15 @@ body { background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} \ No newline at end of file +} + +.gradient-horizontal-three { + background-color: #00b3ee; + background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from(#00b3ee), color-stop(50%, #7a43b6), to(#c3325f)); + background-image: -webkit-linear-gradient(left, #00b3ee, #7a43b6 50%, #c3325f); + background-image: -moz-linear-gradient(left, #00b3ee, #7a43b6 50%, #c3325f); + background-image: -o-linear-gradient(left, #00b3ee, #7a43b6 50%, #c3325f); + background-image: linear-gradient(to right, #00b3ee, #7a43b6 50%, #c3325f); + background-repeat: no-repeat; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00b3ee', endColorstr='#c3325f', GradientType=0); +} diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html index 035ba8bd44..98496b7620 100644 --- a/less/tests/css-tests.html +++ b/less/tests/css-tests.html @@ -1291,6 +1291,9 @@

Striped

+

Horizontal three colors

+
+ From b1f1d7871fb4eaf0418a8ff4e626aa3dda0d4049 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 2 Feb 2013 18:57:24 -0800 Subject: [PATCH 8/9] Add changelog file to repo instead of relying on the wiki --- CHANGELOG.md | 324 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 324 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000000..2353014781 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,324 @@ +## 2.2.2 (December 8, 2012) + +Bugfix release addressing docs, CSS, and some JavaScript issues. Key changes include: + +- **Docs:** + - Assets (illustrations and examples) are now retina-ready. + - Replaced [Placehold.it](http://placehold.it) with [Holder.js](http://imsky.github.com/holder/), a client-side and retina-ready placeholder image tool. +- **Dropdowns:** Temporary fix added for dropdowns on mobile to prevent them from closing early. +- **Popovers:** + - No longer inherits `font-size: 0;` when placed in button groups. + - Arrows refactored to work in IE8, and use less code. + - Plugin no longer inserts popover content into a `

`, but rather directly into `.popover-content`. +- **Labels and badges:** Now [automatically collapse](https://github.com/twitter/bootstrap/commit/ead5dbeba5cd7acfa560bfb353f5e7c4f4a19256) if they have no content. +- **Tables:** Nesting support with `.table-bordered` and `.table-striped` greatly improved. +- **Typeahead:** + - Now [inserts dropdown menu after the input](https://github.com/twitter/bootstrap/commit/1747caf19d59cad7fdc90ae56a00e0e2849f95f4) instead of at the close of the document. + - Hitting escape will place focus back on the ``. +- Print styles, from HTML5 Boilerplate, have been added. + +See more on the [2.2.2 milestone](https://github.com/twitter/bootstrap/issues?milestone=17&state=closed). + + +## 2.2.1 (October 30, 2012) + +Hotfix release to address the carousel bug reports. + + +## 2.2.0 (October 29, 2012) + +### tl;dr + +2.1.2 is now 2.2.0: four new example templates, added media component, new typographic scale, fixed that box-shadow mixin bug, fixed z-index issues, and [more](https://github.com/twitter/bootstrap/issues?milestone=15&page=1&state=closed). + +### Highlights + +- **Added four new example templates** to the docs, including a narrow marketing page, sign in form, sticky footer, and a fancy carousel (created for an upcoming .net magazine article). +- **Added the media component**, to create larger common components like comments, Tweets, etc. +- **New variable-driven typographic scale** based on `@baseFontSize` and `@baseLineHeight`. +- Revamped mini, small, and large padding via new variables for inputs and buttons so everything is the same size. +- Reverted 2.1.1's `.box-shadow();` mixin change that caused compiler errors. +- Improved dropdown submenus to support dropups and left-aligned submenus. +- Fixed z-index issues with tooltips and popovers in modals. +- Hero unit now sets basic type styles for the entire component, rather than on `.hero-unit p { ... }`. +- Updated JavaScript plugins and docs to jQuery 1.8.1. +- Added Contributing.md file. +- Added support for installing Bootstrap via [Bower](http://twitter.github.com/bower). +- Miscellaneous variable improvements across the board. +- Miscellaneous documentation typos fixed. + +For the full list of issues included in this release, visit the [2.2.0 milestone on GitHub](https://github.com/twitter/bootstrap/issues?milestone=15&page=1&state=closed) + + + +## 2.1.1 (September 4, 2012) + +* New feature: alert text. We documented these new classes, like `.text-success`, at the bottom of the [Typography section](http://twitter.github.com/bootstrap/base-css.html#typography) along with the long undocumented `.muted`. +* Fixed a lot of typos in the docs. Spelling is hard. +* Made the `.box-shadow()` mixin more durable. It no longer requires escaping for multiple shadows, meaning you can easily use variables and functions in them once again. +* Widened `.dl-horizontal dt` and `.horizontal-form .control-group` to better handle the increased font-size. +* Dropdown submenus improved: now you only see the next level, not all levels, on hover of the submenu toggle. +* Clarified jQuery and Bootstrap template requirements in Getting Started section. +* `select` now utilizes `@inputBorder`. +* `.lead` now scales up from `@baseFontSize` instead of being a fixed font-size and line-height. +* Fixed the vertical three color gradient in latest Firefox. +* Reordered some variables that caused errors in certain Less compilers. + +View all closed issues on the [2.1.1 milestone](https://github.com/twitter/bootstrap/issues?milestone=14&state=closed). + + +## 2.1.0 (August 20, 2012) + +### Key changes + +* Submenu support on dropdowns +* Affix JavaScript plugin +* Block level buttons +* State classes on table rows +* Improved disabled states on navs and dropdowns +* The navbar component is now white by default, with an optional class to darken it +* Improved prepended and appended inputs +* New base font-size and line-height +* Added variable for navbar collapse trigger point +* Fluid grid offsets +* Fluid grid system variables are no longer fixed percentages +* Removed LESS docs page + +For full set of changes, see the completed milestone: https://github.com/twitter/bootstrap/issues?milestone=7&page=1&state=closed + +## 2.0.4 (June 1, 2012) + + +### Docs + +- Added `type="button"` to all dismiss buttons in alerts and modals to avoid a bug in which they prevent their parent's `form` from properly submitting. +- Added simple documentation to Base CSS for `.lead`. +- Added new CSS test to illustrate how the navbar, static and fixed, behaves. +- Clarified grid sizing copy to include mention of responsive variations. +- Reformatted the LESS docs page to prevent terrible table displays at smaller grid sizes. +- Miscellaneous typos and tweaks. + +### CSS + +- Refactored forms.less to make our selectors more specific for fewer overrides and less code. Instead of a generic `input` selector and various resets, we target each type of input like `input[type="text"]`, `input[type="password"]`, etc. +- Form field state (e.g., success or error) now applies to checkbox and radio labels. +- Removed redundant CSS on `

` for `font-family`, `font-size`, and `line-height`. +- Removed redundant `color` declaration from the `