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

7156 Commits

Author SHA1 Message Date
Chris Rebert
c42af6951f address #10965; mention Glyphicons-over-file:// problem in Carousel example 2013-10-10 01:42:34 -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
7016f02e51 Merge pull request #11015 from twbs/use-data-ride-carousel
use data-ride="carousel" in the docs & examples; fixes #11005
2013-10-09 19:49:44 -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
Chris Rebert
a388b7906e Merge pull request #10956 from ZDroid/patch-4
Sort tasks alphabetically
2013-10-09 18:31:17 -07:00
Kurt Maine
a216589056 Convert "Recess" to "RECESS"
Except when speaking of the "recess" Node package, RECESS should be in all-caps.
2013-10-09 18:18:05 -07:00
Chris Rebert
ca090aef02 fix #10805 2013-10-09 18:07:08 -07:00
Chris Rebert
f9ed8e6f00 trivial refactor in build-customizer grunt task 2013-10-09 18:03:08 -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
Chris Rebert
da4a275473 Merge pull request #10896 from ZDroid/patch-3
Change clone protocol from git:// to https://
2013-10-09 12:45:43 -07:00
Mark Otto
a007769ac3 Merge pull request #10998 from ZDroid/patch-7
Remove [type]
2013-10-09 10:12:17 -07:00
Chris Rebert
65b5b20776 Merge pull request #10996 from ZDroid/patch-6
Updare grunt-jekyll dependency
2013-10-09 01:39:56 -07:00
Zlatan Vasović
62c905f5bc Remove [type]
type="text/css" isn't needed
2013-10-09 09:45:05 +02:00
Zlatan Vasović
ef3ac6808f Updare grunt-jekyll dependency 2013-10-09 08:33:03 +02:00
Chris Rebert
730d7f0b13 fix #10986 2013-10-08 11:44:30 -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
352532cd63 Half fix for #9855: Don't fuck with margins for open modal dialog on account of Lion non-scrollbars and inconsistencies elsewhere 2013-10-07 14:39:11 -05:00
Mark Otto
0647049513 Merge branch 'master' of github.com:twbs/bootstrap 2013-10-07 14:32:29 -05:00
Mark Otto
1adbe2043a Fixes #10959: round the .lead values down to nearest pixel via floor() 2013-10-07 14:32:23 -05:00
Mark Otto
704635818f run grunt 2013-10-07 14:31:41 -05:00
Chris Rebert
d32380657b Merge pull request #10962 from twbs/doc-h1-thru-h6-classes
document .h1 thru .h6; fixes part of #10102
2013-10-07 00:55:21 -07:00
Chris Rebert
a8afb46688 document .h1 thru .h6; fixes part of #10102 2013-10-06 20:18:03 -07:00
Mark Otto
e62e7ffcbc Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	css.html
2013-10-06 19:06:40 -05:00
Mark Otto
61aa9a4f60 update gitignore to restore the ruby-version ignore and rename section to all docs stuff 2013-10-06 18:35:07 -05:00
Chris Rebert
bb50e33a30 fix #10961 2013-10-06 16:17:32 -07:00
Mark Otto
1eca83336e Merge branch 'master' of github.com:twbs/bootstrap 2013-10-06 17:24:32 -05:00
Mark Otto
548603a926 fixes #10961: change variable names in grid docs 2013-10-06 17:24:26 -05:00
Steven Black
0740d01b4c Good catch by @juthilo - omitted the modified in a prior commit. 2013-10-05 20:48:28 -04:00
Steven Black
c7120a7b04 The customizer now displays and collects the new Jumbotron font-size LESS variable 2013-10-05 18:38:45 -04:00
Steven Black
4b27c08783 The Jumbotron font-size LESS variable now conforms to the '@{bootstrapClass}-font-size' naming scheme. 2013-10-05 18:37:53 -04:00
Zlatan Vasović
146cd38867 Sort tasks alphabetically 2013-10-05 21:17:49 +02:00
Zlatan Vasović
b1cc07fa15 Insert comma to fix validation warning
BS doesn't support IE6/IE7, so comma can be inserted.
2013-10-05 20:14:19 +02:00
Mark Otto
56093dea99 Merge pull request #10950 from twbs/docs-navbar-class
Fix #10948: Clarify navbar example target in docs
2013-10-05 10:59:44 -07:00
Julian Thilo
e8d7fb0737 Change all navbar example targets
According to comment on https://github.com/twbs/bootstrap/issues/10948#issuecomment-25751889 .
2013-10-05 19:32:52 +02:00
Mark Otto
a8f21b5ae9 merge in new ads 2013-10-05 11:44:41 -05:00
Julian Thilo
e246a97b91 Fix #10948: Clarify navbar example target in docs 2013-10-05 11:37:52 +02:00
Steven Black
38941881e9 Jumbotron: remove the hard-coded font-size from jumbotron.less and moved it into variables.less where other .font-size-xxxxx things now live. 2013-10-04 21:43:31 -04:00
Julian Thilo
56ee42d335 Merge pull request #10932 from ZDroid/patch-1
Correct grammar
2013-10-03 23:21:30 -07:00
Zlatan Vasović
6f9d980139 Change border to border-radius
Border isn't set, but border-radius is.
2013-10-03 23:15:49 +02:00
Zlatan Vasović
32c7483215 Correct grammar
Jekyll is the third person singular (it), so it should be 'its documentation', not 'their documentation'.
2013-10-03 23:05:23 +02:00
Tobias Lindig
70453c2327 unify button sizing, use mixin ".button-size" also for the base sized button 2013-10-03 10:43:35 -07:00
Chris Rebert
c43462678c run grunt 2013-10-03 10:42:55 -07:00
Chris Rebert
ab34f27c37 Merge pull request #10871 from ZDroid/patch-2
Remove .ruby-version from excludes
2013-10-03 10:21:39 -07:00
Mark Otto
79c3f23ac4 Merge pull request #10908 from ZDroid/patch-4
Indent banner to match the *'s
2013-10-02 10:59:03 -07:00