e62e7ffcbc
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
css.html
2013-10-06 19:06:40 -05:00
61aa9a4f60
update gitignore to restore the ruby-version ignore and rename section to all docs stuff
2013-10-06 18:35:07 -05:00
bb50e33a30
fix #10961
2013-10-06 16:17:32 -07:00
1eca83336e
Merge branch 'master' of github.com:twbs/bootstrap
2013-10-06 17:24:32 -05:00
548603a926
fixes #10961 : change variable names in grid docs
2013-10-06 17:24:26 -05:00
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
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
a8f21b5ae9
merge in new ads
2013-10-05 11:44:41 -05:00
e246a97b91
Fix #10948 : Clarify navbar example target in docs
2013-10-05 11:37:52 +02:00
56ee42d335
Merge pull request #10932 from ZDroid/patch-1
...
Correct grammar
2013-10-03 23:21:30 -07:00
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
70453c2327
unify button sizing, use mixin ".button-size" also for the base sized button
2013-10-03 10:43:35 -07:00
c43462678c
run grunt
2013-10-03 10:42:55 -07:00
ab34f27c37
Merge pull request #10871 from ZDroid/patch-2
...
Remove .ruby-version from excludes
2013-10-03 10:21:39 -07:00
79c3f23ac4
Merge pull request #10908 from ZDroid/patch-4
...
Indent banner to match the *'s
2013-10-02 10:59:03 -07:00
dc5625c85b
Indent banner to match the *'s
2013-10-02 14:33:17 +02:00
a32b626f5c
run up-to-date grunt
2013-10-01 11:01:08 -07:00
93bc1af623
Merge branch 'master' of github.com:twbs/bootstrap
2013-10-01 11:37:53 -05:00
b352061d1d
run grunt
2013-10-01 11:37:47 -05:00
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
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
a97918297e
add maintenance note regarding #10864 's addition
2013-09-30 17:54:49 -07:00
5528c6501c
document that multiple navbars aren't supported by default; addresses #10824
2013-09-30 17:44:50 -07:00
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
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
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
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
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
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
def45c1f74
table contextual classes docs: .col-lg-* => .col-xs-*
2013-09-30 11:01:29 -07:00
0b8a3e65aa
use .col-xs-* in "Forms: Column Sizing" docs so more responsive
2013-09-30 10:52:59 -07:00
7247527f04
also use .col-sm-* in other .form-horizontal example for consistency
2013-09-30 10:45:20 -07:00
f2d90d12dc
Remove "Remove margin on the body" from base css docs
...
Normalize did that.
2013-09-30 19:31:41 +02:00
40c61a9bd7
Remove .ruby-version due to https://github.com/twbs/bootstrap/commit/4f20a29c329aa58919919426cbd2190fabfdb723
2013-09-30 11:26:52 +02:00
df5aa7c0f1
Merge pull request #10869 from ZDroid/patch-2
...
Update qunit dependency
2013-09-30 01:09:30 -07:00
2306375d13
Update qunit dependency
2013-09-30 09:36:20 +02:00
462f27813f
Apply help-block class to help text in customize.html
2013-09-29 18:24:00 -07:00
80d74c1bf7
Moved 'getting started' link out of 'What's included' section in README
2013-09-29 20:45:55 -04:00
362c9c9f89
rm unnecessary backslashes from jqueryCheck
2013-09-29 15:37:22 -07:00
a84bd5d9f1
Merge pull request #10863 from DeanMarkTaylor/patch-2
...
Update Gruntfile.js fixing undefined jQuery check
2013-09-29 15:32:34 -07:00
e21c744a57
Added abridged form of 'What's included' docs to README
2013-09-29 18:17:46 -04:00
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
e34e73714a
Better documentation and optimized examples for grid classes
2013-09-28 22:51:30 -04:00
1809894e8a
Merge pull request #10855 from dan-silver/master
...
Spelling mistakes in documentation.
2013-09-28 14:42:59 -07:00
708dbe58f6
Spelling mistakes in documentation.
2013-09-28 16:21:23 -05:00
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
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
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
5d6e1d742d
Resolves #10726 - clarifies javascript tab markup in docs
2013-09-26 17:49:03 -04:00
1cf8fcda65
add iOS and versions to Safari percent rounding warning; fixes #10723
2013-09-25 17:25:50 -07:00
Mark Otto