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

6150 Commits

Author SHA1 Message Date
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
Mark Otto
4a060881d7 Merge pull request #11 from ssorallen/jumbotron-js-inputs
Jumbotron JS + "form-control"
2013-07-30 17:41:43 -07:00
Mark Otto
0f23f514ab Merge pull request #24 from ssorallen/sticky-footer-js
Sticky footer example JS and navbar dropdown style
2013-07-30 17:37:21 -07: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
Ross Allen
ad01dd8ce8 Use correct class for header in jumbotron dropdown nav 2013-07-30 10:33:48 -07:00
Ross Allen
6a8f76f020 Enable dropdown in sticky-footer with Bootstrap JS
The sticky-footer example uses a drop down in its navbar, and dropdowns
require Bootstrap's JS to work.

Use the minified version of Bootstrap since this example is about the
CSS and not about the JS.
2013-07-30 10:10:34 -07:00
Ross Allen
934cf4f683 Use correct dropdown header class in sticky-footer
"nav-header" does not exist in Bootstrap. The class used for headers
in dropdowns is "dropdown-header".
2013-07-30 10:09:30 -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
Gerhard
a9144b50ea .navbar-wrapper need higher z-index to be on top of the carousel 2013-07-30 16:23:34 +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
liuyl
7cfcfdfe64 make navbar-text float left 2013-07-30 09:30:21 +08: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