rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity
7,521 Commits 108 Branches 89 Tags 547 MiB
4da03c83c5
Commit Graph

19 Commits

Author SHA1 Message Date
Mark Otto
46c3d27468 Merge branch 'master' into pr/11435 
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.min.css
 2013-12-14 16:56:56 -08:00
Mark Otto
853b69f2df Fixes #11351: Correct grid class reset on input groups by using attribute selector, not an old class from v3 betas 2013-11-30 12:52:08 -08:00
Zlatan Vasović
aad447e290 Fix #11400 and #11431 2013-11-09 22:49:58 +01:00
Mark Otto
8bea86e2ef fixes #10024: Use negative margin to fix the border between button and input in input groups 2013-09-06 09:50:38 -07:00
Mark Otto
4b53ea52e9 fixes #10223: adds color to input addon 2013-09-01 09:53:41 +02:00
Chris Rebert
3a67054536 fix copypasta-o to fully fix #9295 2013-08-14 19:07:14 -07:00
Mark Otto
49576704ea finish fixing #9295: add button group buttons to new input group sizing 2013-08-12 21:27:15 -07:00
Mark Otto
a78c8d9c04 Newfangled input and button group sizing (fixes #9295) 
Instead of applying `.btn-` or `.input-` to individual elements in
button and input groups, we now have new sizing classes to keep your
markup a little leaner.

* Add `.input-group-sm` or `.input-group-lg` to your `.input-group` to
replicate `.input-sm` and `.input-lg`, respectively.
* Add `.btn-group-xs`, `.btn-group-sm`, or `.btn-group-lg` to your
`.btn-group` to replicate `.btn-xs`, `.btn-sm`, and `. btn-lg`,
respectively.

Both sets of new sizing classes simply use the existing individual
sizing classes as mixins, so customization of them is automatically
inherited when compiling.
 2013-08-12 14:03:57 -07:00
Mark Otto
a66cdb0c30 addressing #9189 manually, part 4: input group background var 2013-08-11 18:09:56 -07:00
Mark Otto
ab090a29fb Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-05 16:15:43 -07:00
Mark Otto
98df9495cc remove dupe border-box 2013-08-05 16:15:36 -07:00
geedmo
c2737771b4 Fix Issue #8175 - remove lh for input-lg|sm 2013-08-05 19:58:38 -03:00
geedmo
7bc817bcba Fix Issue #8175 2013-08-05 19:43:39 -03:00
Chris Rebert
23ef8c0c20 Greater standardization of sizing terminology 
In class names:
* large => lg
* small => sm
* mini => xs ("Extra small")

In screen size categories:
* Tiny => Extra small
 2013-08-03 21:39:57 -07:00
liuyl
4bbbf774a4 add line-height 2013-08-04 09:27:23 +08:00
Mark Otto
9435991ff0 move form layouts from input groups back to forms (messed this up in b281ad6409) 2013-08-02 18:48:44 -07: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
Mark Otto
e9413315b5 fixes #8937: align the dropdown menus in input groups 2013-07-31 18:06:20 -07:00
Mark Otto
b281ad6409 Input groups overhaul 
* Moves input groups CSS into separate file
* Moves input groups docs into the Components page
* Add support for radios and checkboxes in input groups to fix #8679
 2013-07-27 18:56:31 -07:00