rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Code Issues Actions Packages Releases Activity
14,010 Commits 108 Branches 89 Tags 552 MiB
c344ff5b17
Commit Graph

687 Commits

Author SHA1 Message Date
Mark Otto
00e2b29041 try disabling that 2016-01-05 23:56:08 -08:00
Mark Otto
d8d67eaa6a rewrite custom file input component to use classes over nested elements 2016-01-05 23:45:44 -08:00
Mark Otto
ac446058ff ensure custom selects get rounded corners 2016-01-05 23:45:20 -08:00
Mark Otto
8d66b9956c Change .c-select to .custom-select 2016-01-05 23:34:51 -08:00
Mark Otto
11df78ec74 Revamp custom form styles 
- Less nesting with more specific classes
- New class names for most elements to avoid unnecessary and potentially confusing shorthand
- Require new class and markup for the description (though it's only necessary for disable states, it's now part of the entire component's markup for all states just in case)
- Change up colors and variables for regular and disabled states
 2016-01-05 23:25:42 -08:00
Mark Otto
c081d4802d Merge pull request #18682 from twbs/media-obj-zoom 
Remove nonstandard `zoom: 1` from media object
 2016-01-05 20:58:39 -08:00
markau
871a003ca2 Fixes #17918: Add styles for disabled custom checkboxes and radios 2016-01-05 00:47:32 -08:00
Mark Otto
6a7577d3c6 remove instances of font-weight: normal since we no longer specify bold labels (as of v4) 2016-01-05 00:14:58 -08:00
Mark Otto
c76a2c3218 Merge pull request #18669 from twbs/fix-18652 
Remove .dl-horizontal; it's redundant to the grid system
 2016-01-03 19:10:42 -08:00
Chris Rebert
e9192f6de0 Update copyright years to 2016 
[ci skip]
 2016-01-01 12:31:38 -08:00
Patrick H. Lauke
9cd6903768 Merge pull request #18699 from patrickhlauke/disabled-pointer-events 
Add pointer-events:none to disabled pagination/pager links
 2015-12-29 16:23:41 +00:00
Sam A. Horvath-Hunt
f7a43ed6b7 Add max-width to file browser; fixes #18651 2015-12-29 14:41:21 +00:00
Patrick H. Lauke
348763d65c Add pointer-events:none to disabled pagination/pager links 
as currently this was missed out (compared to disabled `a.btn`)
 2015-12-27 10:03:09 +00:00
Bass Jobsen
ddb652b8d5 .container, .container-fluid should be conditional upon $enable-grid-classes 
see: https://github.com/twbs/bootstrap/issues/17586
 2015-12-27 00:14:01 +01:00
Chris Rebert
4de483a411 Remove nonstandard zoom: 1 from media object 
It should be unnecessary since we only support IE>=9, and this hasLayout hack is for IE6-7.
https://developer.mozilla.org/en-US/docs/Web/CSS/zoom
http://stackoverflow.com/questions/1794350/what-is-haslayout

[skip sauce]
[skip validator]
 2015-12-25 14:54:48 -07:00
Chris Rebert
4a05f19a3b Fix syntax of .text-hide's font property value 
In SCSS, the quotes were included verbatim in the resulting CSS, which isn't valid syntax for the `font` property.
Removing the quotes fixes the syntax error and does not cause any SCSS compiler error.

[skip sauce]
[skip validator]
 2015-12-25 14:06:39 -07:00
Chris Rebert
4c86e37c2d Remove .dl-horizontal; it's redundant to the grid system; fixes #18652 
[skip sauce]
 2015-12-24 21:26:26 -07:00
Chris Rebert
edbdf21de5 Merge pull request #18464 from twbs/btn-block-spacing-y 
Introduce $btn-block-spacing-y variable
 2015-12-23 23:44:50 -07:00
Chris Rebert
7cfdc771f8 Uncomment Firefox .progress styles; fixes #18536 
[skip sauce]
[skip validator]
 2015-12-23 23:19:44 -07:00
Chris Rebert
a96e522d6a Organize existing .progress styles 2015-12-23 22:35:45 -07:00
Chris Rebert
76a4c303ee Refactor Breadcrumbs component 
Use new `.breadcrumb-item` class instead of child selectors and `li` tag selectors,
so as to no longer require the usage of `<ol>`-based markup.

Rename variables to follow naming conventions:
* $breadcrumb-padding-vertical => $breadcrumb-padding-y
* $breadcrumb-padding-horizontal => $breadcrumb-padding-x

Introduce new variable: $breadcrumb-item-padding

[skip sauce]
 2015-12-23 22:16:35 -07:00
Chris Rebert
7aabd49364 Reorganize utilities into more separate files under a /scss/utilities/ directory 
[skip sauce]
[skip validator]
 2015-12-23 21:01:17 -07:00
Chris Rebert
1e8743ec89 Merge pull request #18473 from twbs/fix-18036 
Remove useless .col-*-offset-12 and .col-xs-offset-0 classes
 2015-12-23 20:33:37 -07:00
Chris Rebert
25cecdb55a Apply clearfix to .card-footer 
[skip sauce]
[skip validator]
 2015-12-23 17:25:37 -07:00
Chris Rebert
da533b8926 Apply clearfix to .card-header; fixes #18633 2015-12-23 17:20:23 -07:00
Chris Rebert
2e2b48da13 Apply clearfix to .card-block; fixes #18583 2015-12-23 17:18:19 -07:00
Chris Rebert
646580a919 Actually use $progress-bg instead of hardcoded color 
Refs #18535
[skip sauce]
 2015-12-21 10:57:57 -07:00
Chris Rebert
c6a276dd74 Set $progress-bg to color we are actually using 2015-12-21 10:57:57 -07:00
Chris Rebert
0917b04711 Actually use $progress-bar-color instead of hardcoded color 
Refs #18535
 2015-12-21 10:57:57 -07:00
Chris Rebert
5a18638f26 Set $progress-bar-color to color we are currently using 2015-12-21 10:57:54 -07:00
Chris Rebert
e6fdebb9c7 Merge pull request #18463 from twbs/nav-item-margin 
Introduce $nav-item-margin variable
/fyi @mdo
 2015-12-16 22:17:09 -08:00
Chris Rebert
92338da1f3 Merge pull request #18469 from twbs/card-deck-margin 
Introduce $card-deck-margin variable
/fyi @mdo; happy to tweak the var names if desired
 2015-12-16 22:16:36 -08:00
Stephanie Kendall
523c5a3d1a switching position of custom in bootstrap.scss for better efficiency 2015-12-16 09:27:09 -06:00
Patrick H. Lauke
7cffd334aa Merge pull request #18541 from patrickhlauke/progress-patch1 
remove generated content value for progress
 2015-12-16 10:19:04 +00:00
Chris Rebert
34fe668af2 Merge pull request #18472 from twbs/x-y-vars 
Rename 2 navbar variables to comply with updated naming convention
 2015-12-12 00:32:28 -08:00
Patrick H. Lauke
3cfbeda08d remove generated content value for progress 
as it's currently not displayed, and (in my opinion) would look fugly if
it did appear...
 2015-12-11 10:57:45 +00:00
Patrick H. Lauke
97461a51a2 progress bar for IE10+/Edge (radius, use ::-ms-fill, add variant mixins, striped support) 2015-12-11 08:58:11 +00:00
sergej2705
7ad62ec9cd Added !important to hover 
cause hover isn't working since bg-color is !important
 2015-12-10 08:51:09 +01:00
Mark Otto
5d3144e8fb manually bump versions because npm script wasn't working for me 2015-12-08 09:36:08 -08:00
Chris Rebert
c1c1b3885d Remove useless .col-*-offset-12 and .col-xs-offset-0 classes 
Fixes #18036

[skip sauce]
[skip validator]
 2015-12-08 01:50:42 -08:00
Chris Rebert
1861b05b5f Rename 2 navbar variables to comply with updated naming convention 
$navbar-padding-horizontal => $navbar-padding-x
$navbar-padding-vertical   => $navbar-padding-y

[skip sauce]
[skip validator]
 2015-12-08 01:30:23 -08:00
Chris Rebert
0330d4acc2 Introduce $btn-block-spacing-y variable 
[skip sauce]
 2015-12-08 01:14:09 -08:00
Chris Rebert
6798485323 Introduce $card-deck-margin variable 
[skip sauce]
[skip validator]
 2015-12-08 01:13:37 -08:00
Chris Rebert
de9ad37c5d Introduce $nav-item-margin variable 
[skip sauce]
 2015-12-08 01:12:57 -08:00
Chris Rebert
5871be0ce6 Refactor _utilities-spacing.scss; fixes #18129 2015-12-08 01:08:03 -08:00
Chris Rebert
8d4f5c1c12 Make SCSS Lint happy 
[skip sauce]
[skip validator]
 2015-12-08 01:06:52 -08:00
Mark Otto
35389f46df order 2015-12-08 01:06:23 -08:00
Mark Otto
ac5be12f24 unfuck that border from rem to px 2015-12-08 00:49:31 -08:00
Mark Otto
11c287d1d7 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2015-12-08 00:16:56 -08:00
Mark Otto
60ad55b8f7 fixes #17776 2015-12-08 00:16:46 -08:00
Mark Otto
9c55815898 Merge pull request #17930 from zalog/patch-12 
v4 - .c-select shouldn't inherit white text color
 2015-12-08 00:05:52 -08:00
Chris Rebert
8b0d737a56 scss/_pagination.scss: Reassert #18257 
[skip sauce]
 2015-12-08 00:01:58 -08:00
Mark Otto
30aad997d0 tweak comment 2015-12-07 23:52:10 -08:00
Mark Otto
96dd9c57d2 Merge branch 'bassjobsen-patch-6' into v4-dev 2015-12-07 23:48:41 -08:00
Mark Otto
9e6d1c1ec6 Merge branch 'patch-6' of https://github.com/bassjobsen/bootstrap into bassjobsen-patch-6 2015-12-07 23:48:33 -08:00
Mark Otto
4dd60d8310 fix variable 2015-12-07 23:46:56 -08:00
Mark Otto
a9f53f0fc0 Merge pull request #18110 from twbs/pagination-classes 
Refactor pagination classes to avoid tag selectors & child selectors
 2015-12-07 23:41:55 -08:00
Mark Otto
9e872efb3f rip out the .blockquote-* children classes for margin utils 2015-12-07 23:36:35 -08:00
Mark Otto
886bbe9bc0 Merge pull request #18138 from bassjobsen/patch-12 
refactor blockqoutes to to avoid tag selectors & child selectors
 2015-12-07 23:32:31 -08:00
Mark Otto
515ff1aacb rewrite list-inline to use margin and simpler styles 2015-12-07 23:31:02 -08:00
Mark Otto
d3c87d32fa Merge branch 'patch-11' of https://github.com/bassjobsen/bootstrap into bassjobsen-patch-11 2015-12-07 23:28:31 -08:00
Chris Rebert
e7edf10473 .page => .page-item 2015-12-07 22:37:17 -08:00
Chris Rebert
0c1df9912f Refactor pagination code to remove unnecessary ancestor requirements in selectors 2015-12-07 22:37:17 -08:00
Chris Rebert
5f35ce2095 .page>{a,span => .page-link} 2015-12-07 22:37:17 -08:00
Chris Rebert
a878c4f0c6 .pagination>{li => .page} 2015-12-07 22:37:17 -08:00
Mark Otto
7eadfbc9b2 ignore that 2015-12-07 22:31:16 -08:00
Mark Otto
5a6a128728 fixes #18330 2015-12-07 21:57:06 -08:00
Mark Otto
e5b6922258 Merge pull request #18356 from lesleh/card-mixin 
Card mixin
 2015-12-07 21:55:26 -08:00
Mark Otto
c9eb483ca9 fixes #18320: pull in suit base reset for button focus styles in FF and IE 2015-12-07 21:47:40 -08:00
Mark Otto
d36686afee spacing 2015-12-07 21:46:03 -08:00
Chris Rebert
9dacdce42c Use $input-btn-border-width for both .form-control and .btn borders; fixes #18424 
Both widgets need to use the same border width because of input groups.
Thus:
$btn-border-width   => $input-btn-border-width
$input-border-width => $input-btn-border-width

[skip sauce]
 2015-12-07 20:41:51 -08:00
Mark Otto
a22d2fb5a5 fixes #17433: improve borders on .list-group-flush to remove dupe borders when appropro 2015-12-07 10:05:53 -08:00
Chris Rebert
d1a0af8b24 Tweak naming and docs of font utility classes 
* `.font-normal` is too generic. Rename it to `.font-weight-normal` for clarity.
* Rename `.font-bold` to `.font-weight-bold` so as to parallel `.font-weight-normal`.
* In docs, gloss "weight" term in relation to fonts for the benefit of non-typographiles.

Refs #18433

[skip sauce]
 2015-12-07 00:08:54 -08:00
Chris Rebert
28bbf42e26 Fix .font-italic utility class definition 
Erratum from 26da610bd0
Refs #18001
 2015-12-06 17:37:55 -08:00
Mark Otto
21b15d450d fixes #18087: .navbar-form is no more 2015-12-06 16:59:33 -08:00
Mark Otto
49674a8eba fixes #18425 by using vars for 1px borders 2015-12-06 16:45:40 -08:00
Mark Otto
26da610bd0 fixes #18433: add three new font utils 2015-12-06 16:39:55 -08:00
Mark Otto
db0f2df59c Merge pull request #18426 from twbs/label-reboot-comment-grammar 
Fix grammar of comment for <label> in Reboot
 2015-12-06 16:29:56 -08:00
Mark Otto
239befe16b Merge branch 'list-inline-padding' into v4-dev 2015-12-06 16:29:35 -08:00
Chris Rebert
0759d76bd2 Add 3 more font-weight variables 
Refs #14368

[skip sauce]
[skip validator]
 2015-12-06 12:32:49 -08:00
vsn4ik
ad698d124a v4 - Add default param for form-icon variables 2015-12-05 21:32:25 +03:00
XhmikosR
e94891fe24 Merge pull request #18395 from twbs/scsslint-pseudo-elems 
SCSS Lint: explicitly enable PseudoElement check
 2015-12-05 10:29:18 +02:00
Chris Rebert
e8dcb2f917 Add $list-inline-padding variable 
[skip sauce]
[skip validator]
 2015-12-04 01:56:49 -08:00
Chris Rebert
191c82dc38 Fix grammar of comment for <label> in Reboot 2015-12-04 01:46:45 -08:00
Chris Rebert
2fcb2e099f Use $border-width for .btn-group margins that make borders overlap 
Fixes half of #18425
[skip sauce]
[skip validator]
 2015-12-04 01:42:51 -08:00
Stephanie Kendall
aaae40c069 implements a _custom.scss, resolves #17322 2015-12-01 13:44:37 -06:00
Chris Rebert
c15e9fb9ad SCSS Lint: enable PseudoElement check 2015-12-01 02:05:37 -08:00
Chris Rebert
548834e87f Merge pull request #18340 from twbs/responsive-pulls 
Add responsive float classes
 2015-11-29 21:47:49 -08:00
Mark Otto
23d7b7fe42 Merge pull request #18381 from twbs/file-input-width-var 
Use $input-border-width for custom file input borders
 2015-11-29 21:18:52 -08:00
Mark Otto
b7e3e92d6b Merge pull request #18380 from twbs/card-border-var 
Use $card-border-width for .card-inverse's header/footer border-bottom override
 2015-11-29 21:18:40 -08:00
Chris Rebert
12d0f98507 Use $input-border-width for custom file input borders 
Fixes part of #18150

[skip sauce]
[skip validator]
 2015-11-29 21:13:19 -08:00
Chris Rebert
3f2943424f Remove reference to defunct Customizer from v3 
[ci skip]
 2015-11-29 20:54:45 -08:00
Chris Rebert
0b01c360fc Use $card-border-width for .card-inverse's header/footer border-bottom override 
Refs #18150

[skip sauce]
[skip validator]
 2015-11-29 20:48:33 -08:00
Mark Otto
543580eafe Merge pull request #18256 from twbs/print-border-widths 
Use $border-width in misc border print styles
 2015-11-29 20:03:02 -08:00
Mark Otto
f16ad22530 fixes #18188 2015-11-29 19:56:17 -08:00
Mark Otto
4005b316c6 rearrange comment lines for clarity 2015-11-29 19:55:51 -08:00
Mark Otto
0fa2c7c486 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2015-11-29 19:54:20 -08:00
Mark Otto
c68019e5d0 Merge pull request #18257 from twbs/border-width-vars 
Add more border width variables
 2015-11-29 19:52:22 -08:00
Mark Otto
1f487f79d3 Merge pull request #18260 from twbs/fix-18259 
Move viewport-dependent padding tweak into main .jumbotron block
 2015-11-29 19:49:20 -08:00
Mark Otto
94d7a8f4ef Merge pull request #18265 from twbs/fix-v4-17007 
Bring focused input group controls to front via z-index:3
 2015-11-29 19:48:54 -08:00
Mark Otto
45632894d9 Merge pull request #18317 from twbs/redundant-text-aligns-18300 
Remove non-responsive text alignment classes
 2015-11-29 19:39:48 -08:00
Mark Otto
389a284766 fixes #18295. improve .nav-inline usefulness and document the classes as well 2015-11-29 19:38:44 -08:00
Chris Rebert
a23cf74340 _dropdown.scss: Revise comments; fixes #18363 
[skip sauce]
 2015-11-27 20:12:37 -08:00
Chris Rebert
a8dc4812a4 Add responsive float classes; fixes #13690 2015-11-26 22:13:26 -08:00
Leslie
c050d1e2e4 Update _cards.scss 2015-11-26 13:33:54 +00:00
Leslie Hoare
beb11714dd Use the new mixin. 2015-11-26 13:26:40 +00:00
Leslie Hoare
cc814f4d76 Create a mixin for creating new card styles. 
I'm aware that currently cards are a lot simpler than buttons right now
but this may change in future and it feels cleaner to be able to create
new card styles without needing to know the internals of how they're
implemented.
 2015-11-26 13:21:07 +00:00
Richard Kraaijenhagen
c960169807 Add responsive embed class for 1:1 aspect ratio 
Closes #18141
 2015-11-23 19:54:55 -08:00
Chris Rebert
ade2ab1341 Remove non-responsive text alignment classes 
These can be replaced by their `.text-xs-*` parallels.
This also avoids any complications from interactions between the responsive and non-responsive classes.
(e.g. `<div class="text-left text-md-right">`)

Refs #18300
[skip sauce]
 2015-11-22 21:33:42 -08:00
Deilv
2c3a592a6e Add missing !important-s to responsive text alignment classes; fixes #18300 
Closes #18314 by merging a tweaked version of it.
 2015-11-22 20:41:34 -08:00
Chris Rebert
a9198d8385 scss/_reboot.scss: Add link to nice new docs regarding touch-action:manipulation 
[ci skip]
 2015-11-15 17:16:50 -08:00
Chris Rebert
5923e6fc58 Merge pull request #18051 from twbs/impl-18044 
Add touch-action:manipulation on interactive elements to avoid 300ms click delay
 2015-11-15 17:08:01 -08:00
Chris Rebert
1e6f23ce92 Fix #17001 in v4 
Refs #18253
[skip sauce]
 2015-11-15 14:20:44 -08:00
Chris Rebert
ca68331b8b Add $list-group-border-width; refs #18150 
[skip sauce]
 2015-11-15 12:46:46 -08:00
Chris Rebert
e54a9d7e8d $list-group-border => $list-group-border-color 
[skip sauce]
 2015-11-15 12:43:43 -08:00
Chris Rebert
9da0b7140a Move viewport-dependent padding tweak into main .jumbotron block 
Refs #18259
[skip sauce]
 2015-11-15 01:25:38 -08:00
Chris Rebert
85c9cc806b .form-control: Use $input-border-width instead of $border-width 
[skip sauce]
 2015-11-15 01:18:40 -08:00
Chris Rebert
6a66d2dd92 Add $table-border-width; refs #18150 2015-11-14 23:24:48 -08:00
Chris Rebert
c174d7ab4e Add $popover-border-width; refs #18150 2015-11-14 23:11:20 -08:00
Chris Rebert
8b91f95d98 Use $border-width in misc border print styles 
[skip sauce]
 2015-11-14 23:06:40 -08:00
Chris Rebert
e3eaeb96e8 Add $thumbnail-border-width; refs #18150 2015-11-14 22:56:20 -08:00
Chris Rebert
13ac07a862 $thumbnail-border => $thumbnail-border-color 2015-11-14 22:54:53 -08:00
Chris Rebert
203264d7af Add $pagination-border-width; refs #18150 2015-11-14 22:53:18 -08:00
Chris Rebert
5f45f652f7 Rename $pagination-border => $pagination-border-color for clarity 2015-11-14 22:51:18 -08:00
Chris Rebert
687610e6f1 Add $pager-border-width; refs #18150 2015-11-14 22:50:40 -08:00
Chris Rebert
a4594bd445 $pager-border => $pager-border-color 2015-11-14 22:48:18 -08:00
Chris Rebert
a420b66210 Add $nav-tabs-link-border-width; refs #18150 2015-11-14 22:40:43 -08:00
Chris Rebert
1f29c306a6 Add $input-border-width; refs #18150 2015-11-14 22:40:43 -08:00
Chris Rebert
2d02910e01 $input-border => $input-border-color 2015-11-14 22:40:43 -08:00
Chris Rebert
2ea8950b26 Add $dropdown-border-width; refs #18150 2015-11-14 22:40:43 -08:00
Chris Rebert
76f7056321 $dropdown-border => $dropdown-border-color 2015-11-14 22:28:45 -08:00
Mark Otto
0e77265c00 fixes #18170, make cards block level by default so anchors can be used as base element 2015-11-14 21:40:17 -08:00
Mark Otto
36b33bd145 fixes #18241: bump up border-radius values on .label-pill for when customization means the 1rem value doesn't cut it 2015-11-14 21:29:09 -08:00
Mark Otto
925f0ca018 fix error to danger 2015-11-14 19:45:48 -08:00
Mark Otto
1a3acc8a4b Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2015-11-14 17:23:22 -08:00
Mark Otto
23e746d479 nuke unhelpful comments 2015-11-14 17:23:16 -08:00
Bass Jobsen
0d34169e1f Refactor figure image styles to use CSS class instead of child selector 
Refactoring according the comments on https://github.com/twbs/bootstrap/pull/18104.
Closes #18131
 2015-11-14 15:00:08 -08:00
Chris Rebert
25e42ade42 Add touch-action:manipulation on interactive elements to avoid 300ms click delay 
Fixes #18044

[skip sauce]
[skip validator]
 2015-11-13 01:07:18 -08:00
Chris Rebert
6d591edcb7 .dropdown-menu: Swap color and font-size property order to make SCSS Lint happy 2015-11-13 00:21:43 -08:00
Chris Rebert
2315bc6052 scss/_nav.scss: Remove trailing whitespace 
[ci skip]
 2015-11-13 00:20:03 -08:00
Chris Rebert
98ec749117 Swap margin-right and margin-left ordering in .dropdown-toggle::after to make SCSS Lint happy 
[ci skip]
 2015-11-13 00:19:19 -08:00
Chris Rebert
0cdb204867 scss/_card.scss: Remove trailing whitespace 
[ci skip]
 2015-11-13 00:17:25 -08:00
Mark Otto
763cec82fb Merge pull request #18089 from almirsarajcic/v4-dev 
Rename .help-block to .text-help
 2015-11-12 23:57:22 -08:00
Mark Otto
0aec084cae Merge pull request #18093 from AndersMad/patch-1 
Card fix static -> variable border radius
 2015-11-12 23:56:45 -08:00
Mark Otto
cbb5e25482 Merge pull request #17939 from chrisbell08/#17895_alert_border_width 
#17895 Added $alert-border-width that defaults to $border-width
 2015-11-12 23:50:51 -08:00
Chris Rebert
5abd4e0142 Ports c256aca13c to v4 
Refs #15947, #17542

[ci skip]
 2015-11-12 23:47:13 -08:00
Chris Rebert
920f7fd695 Revert "Drop cursor pointer for button role" 
This reverts commit 61067304cd.

The normalize.css pull request (https://github.com/necolas/normalize.css/pull/379 )
was REJECTED, *NOT* merged!
 2015-11-12 23:44:29 -08:00
Mark Otto
f25d709025 Merge pull request #18061 from mathisonian/patch-1 
remove bro from comment
 2015-11-12 23:37:02 -08:00
Mark Otto
97b0d37732 space 2015-11-12 23:33:15 -08:00
Mark Otto
d18cc5f77b Merge branch 'reboot-cursor' of https://github.com/flexbox/bootstrap into flexbox-reboot-cursor 2015-11-12 23:31:19 -08:00