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

2558 Commits

Author SHA1 Message Date
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
Mark Otto
7ef7547a14 add horizontal divider support to nav list, including documentation for it, per #2106 2012-02-20 12:38:49 -08:00
Mark Otto
6df925bc75 enable use of span in place of a for .disabled in pagination, per #1406 2012-02-19 23:51:59 -08:00
Mark Otto
9f608411cb no more uppercase in readme 2012-02-19 22:53:34 -08:00
Mark Otto
f81e5fbe9f readme cleanup 2012-02-19 22:52:32 -08:00
Mark Otto
9b09d1de86 move overflow and max-height on modal to modal-body instead 2012-02-19 21:55:09 -08:00
Mark Otto
1c7d346767 quick edit to new global styles section 2012-02-19 16:40:41 -08:00
Mark Otto
8247cb3362 add new global styles docs section for mentioning doctype requirements, base body changes, and type/links; also tightened up code styles 2012-02-19 16:28:46 -08:00
Mark Otto
f4f34ab12f Merge branch 'andriijas-2.0.1-wip' into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-02-19 16:00:54 -08:00
Mark Otto
59d570fc16 Merge branch 'abbr' of https://github.com/jacobrask/bootstrap into jacobrask-abbr
Conflicts:
	docs/assets/bootstrap.zip
2012-02-19 15:38:34 -08:00
Mark Otto
3470c0dc49 Merge branch 'alert-headers' of https://github.com/jacobrask/bootstrap into jacobrask-alert-headers
Conflicts:
	docs/assets/bootstrap.zip
2012-02-19 15:04:52 -08:00
Mark Otto
89ccbdf8d1 Merge branch 'gridcontainer' of https://github.com/jacobrask/bootstrap into jacobrask-gridcontainer
Conflicts:
	docs/assets/bootstrap.zip
2012-02-19 15:01:25 -08:00
Mark Otto
5f2d2893d2 Merge branch 'opera-radial' of https://github.com/jacobrask/bootstrap into jacobrask-opera-radial
Conflicts:
	docs/assets/bootstrap.zip
2012-02-19 14:59:42 -08:00
Mark Otto
8482cc4cb3 commit leftover from make 2012-02-19 14:55:07 -08:00
Mark Otto
adbbf17ee4 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-02-19 14:54:53 -08:00
Mark Otto
16d12396d0 simplify text color in navbar by placing the color on global .navbar component 2012-02-19 14:53:07 -08:00
Mark Otto
532242e626 Merge pull request #2089 from jacobrask/ie6hack
Remove IE6 hacks
2012-02-19 14:52:06 -08:00
Jacob Rask
f28140897e Update documentation for abbreviations 2012-02-19 22:14:18 +01:00
Jacob Rask
e145619f6d Remove underscore hack for IE6
IE6 does not seem to be supported by Bootstrap, and reducing the number
of unused and invalid properties is always nice.
2012-02-19 21:54:38 +01:00
Jacob Rask
82457603b6 Separate span12 and container classes
If you have less than 12 columns, container is too wide. Instead
generate container width using the @gridColumns variable.

Also remove duplicate container width property.
2012-02-19 21:49:17 +01:00
Jacob Rask
ad546c9631 Add Opera-prefixed radial gradient
Tested and works in Opera 11.61
2012-02-19 21:42:12 +01:00
Jacob Rask
51ec513b5c Use inherit on alert-heading color
Heading then inherits from the parent alert.
Avoids a lot of extra unneccessary CSS.
2012-02-19 21:29:32 +01:00
Jacob Rask
c1775da187 Add class for upper case abbreviations, aka initialisms
Read more:
 * http://en.wikipedia.org/wiki/Abbreviation
 * http://en.wikipedia.org/wiki/Initialism
2012-02-19 21:24:06 +01:00
Jacob Rask
f08b407667 Only show help cursor/border for abbr with title 2012-02-19 21:23:17 +01:00
Jacob Rask
df757fb040 All abbreviations are not upper case initialisms
Read more:
 * http://developers.whatwg.org/text-level-semantics.html#the-abbr-element
 * http://en.wikipedia.org/wiki/Abbreviation
 * http://en.wikipedia.org/wiki/Initialism
2012-02-19 21:21:44 +01:00
Jacob Thornton
ac6e667ad9 Merge branch 'master' into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-02-18 23:31:37 -08:00
Jacob Thornton
3d58b46226 fix bootstrap-button toggle regression + tests 2012-02-18 23:29:58 -08:00
Mark Otto
1948e985a3 merge in and remake for responsive navbar dropdown fix 2012-02-18 20:09:34 -08:00
Mark Otto
ba97f56912 Merge branch 'tagliala-collapse-dropdown-fix' into 2.0.2-wip 2012-02-18 20:08:11 -08:00