2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-18 12:39:41 +03:00
Commit Graph

21773 Commits

Author SHA1 Message Date
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
Guillermo González de Agüero ee6db98136 Included required JavaScript in navbar-static-top 2013-08-02 11:53:25 +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 7e19b6b02c add the theme file derp 2013-07-31 18:02:41 -07:00
Mark Otto 3c39bc0d96 start on navbar 2013-07-31 18:02:12 -07:00
Mark Otto 60e1f5e0e8 start with buttons 2013-07-31 17:48:22 -07:00
Mark Otto 4c27f3ce80 Run make on prev work 2013-07-31 17:07:55 -07:00
Mark Otto afef74d03d Updated homepage more 2013-07-31 17:05:06 -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
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
Archan Luhar b9f59428f9 Removed background color from #gradient mixins to support transparent gradients 2013-07-30 19:30:24 -07:00
Mark Otto 031ed98c8b Merge pull request #22 from Dev-Ad/patch-1
.navbar-wrapper need higher z-index to be on top of the carousel
2013-07-30 17:43:55 -07:00
Mark Otto 2a4aacc037 Merge pull request #9 from ssorallen/carousel-img-height-js-path
Carousel image height and JS path
2013-07-30 17:43:39 -07:00
Mark Otto 26053b94e5 Merge pull request #7 from sprice/update_scripts
Update scripts
2013-07-30 17:43:18 -07:00
Mark Otto 1edaabb250 Merge pull request #18 from p8952/local-jquery
use the local copy of jquery
2013-07-30 17:42:46 -07:00
Mark Otto aa90811fb0 Merge pull request #13 from hph/master
Fix relative links to examples and links to docs
2013-07-30 17:42:33 -07:00
Mark Otto a9830a0bab Merge pull request #10 from ssorallen/sigin-input-block
Replace 'input-block-level' with 'form-control'
2013-07-30 17:42:10 -07:00
Mark Otto 6c2db4bbbe Merge pull request #16 from ssorallen/starter-template-js
Add jQuery + Bootstrap JS to starter template
2013-07-30 17:41:57 -07:00