Skip to content

Commit 2218e8a

Browse files
committed
Merge pull request #89 from kane-c/master
Upgrade to Bootstrap v3.3.2
2 parents c048c3f + 8a96c15 commit 2218e8a

35 files changed

+615
-336
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.1
1+
Bootstrap Stylus 3.3.2
22
======================
33

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

66
There might be some slight color differences due to the differences between the color functions in LESS and those in Stylus.
77

bootstrap/button-groups.styl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@
6464
.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn
6565
border-radius 0
6666

67-
.btn-group > .btn-group:first-child
67+
.btn-group > .btn-group:first-child:not(:last-child)
6868
> .btn:last-child,
6969
> .dropdown-toggle
7070
border-right-radius(0)
7171

72-
.btn-group > .btn-group:last-child > .btn:first-child
72+
.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child
7373
border-left-radius(0)
7474

7575
// On active and open, don't show outline
@@ -214,7 +214,7 @@
214214

215215
[data-toggle="buttons"]
216216
> .btn
217-
> .brn-group > .btn
217+
> .btn-group > .btn
218218
input[type="radio"],
219219
input[type="checkbox"]
220220
position absolute

bootstrap/buttons.styl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
&:hover,
101101
&:focus
102102
color $link-hover-color
103-
text-decoration underline
103+
text-decoration $link-hover-decoration
104104
background-color transparent
105105

106106
&[disabled],

bootstrap/carousel.styl

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626

2727
// WebKit CSS3 transforms for supported devices
2828
@media all and (transform-3d), (-webkit-transform-3d)
29-
transition transform .6s ease-in-out
30-
backface-visibility hidden
31-
perspective 1000
29+
transition-transform(.6s ease-in-out)
30+
backface-visibility(hidden)
31+
perspective(1000)
3232

3333
&.next,
3434
&.active.right
@@ -137,6 +137,7 @@
137137
width 20px
138138
height 20px
139139
margin-top -10px
140+
line-height 1
140141
font-family serif
141142

142143
.icon-prev
@@ -178,6 +179,7 @@
178179
// Internet Explorer 8-9 does not support clicks on elements without a set
179180
// `background-color`. We cannot use `filter` since that's not viewed as a
180181
// background color by the browser. Thus, a hack is needed.
182+
// See https://developer.mozilla.org/en-US/docs/Web/Events/click#Internet_Explorer
181183
//
182184
// For IE8, we set solid black as it doesn't support `rgba()`. For IE9, we
183185
// set alpha transparency for the best results possible.

bootstrap/close.styl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
// Additional properties for button version
2323
// iOS requires the button element instead of an anchor tag.
2424
// If you want the anchor version, it requires `href="#"`.
25+
// See https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile
2526
button&
2627
padding 0
2728
cursor pointer

bootstrap/dropdowns.styl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
border-left $caret-width-base solid transparent
1616

1717
// The dropdown wrapper (div)
18+
.dropup,
1819
.dropdown
1920
position relative
2021

@@ -168,7 +169,7 @@
168169
.dropdown-menu
169170
top auto
170171
bottom 100%
171-
margin-bottom 1px
172+
margin-bottom 2px
172173

173174

174175
// Component alignment

bootstrap/forms.styl

Lines changed: 34 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ output
113113
background-color $input-bg
114114
background-image none // Reset unusual Firefox-on-Android default style see https://github.com/necolas/normalize.css/issues/214
115115
border 1px solid $input-border
116-
border-radius $input-border-radius
116+
border-radius $input-border-radius // Note: This has no effect on <select>s in some browsers, due to the limited stylability of <select>s in CSS.
117117
box-shadow inset 0 1px 1px rgba(0, 0, 0, .075)
118118
transition border-color ease-in-out .15s, box-shadow ease-in-out .15s
119119

@@ -133,7 +133,7 @@ output
133133
fieldset[disabled] &
134134
cursor $cursor-disabled
135135
background-color $input-bg-disabled
136-
opacity 1 // iOS fix for unreadable disabled content
136+
opacity 1 // iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655
137137

138138
// Reset height for `textarea`s
139139
textarea&
@@ -156,7 +156,7 @@ input[type="search"]
156156
// In Mobile Safari, setting `display block` on temporal inputs causes the
157157
// text within the input to become vertically misaligned. As a workaround, we
158158
// set a pixel line-height that matches the given height of the input, but only
159-
// for Safari
159+
// for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848
160160

