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

28 Commits

Author SHA1 Message Date
Mark Otto
8ac1495c63 redo the glyphicons icons list to make icons not blurry on edges /cc @jankovarik 2013-10-16 10:43:56 -07:00
Mark Otto
dc495fe9d9 nuke commented out docs css 2013-10-14 22:08:23 -07:00
Chris Rebert
b05a287eb6 run grunt 2013-10-14 20:47:56 -07:00
Chris Rebert
b5d7a51bff Merge pull request #10779 from ssorallen/customizer-bootstrap-less-order
Use bootstrap.less file order in Customizer
2013-10-14 18:56:10 -07:00
Mark Otto
50dd5d5088 fix about page html validation and run grunt 2013-10-14 11:30:06 -07:00
Chris Rebert
9416cd3738 update to latest jszip
commit 04fc93045334dc1b679aba5c2dce206da777a85c
2013-10-12T12:39:56-07:00
2013-10-13 23:37:16 -07:00
Chris Rebert
3abe86b7ed Merge pull request #11076 from twbs/respond-js-cdn
use CDN for respond.js
2013-10-13 23:26:28 -07:00
Mark Otto
202f395b2f Merge branch 'docs_welcome' 2013-10-13 23:19:17 -07:00
Chris Rebert
c5da0597bc use CDN for respond.js 2013-10-13 23:18:30 -07:00
Mark Otto
9da73d79c2 run grunt 2013-10-13 20:12:07 -07:00
Mark Otto
265fda7903 Merge branch 'master' into restore_grid_mixins
Conflicts:
	dist/css/bootstrap.min.css
2013-10-13 18:32:34 -07:00
Mark Otto
ef2e0c99f4 remove screen from all docs media queries 2013-10-13 15:24:39 -07:00
Mark Otto
c814ad1833 Combine separate efforts for grid mixins into one, cleanup and reorganize 2013-10-11 22:00:37 -07:00
Mark Otto
84413f6e29 Merge pull request #11013 from twbs/fix-10989
Use CDNs for more example JavaScripts
2013-10-09 20:05:21 -07:00
Chris Rebert
ef1fc34e61 use data-ride="carousel" in the docs & examples; fixes #11005 2013-10-09 19:29:27 -07:00
Chris Rebert
4da37222cf re-remove execute permissions; apparent upstream bug 2013-10-09 18:58:50 -07:00
Chris Rebert
1a0df1fbd0 upgrade holder.js to v2.1 2013-10-09 18:52:57 -07:00
herom
aad70834fc Fixes #9925: convert font data to base64, fixing 0xefbfbd (Unicode Replacement Character) chars in customizer fonts.
Merges #9982
2013-10-09 18:03:04 -07:00
Stuart P. Bentley
58a47b6bfd Customizer: include config.json in bootstrap.zip
merges #10633; fixes part of #9951
2013-10-09 17:35:26 -07:00
Chris Rebert
5e652332d1 use CDN for jQuery instead of vendoring it; fixes part of #10989 2013-10-09 16:36:15 -07:00
Chris Rebert
d72768a16a use CDN for html5shiv instead of vendoring it; fixes part of #10989 2013-10-09 16:36:02 -07:00
Chris Rebert
d820c6d225 there's no reason for holder.js to be executable 2013-10-09 15:34:39 -07:00
Mark Otto
969cb04acb Fixes #10126: Update responsive test cases to properly highlight hidden class examples 2013-10-07 15:00:46 -05:00
Mark Otto
704635818f run grunt 2013-10-07 14:31:41 -05:00
Mark Otto
a8f21b5ae9 merge in new ads 2013-10-05 11:44:41 -05:00
Mark Otto
b352061d1d run grunt 2013-10-01 11:37:47 -05:00
Ross Allen
3663e37005 Use bootstrap.less file order in Customizer
Appending stylesheets by iterating the `__less` Hash creates an order
that is not the same as 'bootstrap.less'.

Some stylesheets like 'component-animations.less' and 'modals.less' have
selectors with matching specificity, and so file order decides which
style wins. This causes issue #10030 by putting `.fade.in` after
`.modal-backdrop.in` and gives the backdrop a higher opacity than
intended.

This change uses the Less ordering in 'bootstrap.less' to generate the
final stylesheets in the Customizer to make sure customized file
ordering matches the distribution file order.

Fixes #10030
2013-09-23 23:33:20 -07:00
Chris Rebert
8aa5181126 move /assets/ to /docs-assets/ ; fixes #10715 2013-09-23 13:02:26 -07:00