Skip to content

Commit 7009061

Browse files
authored
Merge pull request #124 from kane-c/bootstrap-3.3.7
Upgrade to Bootstrap 3.3.7
2 parents 7cdd046 + 82b9ab0 commit 7009061

24 files changed

+86
-72
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Bootstrap Stylus 3.3.6
1+
Bootstrap Stylus 3.3.7
22
======================
33

4-
Port of the amazing [Bootstrap 3.3.6](https://github.com/twbs/bootstrap) to [Stylus 0.52.0](http://learnboost.github.com/stylus/).
4+
Port of the amazing [Bootstrap 3.3.7](https://github.com/twbs/bootstrap) to [Stylus 0.52.0](http://learnboost.github.com/stylus/).
55

66
## Installing
77

bootstrap/button-groups.styl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
&:not(:last-child):not(.dropdown-toggle)
5454
border-right-radius(0)
5555

56-
// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
56+
// Need .dropdown-toggle since :last-child doesn't apply, given that a .dropdown-menu is used immediately after it
5757
.btn-group > .btn:last-child:not(:first-child),
5858
.btn-group > .dropdown-toggle:not(:first-child)
5959
border-left-radius(0)

bootstrap/forms.styl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ input[type="search"]
165165
// set a pixel line-height that matches the given height of the input, but only
166166
// for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848
167167
//
168-
// Note that as of 8.3, iOS doesn't support `datetime` or `week`.
168+
// Note that as of 9.3, iOS doesn't support `week`.
169169

170170
@media screen and (-webkit-min-device-pixel-ratio 0)
171171
input[type="date"],

bootstrap/index.styl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!!
2-
* Bootstrap v3.3.6 (http://getbootstrap.com)
3-
* Copyright 2011-2015 Twitter, Inc.
2+
* Bootstrap v3.3.7 (http://getbootstrap.com)
3+
* Copyright 2011-2016 Twitter, Inc.
44
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
55
*/
66

bootstrap/input-groups.styl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
width 100%
3030
margin-bottom 0
31-
31+
3232
&:focus
3333
z-index 3
3434

bootstrap/mixins/tab-focus.styl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// WebKit-style focus
22
tab-focus()
3-
// Default
4-
outline thin dotted
5-
// WebKit
3+
// WebKit-specific. Other browsers will keep their default outline style.
4+
// (Initially tried to also force default via `outline: initial`,
5+
// but that seems to erroneously remove the outline in Firefox altogether.)
66
outline 5px auto -webkit-focus-ring-color
77
outline-offset -2px

bootstrap/panels.styl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
margin-bottom 0
183183

184184

185-
// Collapsable panels (aka, accordion)
185+
// Collapsible panels (aka, accordion)
186186
//
187187
// Wrap a series of panels in `.panel-group` to turn them into an accordion with
188188
// the help of our collapse JavaScript plugin.

bootstrap/scaffolding.styl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ hr
105105

106106
// Only display content to screen readers
107107
//
108-
// See http://a11yproject.com/posts/how-to-hide-content/
108+
// See http://a11yproject.com/posts/how-to-hide-content
109109

110110
.sr-only
111111
position absolute

bootstrap/theme.styl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!!
2-
* Bootstrap v3.3.6 (http://getbootstrap.com)
3-
* Copyright 2011-2015 Twitter, Inc.
2+
* Bootstrap v3.3.7 (http://getbootstrap.com)
3+
* Copyright 2011-2016 Twitter, Inc.
44
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
55
*/
66

bootstrap/variables.styl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ $component-active-color ?= #fff
111111
//** Global background color for active items (e.g., navs or dropdowns).
112112
$component-active-bg ?= $brand-primary
113113

114-
//** Width of the `border` for generating carets that indicator dropdowns.
114+
//** Width of the `border` for generating carets that indicate dropdowns.
115115
$caret-width-base ?= 4px
116116
//** Carets increase slightly in size for larger components.
117117
$caret-width-large ?= 5px

0 commit comments

Comments
 (0)