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

5328 Commits

Author SHA1 Message Date
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
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
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
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
Oliver Schmidt
034fb3bc87 Update javascript.html 2013-07-31 16:14:27 +02:00
Blake Bengtson
2433faa528 Small fix to justified button groups docs 2013-07-31 08:39:07 -05:00
faceach
a538c8dfb3 miss one 'div' close tag under components page 2013-07-31 18:57:39 +08:00
Chris Rebert
55e1fcef60 Merge pull request #8885 from mikefrancis/patch-1
Added attribute whitespace
2013-07-31 01:33:18 -07:00
Mike Francis
873f884327 Added attribute whitespace 2013-07-31 09:26:45 +01:00
Mark Otto
46a424fc93 edit modal docs code to fix #8769 2013-07-30 15:14:38 -07:00
Mark Otto
e6ac348bfc Merge pull request #8726 from andreypopp/3.0.0-wip
Fix out of order variable declaration order
2013-07-30 14:14:51 -07:00
Mark Otto
96eef43dee Merge pull request #8852 from briannelsondesign/label_baselines
Adjusts vertical alignment of labels and badges
2013-07-30 14:07:00 -07:00
fat
fc8f4f0465 fixes #8216 2013-07-30 13:41:24 -07:00
fat
c54b8adb85 fixes #8814 2013-07-30 13:33:56 -07:00
fat
5ee2a221ca fixes #8816 2013-07-30 13:31:57 -07:00
Chris Rebert
da98c5c2c3 trivial spacing fix 2013-07-30 12:35:39 -07:00
Mark Otto
d9266f95c4 Merge pull request #8846 from ggam/patch-5
Fix grid sizes documentation
2013-07-30 09:40:01 -07:00
Brian Nelson
dcbf1e51c4 Compiles changes to CSS 2013-07-30 11:35:13 -04:00
Brian Nelson
220fee80bf Improves label and badge alignment so text aligns with baseline 2013-07-30 11:23:25 -04:00
Guillermo González de Agüero
3d54fe180c Fix #8658 2013-07-30 16:34:13 +02:00
Chris Rebert
5ef1fe160e Merge pull request #8821 from twbs/twbs-license-faq-tweak
tweak part of license FAQ to reflect Twitter->twbs change
2013-07-29 22:11:37 -07:00
Chris Rebert
652f056556 tweak part of license FAQ to reflect Twitter->twbs change 2013-07-29 22:10:53 -07:00
Mark Otto
8b5e41d900 Refactor .input-* sizing a bit by not chaining to .form-control (fixes #8672) 2013-07-29 17:30:36 -07:00
Mark Otto
09edfcf8c2 fixes #8670: move list group bg color to individual items for mo betta rendering 2013-07-29 17:23:08 -07:00
Mark Otto
87c98478d2 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-07-29 17:21:31 -07:00
Mark Otto
ddafa9a0bb Attempts to fix #8645: add code comments to grid example to clarify behavior 2013-07-29 17:21:22 -07:00
Chris Rebert
7ae32074a0 Remove hack/workaround for jshint/grunt bug that's now fixed
See https://github.com/gruntjs/grunt-contrib-jshint/issues/86
2013-07-29 17:17:52 -07:00
Mark Otto
fa854a58bd Merge pull request #8818 from twbs/firefox-input-btn-docs-note
make it clearer than <input> buttons are slightly broken on Firefox
2013-07-29 17:16:02 -07:00