0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Commit Graph

11297 Commits

Author SHA1 Message Date
Mark Otto
619843472a Merge pull request #15482 from liias/patch-1
Add .disabled class styling for .btn-styles in theme
2015-01-15 15:34:34 -08:00
Bootstrap's Grunt bot
f31f6b9b25 automatic grunt dist 2015-01-15 23:31:25 +00:00
Mark Otto
d8acd5f2a6 Merge pull request #15577 from KevinJannis/patch-1
Added blank line between selectors in jumbotron
2015-01-15 15:28:38 -08:00
Chris Rebert
86d368eb6d Merge pull request #15578 from twbs/licensing-contributing
Clarify in CONTRIBUTING docs that CC-BY 3.0 License applies to Bootstrap's docs
2015-01-15 15:01:40 -08:00
Chris Rebert
6ccf46a56b Merge pull request #15576 from twbs/chrome-bug-449180
Add Wall of Browser Bugs entry for #15298
2015-01-15 14:07:37 -08:00
Gleb Mazovetskiy
3d635f3079 Update grunt/bs-sass-compile/ to point to _bootstrap.scss 2015-01-15 21:28:14 +00:00
Gleb Mazovetskiy
2916ac43ed Rename scss/bootstrap.scss -> scss/_bootstrap.scss
This is required for Compass compatibility. See
https://github.com/twbs/bootstrap-sass/issues/694

Also updates bower.json and package.json references to the main Sass
file.
2015-01-15 21:20:40 +00:00
Chris Rebert
16089d92de Clarify in CONTRIBUTING docs that CC-BY 3.0 License applies to Bootstrap's docs
[ci skip]
2015-01-15 11:25:05 -08:00
Kevin Jannis
bb479b8f47 Added blank line between selectors in jumbotron 2015-01-15 20:17:02 +01:00
Chris Rebert
7164d84953 Add Wall of Browser Bugs entry for #15298
[skip sauce]
2015-01-15 11:10:02 -08:00
Chris Rebert
f1cb639c34 Docs: add missing "http://" 2015-01-15 10:46:58 -08:00
Chris Rebert
47ec330473 Merge pull request #15560 from twbs/fix-15555
Document that .form-inline & .form-horizontal work fine on non-<form>s too
2015-01-14 21:07:26 -08:00
Chris Rebert
e10dbcd02e Merge pull request #15569 from twbs/fix-15127
Document usage of npm package
2015-01-14 18:52:17 -08:00
Chris Rebert
ccc3eb5cc6 document usage of npm package; fixes #15127
[skip sauce]
2015-01-14 18:43:08 -08:00
Mark Otto
0531d6476c Merge pull request #63 from twbs/team-unity
Core & Sass Teams are now one and the same bigger Team
2015-01-14 18:02:18 -08:00
Chris Rebert
65721f5315 Use @link-hover-decoration for .btn-link too; fixes #15565
[skip sauce]
[skip validator]
2015-01-14 14:43:21 -08:00
Chris Rebert
e94a597685 Core & Sass Teams are now one and the same bigger Team 2015-01-14 10:45:07 -08:00
Chris Rebert
7b84705286 Document that .form-inline & .form-horizontal work fine on non-<form>s too
Fixes #15555
[skip sauce]
2015-01-13 17:36:37 -08:00
Chris Rebert
fb6622a7d4 Document that calling tooltip/popover .show()/.hide() qualifies as manual triggering
Fixes #15465

[skip sauce]
2015-01-13 17:06:31 -08:00
Bootstrap's Grunt bot
9fdf7a26e1 automatic grunt dist 2015-01-13 20:31:25 +00:00
Chris Rebert
0dc8395590 use strict mode for jqueryVersionCheck; fixes #15535 2015-01-13 12:21:32 -08:00
Lee Penkman
0c8cb3f2dc Fix table-striped to work with bootstraps tooltips on rows 2015-01-13 14:18:52 +13:00
Chris Rebert
82d786b5fe Filed http://openradar.appspot.com/19435018
Refs #14868
2015-01-09 19:39:33 -08:00
Chris Rebert
dbe38e89d0 Filed http://openradar.appspot.com/19434933
Refs #15205
2015-01-09 19:16:06 -08:00
Chris Rebert
4576dbae95 Filed http://openradar.appspot.com/19434878
Refs #11266, #13098
2015-01-09 19:04:42 -08:00
Chris Rebert
72a91b0205 Merge pull request #15533 from twbs/crbug-377346-fixed
Remove #13892's entry from the Wall of Browser Bugs
2015-01-09 15:07:52 -08:00
Chris Rebert
aa62f1b944 http://crbug.com/377346 is claimed to be fixed in Chrome 41
So remove its entry from the Wall of Browser Bugs.
Refs #13892, #14037

