0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Commit Graph

120 Commits

Author SHA1 Message Date
Mark Otto
37e46ec2b8 add comment 2013-12-01 20:27:09 -08:00
Mark Otto
8a74264344 bump version numbers to 3.0.3 2013-12-01 19:31:52 -08:00
Mark Otto
118e901eb1 grunt 2013-12-01 19:30:10 -08:00
Mark Otto
25bc5322aa grunt 2013-12-01 18:35:58 -08:00
Mark Otto
556d6cef3e Fixes #10941: Fix Glyphicons path for those importing bootstrap.less from another directory 2013-12-01 00:20:47 -08:00
Mark Otto
53047fa587 Merge branch 'master' into pr/11536
Conflicts:
	dist/css/bootstrap.min.css
2013-11-30 23:35:56 -08:00
Mark Otto
57070dcf45 grunt 2013-11-30 23:35:08 -08:00
Mark Otto
22da6fcfb2 grunt 2013-11-30 21:17:53 -08:00
Mark Otto
359ac8f66a grunt 2013-11-30 16:21:19 -08:00
Mark Otto
080aa7f5c8 Merge branch 'master' into pr/11299
Conflicts:
	dist/css/bootstrap.min.css
	docs-assets/js/raw-files.js
2013-11-30 00:55:00 -08:00
Mark Otto
938d40fc20 Merge pull request #11432 from masterbee/WCAG2-color-contrast
Corrected color contrast to WCAG 2.0 AA (Accessibility Tweak) - Forms and Alerts
2013-11-30 00:21:47 -08:00
Mark Otto
8674228521 Merge branch 'pr/11493'
Conflicts:
	dist/css/bootstrap.min.css
2013-11-29 23:30:26 -08:00
Mark Otto
09cd5289ab Fixes #11468: Prevent default gradient on in Firefox for Android 2013-11-29 17:47:27 -08:00
Mark Otto
0be94180b9 grunt 2013-11-28 15:45:45 -08:00
Mark Otto
594d0c700d grunt after merge of last pr; unsure why, but this is rengerating the banners and spacing 2013-11-28 11:33:00 -08:00
Mark Otto
9829c86f7c run grunt 2013-11-26 15:21:27 -08:00
Zlatan Vasović
630fd1cff6 Remove redundant 'window.' 2013-11-26 08:43:26 +01:00
Zlatan Vasović
dbbd49b4f8 Fix #11594 2013-11-23 18:29:27 +01:00
Mark Otto
ae4d5f21a9 fixes #11449: use menlo over monaco 2013-11-16 18:01:59 -08:00
Mark Otto
a2c6daafd0 fixes #10744: back to solid borders on carets 2013-11-16 17:48:31 -08:00
fat
7545da2e3c fixes #11477 and updates slid event in carousel with namespace 2013-11-14 23:58:29 -08:00
Chris Rebert
7a3f41b11b <3 @asselin for figuring out this combo of 2 patches for #9920; re-grunt 2013-11-10 17:25:17 -08:00
Mario Bonito
4386650e60 Corrected color contrast to WCAG 2.0 AA 2013-11-09 13:03:21 -05:00
Brian Surowiec
03c161f0c4 Fix glyphicon class name wrapping in IE 2013-11-08 02:03:37 -05:00
Chris Rebert
3887f540b9 update remaining version numbers 2013-11-06 13:19:18 -08:00
Mark Otto
eaff6bc49a grunt 2013-11-06 13:10:51 -08:00
Mark Otto
d1048a7837 run grunt after version bumps 2013-11-06 13:02:15 -08:00
Chris Rebert
89d489dfc7 re-grunt 2013-11-05 16:58:18 -08:00
Chris Rebert
db314528eb don't use nonstandard window.location.origin in customizer JS; fixes #11317 2013-11-01 18:56:27 -07:00
Chris Rebert
4e0d022de5 update version numbers in JS file comment headers to v3.0.1 & regrunt 2013-11-01 17:15:34 -07:00
Brian Surowiec
8ff7b48b7b Update customizer.js 2013-11-01 19:27:08 -04:00
Kevin Locke
441f9d6717 Support .h1 in place of h1 inside .jumbotron
As in #7284, it can often be useful to style text like a heading in
places where using the heading tag would be either semantically
incorrect, less accessible, or otherwise invalid.

Support this in .jumbotron as in the rest of the document by allowing
elements with class .h1 to stand in for the h1 element.

Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
2013-10-31 10:48:55 -06:00
Mark Otto
147837efaa more grunt 2013-10-30 08:00:32 -07:00
Mark Otto
a23740ec03 run grunt 2013-10-28 21:55:08 -07:00
Mark Otto
ee9be1a30f run grunt on last commit for gradient syntax change 2013-10-20 23:29:23 -07:00
Mark Otto
ecadbe56f7 mo grunt 2013-10-20 16:53:45 -07:00
Chris Rebert
c23d6a2766 Warn about IE8 + Respond.js + file:// problem in examples; fix #11019 2013-10-17 18:39:03 -07:00
Mark Otto
1f33dc8033 even shorter banner; remove space between slash and period 2013-10-17 14:11:40 -07:00
Chris Rebert
c88cd1cd95 add explicit copyright header to docs CSS & JS files; fixes #11112 2013-10-17 14:02:22 -07:00
Max Edmands
693915d127 Active state overrides contextual list-item styles 2013-10-16 22:56:13 -07:00
Aaron Borden
0c2055ef38 Adding contextual styles to list-items 2013-10-16 19:02:04 -07:00
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
Geremia Taglialatela
3bfa630d2a Added opacity to customizer and rebuilt customizer 2013-10-15 21:13:49 +02: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