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

6130 Commits

Author SHA1 Message Date
Mark Otto
5539db5237 Navbar update
Addresses a few different cases where the navbar has and doesn't have a
container, and accordingly adjusts the padding and margin of key
elements.
2013-08-17 21:00:13 -07:00
Mark Otto
b413aff045 Favicon in navbar example 2013-08-17 20:35:31 -07:00
Mark Otto
d713f8341c Update jumbotron
* Defaults to no rounded corners and full width in the viewport
* When in a container, the jumbotron has extra padding and will have
rounded corners
* Updates default jumbotron example to show the full width default
display

Fixes #9759.
2013-08-17 20:33:52 -07:00
Mark Otto
d9e38312d2 copy edit 2013-08-17 20:11:18 -07:00
Mark Otto
f6c151aa20 Merge pull request #9756 from twbs/bs3_theme
BS3: Add optional theme (fixes #8706)
2013-08-17 19:17:25 -07:00
Mark Otto
9a66906d3d generic comment 2013-08-17 19:14:13 -07:00
Mark Otto
761b80c391 Merge branch '3.0.0-wip' into bs3_theme 2013-08-17 19:09:33 -07:00
fat
06c3d87973 use correct arg name 2013-08-17 19:07:59 -07:00
fat
9828aa5b4d Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 19:04:58 -07:00
fat
00d2986858 add logging 2013-08-17 19:04:41 -07:00
Mark Otto
b31ce3204d Merge branch '3.0.0-wip' into bs3_theme 2013-08-17 19:00:35 -07:00
Mark Otto
0098c358c8 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 19:00:22 -07:00
Mark Otto
3780edd956 update examples to use new .btn-lg class 2013-08-17 19:00:14 -07:00
Mark Otto
c56a749323 Finish first pass at and docment Bootstrap v2-ish theme
* Adds new "theme" example
* Adds new theme.less file to provide all the overrides and additional
styles for the theme
* theme.less compiles, via Grunt, to two new files to `dist/css`,
bootstrap-theme.css and bootstrap-theme.min.css
2013-08-17 18:59:50 -07:00
fat
a39cb4be90 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 18:41:51 -07:00
fat
29bf254fc3 move customizer onto gists 2013-08-17 18:41:36 -07:00
Chris Rebert
405df13044 fix typo in JS docs 2013-08-17 17:44:42 -07:00
Chris Rebert
cc3077ac17 improve grammar in "Disabling responsiveness" docs 2013-08-17 17:41:47 -07:00
Chris Rebert
50b9c7339a comma & <code> in "Modals and mobile devices" docs 2013-08-17 17:38:53 -07:00
Mark Otto
ba20e512ce Merge branch '3.0.0-wip' into bs3_theme
Conflicts:
	dist/css/bootstrap.min.css
2013-08-17 17:31:58 -07:00
Mark Otto
e29c23afab Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 17:27:05 -07:00
Chris Rebert
27424ee422 improve grammar in "Alternate customization methods" docs 2013-08-17 17:26:54 -07:00
Mark Otto
e587219958 Fix navbar brand alignment by removing header padding when above 768px 2013-08-17 17:26:52 -07:00
Mark Otto
90d5e48f5f Add alert for customizer errors 2013-08-17 17:26:36 -07:00
Mark Otto
b3e06aea01 Delete the customizer layout (again?) 2013-08-17 17:26:05 -07:00
fat
5d84e02c1c add the customizer builder to the default grunt task 2013-08-17 16:44:54 -07:00
fat
2dbf02b129 rebuild 2013-08-17 16:19:09 -07:00
fat
4696565044 fixes #9745 2013-08-17 16:18:26 -07:00
fat
63ac9e354f fixes #9674 2013-08-17 16:13:48 -07:00
fat
70f1cac841 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 16:11:41 -07:00
fat
c0eabdda9f fixes #9543 2013-08-17 16:11:05 -07:00
Mark Otto
0b96015dc9 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 16:10:35 -07:00
Mark Otto
c8b51e1cd8 Update description in composer 2013-08-17 15:58:04 -07:00
fat
d754e6564d add some crap 2013-08-17 15:54:42 -07:00
fat
8b5314096f Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 15:49:27 -07:00
fat
1d53dd31f5 add role=menu to html 2013-08-17 15:48:29 -07:00
Mark Otto
6636734388 Fixes #9752: clear floats in .panel-body 2013-08-17 15:46:42 -07:00
Mark Otto
3fbc1fc555 Fixes #9749: provide js bin link in readme for easier bug reports 2013-08-17 15:43:54 -07:00
Mark Otto
665559a450 smaller example screenshots, fixes #9748 2013-08-17 15:35:15 -07:00
Mark Otto
61caed21e2 More consistent naming with screen size variables using xs, sm, md, and lg 2013-08-17 15:21:38 -07:00
Mark Otto
5ba19dc884 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 15:08:02 -07:00
Mark Otto
4f97df8aa4 update non-responsive docs and example to really disable it 2013-08-17 15:07:53 -07:00
fat
a01b1dd71a fixes #9585 2013-08-17 15:07:26 -07:00
fat
f4c7629592 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 15:06:29 -07:00
fat
a10ec62f63 fixes #9579 2013-08-17 15:05:59 -07:00
Mark Otto
6c765ac821 add nonresponsive template to examples 2013-08-17 15:02:38 -07:00
Mark Otto
fdb7121f41 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 14:49:58 -07:00
Mark Otto
3bcadfc2c5 brand, not title, in navbar examples 2013-08-17 14:42:55 -07:00
fat
484d51ce48 add doc comment for #9517 2013-08-17 14:42:44 -07:00
Mark Otto
3cb38197f2 more specific panel titles and docs notes 2013-08-17 14:27:21 -07:00