Mark Otto
a3be713f8f
Merge branch 'navtext' of https://github.com/liuyl/bootstrap into liuyl-navtext
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-02 19:30:03 -07:00
Mark Otto
e8145ac939
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-02 19:05:49 -07:00
Mark Otto
b5dcbf5045
Merge pull request #8934 from twbs/generalize-horiz-form-example
...
use separate `form-group`s in horiz form example for greater generality
2013-08-02 18:59:06 -07:00
Mark Otto
9435991ff0
move form layouts from input groups back to forms (messed this up in b281ad6409)
2013-08-02 18:48:44 -07:00
Mark Otto
6b850132d0
Remove requirement of .list-group-flush when list groups are in panels
...
Fixes #8900
2013-08-02 17:57:19 -07:00
Chris Rebert
0fefbbe659
fix typo in comment
2013-08-02 16:36:54 -07:00
fat
f6cec812a6
fixes #8957
2013-08-02 15:13:12 -07:00
fat
e969d2ff18
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-02 15:10:47 -07:00
fat
69f9920132
fixes #8955
2013-08-02 15:10:14 -07:00
Mark Otto
173dac4e54
Tighten up buttons and form controls
...
* Smaller padding on buttons and large buttons
* Same with inputs and large inputs
* Remove about 10px from height of large inputs/buttons and 4px from
regular ones
Fixes #8707 and #8700 .
(Also relevant: #8711 )
2013-08-02 15:09:48 -07:00
Mark Otto
7cd54e52f2
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-02 14:08:58 -07:00
Mark Otto
d46e645a0f
fixes #9015 : bold links not semibold in alerts
2013-08-02 14:07:26 -07:00
Mark Otto
b86cac65b6
Merge pull request #9018 from adamwoodbeck/3.0.0-wip
...
Added ".col-sm-*" to the grid example per the description above the
2013-08-02 14:04:16 -07:00
Mark Otto
83eea13e63
Merge branch '3.0.0-wip-fixed-grid-push-pull-offset' of https://github.com/jtickle/fp-bootstrap into jtickle-3.0.0-wip-fixed-grid-push-pull-offset
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-02 13:58:06 -07:00
Adam Woodbeck
cfacd228eb
Added ".col-sm-*" to the grid example per the description above the
...
example.
2013-08-02 16:30:13 -04:00
Mark Otto
e23b7ec20e
Merge pull request #9017 from jonschlinkert/3.0.0-wip
...
updates mixins to consistently use semicolons as argument separator.
2013-08-02 12:48:39 -07:00
Jon Schlinkert
c017e19ed2
Resolves https://github.com/twbs/bootstrap/issues/9014 . updates mixins to consistently use semicolons as argument separator. Rebuild to confirm, no diff in compiled CSS.
2013-08-02 15:33:03 -04:00
Mark Otto
08ce3ef9e1
run grunt dist for #8967
2013-08-02 10:11:39 -07:00
Mark Otto
dfd6c23527
Merge pull request #8967 from bassjobsen/patch-2
...
Update input-groups.less
2013-08-02 10:11:06 -07:00
Mark Otto
e4b113934d
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-02 10:02:46 -07:00
Mark Otto
696e619fd9
Merge pull request #8979 from ggam/patch-6
...
Add dropdown class
2013-08-02 09:44:32 -07:00
Mark Otto
048e19b892
Fixes #8996 : shift placement of justified CSS for nav component
2013-08-02 09:42:50 -07:00
Mark Otto
34e5c7542b
whitespace in js file?
2013-08-02 09:33:12 -07:00
Mark Otto
d0b94ead9a
Fix #9008 : consolidate .alert-block styles into .alert
2013-08-02 09:32:58 -07:00
Mark Otto
21be3efad3
Merge pull request #9011 from Rycul/patch-1
...
Added short instruction for obtaining respond.js in example HTML code (see description).
2013-08-02 09:27:03 -07:00
Mark Otto
6467009572
Merge pull request #8980 from ggam/patch-7
...
Removed data-toggle class when it wasn't been applied
2013-08-02 09:26:19 -07:00
Bryan Keiren
f4b983ed11
Added short instruction for obtaining respond.js
...
The Getting-Started page only lists the actual instructions for respond.js (its purpose and source) *after* listing a piece of example HTML code for the user to copy and paste. It would probably be more clear if that piece of HTML code actually lists where the user can obtain respond.js. Otherwise the user has to scroll down and read 1 specific line on the rest of the page (under the 'IE 8 and 9' compatibility section), in order to know that respond.js can be obtained from a GitHub page (and that it is in fact NOT part of the downloadable Bootstrap file that's provided earlier on the page, even though the use of response.js in the example HTML code seems to suggest that it *is* part of the Bootstrap download).
It's a minor issue but this fix should make it just a little bit more clear to a user how the example HTML code works (lest they copy/paste it and find out the browser can't find respond.js).
2013-08-02 18:07:31 +02:00
Chris Rebert
9546fc9cf0
fix typo in CSS docs; fixes #8992
...
"from" => "form"
2013-08-01 17:05:23 -07:00
Guillermo González de Agüero
655e84c532
Removed data-toggle class when it wasn't been applied
2013-08-01 20:13:08 +02:00
Guillermo González de Agüero
824d5d5de4
Fix #8944
2013-08-01 20:07:34 +02:00
Chris Rebert
cbd0b7a505
Merge pull request #8965 from leonardovcid/patch-1
...
Correct comment which is showing a wrong mixin call example (mixins.less)
2013-08-01 09:33:09 -07:00
Jeff Tickle
1583dd55e9
Added classes for lg-pull, lg-push, lg-offset, sm-pull, sm-push, sm-offset
2013-08-01 12:16:20 -04:00
Bass Jobsen
a5641b0cca
Update input-groups.less
...
align inline radio and checkbox groups with their label for horizontal forms, see http://stackoverflow.com/q/17990310/1596547 (Question 2)
2013-08-01 16:05:07 +02:00
leonardovcid
15b98a0bb1
Correct comment which is showing a wrong mixin call example (mixins.less)
...
I was copy-pasting the example and it wasn't working. Then I found that the example in the comment was a typo.
Thanks
2013-08-01 14:39:28 +01:00
Jacob Thornton
7a3c61ee33
fixes #8892
2013-07-31 22:57:00 -07:00
Jacob Thornton
ccd4c9d7b5
fixes #8864
2013-07-31 22:28:05 -07:00
liuyl
56aedcb713
add table-layout
2013-08-01 11:26:12 +08:00
Francis Brunelle
521ff5c8a7
add nav to media object and thumbnails
2013-07-31 22:37:36 -04:00
Mark Otto
e9413315b5
fixes #8937 : align the dropdown menus in input groups
2013-07-31 18:06:20 -07:00
Mark Otto
3cdb07fab3
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-07-31 18:02:49 -07:00
Mark Otto
4c27f3ce80
Run make on prev work
2013-07-31 17:07:55 -07:00
Chris Rebert
e660963689
use separate form-groups in horiz form example for greater generality; fixes #8925
2013-07-31 16:47:22 -07:00
Chris Rebert
f62fb27b04
Merge pull request #8911 from codejet/patch-1
...
title attr, not tag, in tooltip/popover docs
2013-07-31 12:18:09 -07:00
Oliver Schmidt
f5f171f0ed
Update javascript.html
2013-07-31 20:51:37 +02:00
Mark Otto
f43fa23ae0
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-07-31 10:27:52 -07:00
Mark Otto
29b36bf962
dat purple homepage-- http://www.youtube.com/watch?v=k2C5TjS2sh4
2013-07-31 10:27:43 -07:00
Mark Otto
d7d0f226f9
Merge pull request #8915 from diowa/whitespaces-tabs-etc
...
Removed trailing whitespaces and hard tabs
2013-07-31 10:24:20 -07:00
Mark Otto
ba05b7a63c
Merge pull request #8908 from bbeng89/3.0.0-wip
...
Small fix to justified button groups docs
2013-07-31 09:48:33 -07:00
Mark Otto
daed9378ca
Merge pull request #8899 from englishtown/twbs-pullrequest
...
Miss one 'div' close tag under components page
2013-07-31 09:44:27 -07:00
Cesidio Di Landa
3696530aaf
Removed trailing whitespaces
...
Changed hard tabs to soft tabs
2013-07-31 18:11:11 +02:00