161161
@media screen and (-webkit-min-device-pixel-ratio 0)
162162
input[type="date"],
@@ -165,10 +165,12 @@ input[type="search"]
165165
input[type="month"]
166166
line-height $input-height-base
167167

168-
&.input-sm
168+
&.input-sm,
169+
.input-group-sm &
169170
line-height $input-height-small
170171

171-
&.input-lg
172+
&.input-lg,
173+
.input-group-lg &
172174
line-height $input-height-large
173175

174176

@@ -275,14 +277,35 @@ input[type="checkbox"]
275277
//
276278
// Build on `.form-control` with modifier classes to decrease or increase the
277279
// height and font-size of form controls.
280+
//
281+
// The `.form-group-* form-control` variations are sadly duplicated to avoid the
282+
// issue documented in https://github.com/twbs/bootstrap/issues/15074.
283+
284+
.input-sm
285+
input-size($input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $input-border-radius-small)
286+
287+
.form-group-sm
288+
.form-control
289+
input-size($input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $input-border-radius-small)
278290

279-
.input-sm,
280-
.form-group-sm .form-control
281-
input-size($input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small)
291+
.form-control-static
292+
height $input-height-small
293+
padding $padding-small-vertical $padding-small-horizontal
294+
font-size $font-size-small
295+
line-height $line-height-small
282296

283297
.input-lg
284-
.form-group-lg .form-control
285-
input-size($input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large)
298+
input-size($input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $input-border-radius-large)
299+
300+
.form-group-lg
301+
.form-control
302+
input-size($input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $input-border-radius-large)
303+
304+
.form-control-static
305+
height $input-height-large
306+
padding $padding-large-vertical $padding-large-horizontal
307+
font-size $font-size-large
308+
line-height $line-height-large
286309

287310

288311
// Form control feedback states
@@ -400,8 +423,7 @@ input[type="checkbox"]
400423
vertical-align middle
401424

402425
// Remove default margin on radios/checkboxes that were used for stacking, and
403-
// then undo the floating of radios and checkboxes to match (which also avoids
404-
// a bug in WebKit https://github.com/twbs/bootstrap/issues/1969).
426+
// then undo the floating of radios and checkboxes to match
405427
.radio,
406428
.checkbox
407429
display inline-block

bootstrap/glyphicons.styl

Lines changed: 187 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@font-face
1212
font-family 'Glyphicons Halflings'
1313
src url($icon-font-path + $icon-font-name + '.eot')
14-
src url($icon-font-path + $icon-font-name + '.eot?#iefix') format('embedded-opentype'), url($icon-font-path + $icon-font-name + '.woff') format('woff'), url($icon-font-path + $icon-font-name + '.ttf') format('truetype'), url($icon-font-path + $icon-font-name + '.svg#' + $icon-font-svg-id) format('svg')
14+
src url($icon-font-path + $icon-font-name + '.eot?#iefix') format('embedded-opentype'), url($icon-font-path + $icon-font-name + '.woff2') format('woff2'), url($icon-font-path + $icon-font-name + '.woff') format('woff'), url($icon-font-path + $icon-font-name + '.ttf') format('truetype'), url($icon-font-path + $icon-font-name + '.svg#' + $icon-font-svg-id) format('svg')
1515

