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

165 Commits

Author SHA1 Message Date
Mark Otto
b6b2c90a7d Merge branch 'master' into docs_derp 2013-12-16 00:39:50 -08:00
Mark Otto
072ccd4dda Fixes #11572: Add contextual background-color classes to match text classes; move both sets of classes to Helper Classes section of the CSS docs 2013-12-14 21:40:16 -08:00
Mark Otto
67b536ea51 change class name 2013-12-14 21:25:57 -08:00
Mark Otto
4c64c1eecd Merge branch 'master' into pr/11302
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.min.css
2013-12-14 16:46:40 -08:00
Mark Otto
83c60ef3ee Merge branch 'master' into pr/11107
Conflicts:
	docs-assets/js/raw-files.js
2013-12-14 16:20:19 -08:00
Mark Otto
f1869771bc Fixes #10505: Document more of LESS vars and mixins 2013-12-14 14:18:43 -08:00
Mark Otto
0cb570724d quotes 2013-12-12 18:10:58 -08:00
Mark Otto
0b4efcda90 more docs homepage cleanup 2013-12-12 14:57:43 -08:00
Mark Otto
4fc2907723 Merge branch 'master' into docs_derp
Conflicts:
	docs-assets/css/docs.css
	docs-assets/js/application.js
2013-12-11 22:39:03 -08:00
Mark Otto
0e8baab34a more homepage and sidenav overhaul 2013-12-11 22:37:59 -08:00
XhmikosR
caa3d53dcb customizer.js: remove a workaround for older less.js. 2013-12-11 13:27:23 +02:00
XhmikosR
11180e0fa7 Update less.js to v1.5.1.
This fixes an error with `&:extend(.clearfix all)` when using the customizer.
2013-12-10 18:09:14 +02:00
Mark Otto
b9b17bc72b grunt 2013-12-09 00:09:52 -08:00
Mark Otto
768f8b00f3 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-08 17:50:26 -08:00
Chris Rebert
ae0d48057e fix #11787: document stateful button JS 2013-12-08 17:42:59 -08:00
Mark Otto
cdb7d9839e grunt 2013-12-08 17:21:37 -08:00
Mark Otto
e1247e3edc Match customizer banner to Gruntfile banner 2013-12-08 17:17:51 -08:00
XhmikosR
eca8ff3803 Use single quotes consistently. 2013-12-08 12:44:14 +02:00
Mark Otto
ed63dfd8d3 Merge pull request #11739 from XhmikosR/lint-assets
Lint docs-assets/js/application.js and docs-assets/js/customizer.js.
2013-12-08 02:16:16 -08:00
Mark Otto
1f9bfa89dc Fixes #11741: Don't set headings font-family again, just use inherit 2013-12-08 02:14:24 -08:00
Mark Otto
5fdd917918 improve icon display on narrow devices 2013-12-07 16:28:29 -08:00
Mark Otto
0bf5202b92 Fixes #11729: Show code snippets on mobile views 2013-12-07 16:21:46 -08:00
Mark Otto
a9b86cbfde Merge branch 'pr/11138'
Conflicts:
	dist/css/bootstrap.min.css
	dist/js/bootstrap.min.js
	docs-assets/js/raw-files.js
2013-12-07 14:10:41 -08:00
XhmikosR
2fc2fe75bd Lint docs-assets/js/application.js and docs-assets/js/customizer.js. 2013-12-07 05:05:13 +02:00
Chris Rebert
c545312bd6 need customize.js to be tracked for it to work on GitHub Pages
follow-up to #11738
2013-12-06 11:35:58 -08:00
Mark Otto
aac4f0189e one last grunt 2013-12-04 22:54:03 -08:00
Mark Otto
b18d3fb80f Merge branch 'master' of github.com:twbs/bootstrap 2013-12-04 22:34:25 -08:00
Mark Otto
45930acdf7 Fixes #11610: Add @grid-float-breakpoint-max to better link navbar behavior across viewports and improve customization.
Also addresses #10371, #10395, and #10465.
2013-12-04 22:32:56 -08:00
Mark Otto
42bee1ddd5 Merge pull request #11671 from XhmikosR/updates
Update 3rd party asset libraries
2013-12-04 21:58:00 -08:00
Mark Otto
cf81cb60ef Merge branch 'master' into gradient-prefix-cleanup
Conflicts:
	dist/css/bootstrap.min.css
	docs-assets/js/raw-files.js
2013-12-04 21:23:09 -08:00
Mark Otto
8c5dc542a5 grunt 2013-12-04 21:22:24 -08:00
awebdeveloper
3f1e4b92ee -moz and old webkit syntax removed for gradients based on
http://caniuse.com/#search=grad
2013-12-03 14:13:55 -08:00
Chris Rebert
303f8a33c3 add <table> case to responsive-visibility mixin; see #10056 2013-12-03 13:57:28 -08:00
Chris Rebert
bac153127c grunt 2013-12-03 13:54:56 -08:00
Chris Rebert
2d4ee18162 add comment regarding #11598 2013-12-03 13:31:47 -08:00
XhmikosR
b8928340f4 Update filesaver.js to the latest git. 2013-12-02 14:15:57 +02:00
XhmikosR
c56e63e967 Update jszip.js to the latest git. 2013-12-02 14:13:10 +02:00
XhmikosR
4392d43d7c Update holder.js to v2.2. 2013-12-02 14:12:57 +02:00
Zlatan Vasović
2b56ff0461 Reduce size of the visibility styles 2013-12-02 07:50:17 +01:00
Mark Otto
4876cbeef8 Merge branch 'master' into pr/11412
Conflicts:
	dist/js/bootstrap.min.js
2013-12-01 20:27:30 -08:00
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
37f3944bd9 finish up moving content, tweaking styles 2013-11-22 18:45:38 -05:00
Mark Otto
03501f9c4a Merge branch 'master' into docs_derp 2013-11-16 22:02:59 -08: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
Mark Otto
86678e6602 text size 2013-11-16 16:50:47 -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
Mark Otto
6df6723c15 Merge branch 'master' into docs_derp
Conflicts:
	dist/css/bootstrap.min.css
2013-11-06 14:04:54 -08: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
Mark Otto
b593df1830 docs derp 2013-11-06 11:00:39 -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