Mark Otto
|
163f58ff81
|
add heads up label to new docs mention
|
2012-02-26 23:31:12 -08:00 |
|
Mark Otto
|
dd94f8d509
|
remove warning from icons section about :after labels, add section to explain spacing
|
2012-02-26 23:30:15 -08:00 |
|
Mark Otto
|
1a781a707e
|
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
docs/assets/bootstrap.zip
|
2012-02-26 23:16:11 -08:00 |
|
Mark Otto
|
ccf7697185
|
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
docs/assets/bootstrap.zip
|
2012-02-26 23:15:36 -08:00 |
|
Jacob Thornton
|
43760eb202
|
fix for @pamelafox and #1861
|
2012-02-24 22:17:36 -08:00 |
|
Jacob Thornton
|
fb74018ae2
|
and pause on hover option to carousel
|
2012-02-24 21:51:39 -08:00 |
|
Mark Otto
|
6abb2059eb
|
fix docs example in js page per #2225
|
2012-02-24 21:06:17 -08:00 |
|
Mark Otto
|
4309153051
|
add version to docs homepage, fix docs example for forms
|
2012-02-24 21:02:24 -08:00 |
|
Jacob Thornton
|
74a3c763b4
|
add note about backdrop static
|
2012-02-23 16:24:33 -08:00 |
|
Mark Otto
|
0e8427e7b1
|
update modal footers to use text-align instead of float on buttons for alignment
|
2012-02-22 22:38:54 -08:00 |
|
Mark Otto
|
8609a77bd2
|
add clearfix to .form-actions for .pull-right and .pull-left supported buttons, per #1978 and #2173
|
2012-02-22 11:16:32 -08:00 |
|
Mark Otto
|
0ed6d3b28e
|
Merge branch 'couchbaselabs-clearfix-ing-form-actions' into 2.0.2-wip
|
2012-02-22 11:15:53 -08:00 |
|
Mark Otto
|
6f3b4b857f
|
Merge branch 'clearfix-ing-form-actions' of https://github.com/couchbaselabs/bootstrap into couchbaselabs-clearfix-ing-form-actions
|
2012-02-22 11:15:44 -08:00 |
|
Mark Otto
|
a0ec422444
|
fix #1954: icons in tabs add jank border
|
2012-02-22 08:36:07 -08:00 |
|
Mark Otto
|
b86969f762
|
restore fixed navbar container reset to grid mixin, add override for inputs within grid mixins to fix #2080
|
2012-02-22 08:21:29 -08:00 |
|
Mark Otto
|
4410ede8ed
|
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
docs/assets/bootstrap.zip
|
2012-02-22 08:12:51 -08:00 |
|
Mark Otto
|
92a54a7b72
|
tighten padding on labels and badges given default line-height
|
2012-02-22 08:12:25 -08:00 |
|
Jacob Thornton
|
f3b6cf1d6d
|
Merge branch '2.0.2-wip' of https://github.com/twitter/bootstrap into 2.0.2-wip
Conflicts:
docs/assets/bootstrap.zip
less/mixins.less
|
2012-02-21 23:18:18 -08:00 |
|
Jacob Thornton
|
5ad5dde1e2
|
rewrite the grid system. Clean shit up tons - only generate 12 columns by default - custom builder will do differently if you request it.
|
2012-02-21 23:16:06 -08:00 |
|
Mark Otto
|
a139167489
|
set width to auto for default navbar container, then override it later for fixed navbars (done all via the #gridSystem mixins)
|
2012-02-21 23:15:43 -08:00 |
|
Mark Otto
|
9b524a16e9
|
clear up table styles and docs to fix rowspan and colspan issues for bordered tables, per #1918
|
2012-02-21 23:00:02 -08:00 |
|
Mark Otto
|
917df6703c
|
clarify responsive docs on media queries
|
2012-02-21 22:40:21 -08:00 |
|
Mark Otto
|
8bd67bb124
|
clean up and simplify support for bottom navbar by automagically turning dropdowns into dropups
|
2012-02-21 22:09:51 -08:00 |
|
Mark Otto
|
20221a67c2
|
Merge branch '2.0/fork/components/dropup' of https://github.com/buraktuyan/bootstrap into buraktuyan-2.0/fork/components/dropup
Conflicts:
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache
less/navbar.less
|
2012-02-21 22:01:39 -08:00 |
|
Mark Otto
|
b4cc6c74f5
|
add support and docs for .navbar-fixed-bottom
|
2012-02-21 21:12:16 -08:00 |
|
Mark Otto
|
e3ae517555
|
move container up in default grid mixin
|
2012-02-21 15:21:18 -08:00 |
|
Mark Otto
|
8665fa8c50
|
move table columns mixin to mixins.less
|
2012-02-21 15:18:05 -08:00 |
|
Mark Otto
|
575072b74b
|
Merge pull request #2143 from inmarelibero/2.0.2-wip
Add columns 13-24 for grid systems to enable customization up to 24 cols
|
2012-02-21 15:15:56 -08:00 |
|
Mark Otto
|
bb16b9bef2
|
fix second part of #1962
|
2012-02-21 13:52:02 -08:00 |
|
Mark Otto
|
664a5c4438
|
update forms help-block
|
2012-02-21 13:43:13 -08:00 |
|
Emanuele Gaspari
|
1cfb3fd03a
|
substituted hard-coded number of columns (12) with @gridColumns
|
2012-02-21 19:19:15 +01:00 |
|
Emanuele Gaspari
|
45cec4a6fa
|
added .span[13-24] and .offset[12-23] to support up to 24-columns layout
|
2012-02-21 19:07:55 +01:00 |
|
Mark Otto
|
d908731566
|
Merge branch '2.0.2-wip-nowrapfix' of https://github.com/andriijas/bootstrap into andriijas-2.0.2-wip-nowrapfix
Conflicts:
docs/assets/bootstrap.zip
|
2012-02-21 09:05:04 -08:00 |
|
Mark Otto
|
187b3bd4bd
|
Merge pull request #2129 from andriijas/2.0.2-wip-navtabs
Width fix on .tab-content
|
2012-02-21 09:00:10 -08:00 |
|
Mark Otto
|
a78faee589
|
Merge pull request #2138 from laczoka/2.0.2-wip
Fix for #2137, adding select to input append/prepend
|
2012-02-21 08:29:08 -08:00 |
|
Mark Otto
|
80abc50d3e
|
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
docs/assets/bootstrap.zip
|
2012-02-21 08:25:19 -08:00 |
|
Mark Otto
|
f3ad4c7183
|
adding responsive utility classes and matching docs section with super neato table and test
|
2012-02-21 08:24:18 -08:00 |
|
Laszlo Toeroek
|
e423fc2629
|
.input-append should work for select element, fixes #2137
|
2012-02-21 16:32:57 +01:00 |
|
Andreas Cederström
|
f50b2c9b92
|
100% width on .tab-content
|
2012-02-21 09:20:46 +01:00 |
|
Andreas Cederström
|
dfd0326186
|
Bring back nowrap to labels and badges
|
2012-02-21 08:17:16 +01:00 |
|
Jacob Thornton
|
d149a131c1
|
remake
|
2012-02-20 22:02:04 -08:00 |
|
Jacob Thornton
|
f046c12bd2
|
fix cycling in carousel
|
2012-02-20 22:01:38 -08:00 |
|
Mark Otto
|
06d4756114
|
adding basic badges support
|
2012-02-20 21:20:06 -08:00 |
|
Mark Otto
|
d2630ff84e
|
introduce new mixin to do navbar vertical centering
|
2012-02-20 19:14:26 -08:00 |
|
Mark Otto
|
143b3db2c9
|
update inline forms to resolve checkbox label with space in it and overlapping content, per #1969
|
2012-02-20 18:56:05 -08:00 |
|
Mark Otto
|
331c85724a
|
remove max-width on img from reset and put in docs only, per #1552
|
2012-02-20 16:18:13 -08:00 |
|
Mark Otto
|
9c74f21966
|
fix overflow issue on tabbed content per #2079
|
2012-02-20 16:06:42 -08:00 |
|
Mark Otto
|
91fe8bc0f4
|
remake after merging buttons update
|
2012-02-20 13:37:24 -08:00 |
|
Mark Otto
|
2b8fc018ba
|
Merge branch 'billyvg-main' into 2.0.2-wip
|
2012-02-20 13:36:56 -08:00 |
|
Billy Vong
|
e18a35784a
|
Update old button selectors 'small' and 'large' to be 'btn-small' and 'btn-large'
|
2012-02-20 13:16:49 -08:00 |
|