Chris Rebert
851acf3f33
add same accessibility warning from .form-inline to .navbar-form docs
2013-09-11 22:58:07 -07:00
Mark Otto
682ee3ab1e
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-11 21:14:25 -07:00
Mark Otto
291a23aa4f
Massive customizer audit and overhaul
...
I probably missed a few things and screwed up a few others, but this
takes the place of much of #9910 . I haven't added many variables—that
should be reserved for v3.1—but I have rejiggered the layout, added
missing ones, corrected wrong values, etc.
/cc @cvrebert @juthilo @saas786
2013-09-11 21:14:10 -07:00
Mark Otto
ba818bc4e3
Remove unneeded comment in layouts
2013-09-11 21:12:58 -07:00
Mark Otto
ecc6978241
Merge pull request #10590 from twbs/doc-jquery-version
...
document jQuery version requirement; fixes #10355
2013-09-11 20:22:33 -07:00
Chris Rebert
0e54a49b9d
Merge pull request #10591 from twbs/modal-remote-migration-doc
...
add modal 'remote' option semantics change to migration docs
2013-09-11 20:17:18 -07:00
Chris Rebert
306d850d3a
add modal 'remote' option semantics change to migration docs; fixes #10585
2013-09-11 20:08:59 -07:00
Chris Rebert
a1b0311597
document jQuery version requirement; fixes #10355
2013-09-11 19:53:32 -07:00
Mark Otto
a1cdbbe55e
scope customizer h4 change
2013-09-11 16:59:51 -07:00
Mark Otto
d88e743b41
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
dist/css/bootstrap.min.css
2013-09-11 16:35:27 -07:00
Mark Otto
fddcadbc21
run grunt
2013-09-11 16:35:00 -07:00
Chris Rebert
725e2b9ccf
re-fix typo in comment
2013-09-11 16:24:03 -07:00
Mark Otto
cd7cf40aff
Merge pull request #10584 from twbs/ie_viewports
...
Fixes #10497 : Fix Windows 8 and Windows Phone 8 behavior and apply to docs
2013-09-11 16:19:12 -07:00
Mark Otto
b0ea3a08cd
Merge branch 'ie_viewports' of github.com:twbs/bootstrap into ie_viewports
...
Conflicts:
getting-started.html
less/responsive-utilities.less
2013-09-11 16:15:12 -07:00
Mark Otto
6519303549
fixes #10497 : Fix Windows 8 and Windows Phone 8 behavior and apply it to the docs
2013-09-11 16:06:43 -07:00
Mark Otto
6e064894db
remove unnecessary right and left properties on .modal-dialog
2013-09-11 14:56:02 -07:00
Mark Otto
2dc7ab4bbb
fixes #10497 : Fix Windows 8 and Windows Phone 8 behavior and apply it to the docs
2013-09-11 14:46:31 -07:00
Mark Otto
6ea2893af1
Merge pull request #10338 from twbs/readd-optin-notes
...
Fix #10324 : Add opt-in note to tooltip docs
2013-09-11 12:49:24 -07:00
Mark Otto
37933a9e08
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
dist/css/bootstrap.min.css
2013-09-11 12:31:21 -07:00
Mark Otto
5d1707a25c
Remove old and unused .prettyprint styles in code.less (per #10566 )
2013-09-11 11:09:50 -07:00
Chris Rebert
c62426daeb
Merge pull request #10579 from roryokane/patch-1
...
Fix capitalization of “list groups” in middle of sentence
2013-09-11 10:29:19 -07:00
Rory O’Kane
eebbee7c81
Fix capitalization of “list groups” in middle of sentence
...
When “list groups” is used in the middle of a sentence in http://getbootstrap.com/components/#list-group-basic , it is not capitalized.
2013-09-11 12:18:32 -04:00
Chris Rebert
1497c21fe3
Merge pull request #10567 from ZDroid/patch-2
...
Use @screen-sm-min in forms
2013-09-11 01:14:36 -07:00
Zlatan Vasović
c10238c95f
Use @screen-sm-min in forms
2013-09-11 09:54:38 +02:00
Mark Otto
022e40404c
Remove multiple touch icons and roll with a single one
2013-09-10 21:46:12 -07:00
Mark Otto
b7e1103c32
Merge pull request #9989 from eins78/more-monospace-elements
...
code.less: also set default monospace font for `<kbd>` and `<samp>`
2013-09-10 21:38:24 -07:00
Mark Otto
e645d51b62
Merge pull request #10565 from twbs/gruntfile-css-banner
...
generate CSS banners via Gruntfile; fixes #10101
2013-09-10 21:27:07 -07:00
Mark Otto
84567af1a8
Merge pull request #10560 from ZDroid/patch-1
...
Remove display: block from address
2013-09-10 21:25:31 -07:00
Chris Rebert
2b5d7d23d0
generate CSS banners via Gruntfile; fixes #10101
2013-09-10 19:22:20 -07:00
Chris Rebert
1f3a87a8a0
fix punctuation in author field of package.json
2013-09-10 19:12:47 -07:00
Chris Rebert
76d8757b0a
rm period from licensing header so it's not mistaken as part of the URL
2013-09-10 19:01:40 -07:00
Chris Rebert
a9335e94e1
run grunt dist
2013-09-10 18:59:09 -07:00
Chris Rebert
cf09ec3c77
Merge pull request #10563 from lipis/patch-1
...
Updated the old btn-large in carousel example
2013-09-10 16:52:37 -07:00
Lipis
a2a5be11a3
Updated the old btn-large in carousel example
2013-09-11 01:34:56 +02:00
Chris Rebert
52516eceba
add missing comma in carousel.less; fixes #10562
2013-09-10 16:20:36 -07:00
Julian Thilo
1ebd282693
Rephrase text
2013-09-10 23:31:57 +02:00
Zlatan Vasović
886e7037f6
Remove display: block from address
...
<address> is already displayed as block in all browsers (UAs).
2013-09-10 23:27:04 +02:00
Julian Thilo
10a9601560
Fix #10556
...
Make media queries example in docs clearer
2013-09-10 18:00:58 +02:00
Mark Otto
c8c3bf00b6
fixes #9985 : update grid classes in grid example
2013-09-09 13:56:10 -07:00
Mark Otto
cd98b10ea5
Merge pull request #10542 from twbs/controls-migration-docs
...
add .control* to migration docs; fixes #10532
2013-09-09 13:22:34 -07:00
Chris Rebert
6bc1a5cf6e
add .control* to migration docs; fixes #10532
2013-09-09 12:34:53 -07:00
Mark Otto
fff5e540f5
fixes #10526 : Remove custom background on responsive tables and set it in the docs where it should've been originally
2013-09-08 20:03:52 -07:00
Mark Otto
afb6cf1d01
Match order of vars to order of components; darken some alert borders
2013-09-08 16:58:56 -07:00
Mark Otto
16279056ae
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-08 08:04:19 -07:00
Mark Otto
3f158175ce
fixes #10521 : Only remove bottom-border from last row of cells in tbody and tfoot within responsive tables
2013-09-08 08:04:11 -07:00
Julian Thilo
601364418f
Merge pull request #10523 from ZDroid/patch-1
...
Added missing semicolon
2013-09-08 06:47:14 -07:00
Zlatan Vasović
f9fe6cd05f
Added missing semicolon
2013-09-08 15:37:02 +02:00
Mark Otto
d126d8c6f3
Run grunt to gen raw files
2013-09-06 09:57:25 -07:00
Mark Otto
f80fd03542
Remove nav from jumbotron example (temp fix for #10228 )
2013-09-06 09:57:19 -07:00
Mark Otto
8bea86e2ef
fixes #10024 : Use negative margin to fix the border between button and input in input groups
2013-09-06 09:50:38 -07:00
