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
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ć
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
Zlatan Vasović
dc5625c85b
Indent banner to match the *'s
2013-10-02 14:33:17 +02:00
Chris Rebert
a32b626f5c
run up-to-date grunt
2013-10-01 11:01:08 -07:00
Mark Otto
93bc1af623
Merge branch 'master' of github.com:twbs/bootstrap
2013-10-01 11:37:53 -05:00
Mark Otto
b352061d1d
run grunt
2013-10-01 11:37:47 -05:00
Chris Rebert
f9dd7466cf
Merge pull request #10806 from twbs/ios-safari-pct-rounding
...
add iOS and versions to Safari percent rounding warning; fixes #10723
2013-09-30 18:11:20 -07:00
Chris Rebert
5bfd9e0d56
Merge pull request #10826 from twbs/doc-multiple-navbars-unsupported
...
document that multiple navbars aren't supported by default
2013-09-30 18:06:17 -07:00
Chris Rebert
a97918297e
add maintenance note regarding #10864 's addition
2013-09-30 17:54:49 -07:00
Chris Rebert
5528c6501c
document that multiple navbars aren't supported by default; addresses #10824
2013-09-30 17:44:50 -07:00
Mark Otto
0e628b6546
Merge pull request #10864 from akalicki/included_files
...
Added abridged form of 'What's included' docs to README
2013-09-30 17:15:15 -07:00
Mark Otto
ef66c31dd4
Merge pull request #10856 from akalicki/grid_class_docs
...
Better documentation and optimized examples for grid classes
2013-09-30 17:11:55 -07:00
Mark Otto
33673a4008
Merge pull request #10865 from Quy/master
...
Apply help-block class to help text in customize.html
2013-09-30 17:10:48 -07:00
Mark Otto
25954702ea
Merge pull request #10883 from ZDroid/patch-3
...
Remove "Remove margin on the body" from base css docs
2013-09-30 17:08:09 -07:00
Mark Otto
6670026572
Merge pull request #10889 from twbs/contextual-table-docs-xs
...
table contextual classes docs: .col-lg-* => .col-xs-*
2013-09-30 17:07:19 -07:00
Mark Otto
cc3f09d4d1
Merge pull request #10888 from twbs/favor-xs-in-docs
...
use .col-xs-* in "Forms: Column Sizing" docs so more responsive
2013-09-30 17:06:31 -07:00
Chris Rebert
def45c1f74
table contextual classes docs: .col-lg-* => .col-xs-*
2013-09-30 11:01:29 -07:00
Chris Rebert
0b8a3e65aa
use .col-xs-* in "Forms: Column Sizing" docs so more responsive
2013-09-30 10:52:59 -07:00
Chris Rebert
7247527f04
also use .col-sm-* in other .form-horizontal example for consistency
2013-09-30 10:45:20 -07:00
Zlatan Vasović
f2d90d12dc
Remove "Remove margin on the body" from base css docs
...
Normalize did that.
2013-09-30 19:31:41 +02:00
Zlatan Vasović
40c61a9bd7
Remove .ruby-version due to 4f20a29c32
2013-09-30 11:26:52 +02:00
Chris Rebert
df5aa7c0f1
Merge pull request #10869 from ZDroid/patch-2
...
Update qunit dependency
2013-09-30 01:09:30 -07:00
Zlatan Vasović
2306375d13
Update qunit dependency
2013-09-30 09:36:20 +02:00
Quy Ton
462f27813f
Apply help-block class to help text in customize.html
2013-09-29 18:24:00 -07:00
Alex Kalicki
80d74c1bf7
Moved 'getting started' link out of 'What's included' section in README
2013-09-29 20:45:55 -04:00
Chris Rebert
362c9c9f89
rm unnecessary backslashes from jqueryCheck
2013-09-29 15:37:22 -07:00
Chris Rebert
a84bd5d9f1
Merge pull request #10863 from DeanMarkTaylor/patch-2
...
Update Gruntfile.js fixing undefined jQuery check
2013-09-29 15:32:34 -07:00
Alex Kalicki
e21c744a57
Added abridged form of 'What's included' docs to README
2013-09-29 18:17:46 -04:00
Dean Taylor
429e92fd58
Update Gruntfile.js fixing undefined jQuery check
...
The check to see if jQuery was defined as incorrect causing the "Bootstrap requires jQuery" message to only be displayed if jQuery is defined and has a value which equates to `false`.
2013-09-29 21:14:24 +01:00
Alex Kalicki
e34e73714a
Better documentation and optimized examples for grid classes
2013-09-28 22:51:30 -04:00
Chris Rebert
1809894e8a
Merge pull request #10855 from dan-silver/master
...
Spelling mistakes in documentation.
2013-09-28 14:42:59 -07:00
Dan Silver
708dbe58f6
Spelling mistakes in documentation.
2013-09-28 16:21:23 -05:00
Chris Rebert
fc2cde0230
Merge pull request #10841 from DeanMarkTaylor/patch-1
...
Update Gruntfile.js removing pointless reading of customize.html.
2013-09-27 10:23:28 -07:00
Dean Taylor
f39db19306
Update Gruntfile.js removing pointless reading of customize.html.
...
I couldn't see a reason to read "customize.html", removed line.
2013-09-27 18:17:02 +01:00
Chris Rebert
eb3807609a
Merge pull request #10827 from akalicki/issue_10726
...
Resolves #10726 - clarifies javascript tab markup in docs
2013-09-26 15:04:23 -07:00
Alex Kalicki
5d6e1d742d
Resolves #10726 - clarifies javascript tab markup in docs
2013-09-26 17:49:03 -04:00
Chris Rebert
1cf8fcda65
add iOS and versions to Safari percent rounding warning; fixes #10723
2013-09-25 17:25:50 -07:00
Mark Otto
1a476b623e
don't include . in link
2013-09-24 21:27:49 -05:00
Mark Otto
827fbc0a11
Merge pull request #10797 from twbs/input-groups-xref
...
add cross-reference to Input Groups in CSS Form docs; fixes #10792
2013-09-24 19:26:58 -07:00
Chris Rebert
2fa03734a3
add cross-reference to Input Groups in CSS Form docs; fixes #10792
2013-09-24 18:48:38 -07:00
Mark Otto
76e9d393ba
Merge pull request #10796 from twbs/skip-to-main-content
...
Use "Skip to main content" phrasing consistently; further #10786 fixes
2013-09-24 18:37:13 -07:00
Chris Rebert
af4d102767
Use "Skip to main content" phrasing consistently; further #10786 fixes
2013-09-24 18:02:18 -07:00