1616
// Catchall baseclass
1717
.glyphicon
@@ -627,3 +627,189 @@
627627
.glyphicon-tree-deciduous
628628
&:before
629629
content "\e200"
630+
.glyphicon-cd
631+
&:before
632+
content "\e201"
633+
.glyphicon-save-file
634+
&:before
635+
content "\e202"
636+
.glyphicon-open-file
637+
&:before
638+
content "\e203"
639+
.glyphicon-level-up
640+
&:before
641+
content "\e204"
642+
.glyphicon-copy
643+
&:before
644+
content "\e205"
645+
.glyphicon-paste
646+
&:before
647+
content "\e206"
648+
// The following 2 Glyphicons are omitted for the time being because
649+
// they currently use Unicode codepoints that are outside the
650+
// Basic Multilingual Plane (BMP). Older buggy versions of WebKit can't handle
651+
// non-BMP codepoints in CSS string escapes, and thus can't display these two icons.
652+
// Notably, the bug affects some older versions of the Android Browser.
653+
// More info: https://github.com/twbs/bootstrap/issues/10106
654+
// .glyphicon-door
655+
// &:before
656+
// content "\1f6aa"
657+
// .glyphicon-key
658+
// &:before
659+
// content "\1f511"
660+
.glyphicon-alert
661+
&:before
662+
content "\e209"
663+
.glyphicon-equalizer
664+
&:before
665+
content "\e210"
666+
.glyphicon-king
667+
&:before
668+
content "\e211"
669+
.glyphicon-queen
670+
&:before
671+
content "\e212"
672+
.glyphicon-pawn
673+
&:before
674+
content "\e213"
675+
.glyphicon-bishop
676+
&:before
677+
content "\e214"
678+
.glyphicon-knight
679+
&:before
680+
content "\e215"
681+
.glyphicon-baby-formula
682+
&:before
683+
content "\e216"
684+
.glyphicon-tent
685+
&:before
686+
content "\26fa"
687+
.glyphicon-blackboard
688+
&:before
689+
content "\e218"
690+
.glyphicon-bed
691+
&:before
692+
content "\e219"
693+
.glyphicon-apple
694+
&:before
695+
content "\f8ff"
696+
.glyphicon-erase
697+
&:before
698+
content "\e221"
699+
.glyphicon-hourglass
700+
&:before
701+
content "\231b"
702+
.glyphicon-lamp
703+
&:before
704+
content "\e223"
705+
.glyphicon-duplicate
706+
&:before
707+
content "\e224"
708+
.glyphicon-piggy-bank
709+
&:before
710+
content "\e225"
711+
.glyphicon-scissors
712+
&:before
713+
content "\e226"
714+
.glyphicon-bitcoin
715+
&:before
716+
content "\e227"
717+
.glyphicon-yen
718+
&:before
719+
content "\00a5"
720+
.glyphicon-ruble
721+
&:before
722+
content "\20bd"
723+
.glyphicon-scale
724+
&:before
725+
content "\e230"
726+
.glyphicon-ice-lolly
727+
&:before
728+
content "\e231"
729+
.glyphicon-ice-lolly-tasted
730+
&:before
731+
content "\e232"
732+
.glyphicon-education
733+
&:before
734+
content "\e233"
735+
.glyphicon-option-horizontal
736+
&:before
737+
content "\e234"
738+
.glyphicon-option-vertical
739+
&:before
740+
content "\e235"
741+
.glyphicon-menu-hamburger
742+
&:before
743+
content "\e236"
744+
.glyphicon-modal-window
745+
&:before
746+
content "\e237"
747+
.glyphicon-oil
748+
&:before
749+
content "\e238"
750+
.glyphicon-grain
751+
&:before
752+
content "\e239"
753+
.glyphicon-sunglasses
754+
&:before
755+
content "\e240"
756+
.glyphicon-text-size
757+
&:before
758+
content "\e241"
759+
.glyphicon-text-color
760+
&:before
761+
content "\e242"
762+
.glyphicon-text-background
763+
&:before
764+
content "\e243"
765+
.glyphicon-object-align-top
766+
&:before
767+
content "\e244"
768+
.glyphicon-object-align-bottom
769+
&:before
770+
content "\e245"
771+
.glyphicon-object-align-horizontal
772+
&:before
773+
content "\e246"
774+
.glyphicon-object-align-left
775+
&:before
776+
content "\e247"
777+
.glyphicon-object-align-vertical
778+
&:before
779+
content "\e248"
780+
.glyphicon-object-align-right
781+
&:before
782+
content "\e249"
783+
.glyphicon-triangle-right
784+
&:before
785+
content "\e250"
786+
.glyphicon-triangle-left
787+
&:before
788+
content "\e251"
789+
.glyphicon-triangle-bottom
790+
&:before
791+
content "\e252"
792+
.glyphicon-triangle-top
793+
&:before
794+
content "\e253"
795+
.glyphicon-console
796+
&:before
797+
content "\e254"
798+
.glyphicon-superscript
799+
&:before
800+
content "\e255"
801+
.glyphicon-subscript
802+
&:before
803+
content "\e256"
804+
.glyphicon-menu-left
805+
&:before
806+
content "\e257"
807+
.glyphicon-menu-right
808+
&:before
809+
content "\e258"
810+
.glyphicon-menu-down
811+
&:before
812+
content "\e259"
813+
.glyphicon-menu-up
814+
&:before
815+
content "\e260"

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.1 (http://getbootstrap.com)
3-
* Copyright 2011-2014 Twitter, Inc.
2+
* Bootstrap v3.3.2 (http://getbootstrap.com)
3+
* Copyright 2011-2015 Twitter, Inc.
44
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
55
*/
66

0 commit comments

Comments
 (0)