[skip sauce]
2015-01-09 15:04:59 -08:00
Chris Rebert
c56219d223 Merge pull request #15524 from twbs/masonry
Add pointer to Masonry (& similar) in the Thumbnail docs
2015-01-08 17:13:49 -08:00
Gleb Mazovetskiy
720d02c5e5 Revert "Remove libsass @media nesting bug workaround"
This reverts commit d6a5ebf438.

There has not been a release of libsass with this fix yet, sorry!
2015-01-08 21:38:12 +00:00
Chris Rebert
901ece7996 add pointer to Masonry in the thumbnail docs 2015-01-08 13:35:05 -08:00
Gleb Mazovetskiy
f4a00dc037 Merge pull request #58 from twbs/libsass-185
Remove libsass @media nesting bug workaround
2015-01-08 21:23:29 +00:00
Gleb Mazovetskiy
3be590dd5b docs: fix typo in media-queries.md 2015-01-08 21:17:22 +00:00
Chris Rebert
d6a5ebf438 Remove libsass @media nesting bug workaround
https://github.com/sass/libsass/issues/185 has been fixed.
Refs #48
2015-01-07 19:17:45 -08:00
Chris Rebert
5951647b1a Merge pull request #25 from twbs/autoprefixer-bump-chrome
bump min Chrome in Autoprefixer to v35
2015-01-07 19:15:52 -08:00
Bootstrap's Grunt bot
e213bc0ccc automatic grunt dist 2015-01-08 02:01:51 +00:00
Chris Rebert
259245113a Merge pull request #15463 from twbs/bump-less
Bump grunt-contrib-less to ~1.0.0
2015-01-07 17:51:32 -08:00
Chris Rebert
3c6a307011 bump min Chrome in Autoprefixer to v35 2015-01-07 17:49:43 -08:00
Chris Rebert
050babda0d update shrinkwrap 2015-01-07 17:44:16 -08:00
Chris Rebert
b24e6cf2ed bump grunt-contrib-less to ~1.0.0 2015-01-07 17:43:19 -08:00
Chris Rebert
698b3a7ace grunt 2015-01-07 17:04:59 -08:00
Chris Rebert
c8bfa7d353 Merge pull request #54 from twbs/overhaul-responsive-visibility
Overhaul of responsive visibility classes
2015-01-06 17:50:33 -08:00
Chris Rebert
e651b48eb6 update responsive utility docs post-overhaul 2015-01-06 17:49:33 -08:00
Chris Rebert
5868b5bc9c add migration guidance regarding responsive visibility classes 2015-01-06 17:49:33 -08:00
Chris Rebert
11a574ce9e Overhaul responsive visibility classes
Thanks to @glebm for help refactoring this to use the breakpoint mixins.
2015-01-06 17:47:13 -08:00
Chris Rebert
cbb3b1ff9a Kill scss/mixins/_media-queries.scss
replaced media-xs => media-breakpoint-down(xs)
replaced media-sm => media-breakpoint-up(sm)
replaced media-sm-max => media-breakpoint-only(sm)
replaced media-md => media-breakpoint-up(md)
replaced media-md-max => media-breakpoint-only(md)
replaced media-lg => media-breakpoint-up(lg)
2015-01-06 17:47:13 -08:00
Chris Rebert
746e09f8ae rename media-breakpoint-{min,max} => media-breakpoint-{up,down} 2015-01-06 17:47:13 -08:00
Chris Rebert
ff9c07f4aa fix numerical typo in grid docs 2015-01-06 17:46:46 -08:00
Mark Otto
20cdb62200 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-01-06 16:06:06 -08:00
Mark Otto
b542137dd5 streamline homepage nav 2015-01-06 16:05:58 -08:00
Mark Otto
82f460b20d formatting of html 2015-01-06 15:35:49 -08:00