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

103 Commits

Author SHA1 Message Date
Chris Rebert
fa3959a1e1 rm redundant ampersands from button-groups LESS 2013-08-18 15:05:42 -07:00
Mark Otto
73a1a4133c combine and simplify caret border widths 2013-08-18 10:08:18 -07:00
liuyl
ce410dc36e fixed caret 2013-08-18 20:13:48 +08:00
Mark Otto
06e6da0918 fixes #9596: proper dropup caret colors 2013-08-15 11:36:08 -07:00
Luca Wehrstedt
1e1b5c737b fixes #9406: proper border for justified btn-groups inside tables 2013-08-14 12:37:48 +02:00
Mark Otto
69a3e9b4d0 enable button groups in vertical button groups 2013-08-13 10:24:18 -07:00
Mark Otto
f15f259876 derp 2013-08-13 09:59:38 -07:00
Mark Otto
b0ab806dcc fix negative indenting in button group for nested button groups 2013-08-12 23:44:50 -07:00
Mark Otto
fb8ae7e514 drop the class on the button group toggles CSS (alt fix to #9297) 2013-08-12 15:46:11 -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
f3bd6dbf03 fixes #8647: remove focus outline on :focus of buttons in button groups 2013-08-05 16:16:58 -07:00
Mark Otto
04dc221037 Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip
Conflicts:
	customize.html
	less/alerts.less
	less/badges.less
	less/button-groups.less
	less/buttons.less
	less/carousel.less
2013-08-05 16:03:10 -07:00
Mark Otto
01c46bfc0f More button updates
- Fixes #9113 (caret colors in dropdown buttons)
- Darken borders around buttons for contrast in button groups
2013-08-05 11:30:50 -07:00
Mark Otto
d95ff9da81 fixes #8805: ensure .active buttons in button groups behave like :active buttons 2013-08-04 23:27:15 -07:00
liuyl
584759eac0 btngroups 2013-08-05 08:29:01 +08: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
56aedcb713 add table-layout 2013-08-01 11:26:12 +08:00
Mark Otto
d9c9afa6d1 add focus to button group active button behavior 2013-07-29 14:53:55 -07:00
syed
1aedb7862c move things around
Moved alerts, badges, button groups, buttons, carousel, close to
variables.less and customize.html
2013-07-28 17:32:08 +05:00
liuyl
f5fc6254c7 refactor button-groups.less 2013-07-21 20:03:59 +08:00
fat
37e899d766 get button js working with actual form elements p cooll 2013-07-18 00:59:31 -07:00
Chris Rebert
f12d6401f2 more nesting in button-groups.less 2013-07-07 15:27:06 -07:00
Mark Otto
0a92efce0c Nuke hella things
* Any mentions of .btn-mini
* Old docs page that somehow found it's way back
2013-06-28 09:24:46 -07:00
Robert Burns
a38a3429fc Fix caret position 2013-05-13 20:03:53 -04:00
Blake Embrey
579d566299 Update button groups to use not selector and remove redundant CSS. 2013-05-09 16:53:28 -07:00
Mark Otto
d7f84d1220 Require .btn-default for regular buttons
* Instead of , use  for standard, gray button
* Improves ability to customize buttons by encouraging folks to not override .btn and thus overriding all button modifier classes
* Updates docs to reflect the change
* Reorganize buttons CSS
2013-05-07 18:07:06 -07:00
Mark Otto
7d41a38769 Fixes #7511: add support for nested button groups so you can use dropdowns in your button groups 2013-05-03 16:16:26 -07:00
Mark Otto
aee25786a7 fuck everything about .clear_float() -- restore .clearfix() as mixin 2013-03-30 13:23:18 -07:00
Mark Otto
8c9e9e28cf Fix vertical button groups 2013-03-16 13:03:31 -07:00
Mark Otto
efbf8373a5 Use form elements in checkbox and radio button groups
* Uses .btn on label elements with nested checkbox and radio controls within
* Updated examples to reflect change in HTML and CSS
* Had to add .active all buttons for proper state highlighting (mimicing the :active pseudo state)
* Still needs JavaScript plugin updated by @fat
2013-03-16 12:34:07 -07:00
Mark Otto
bfc4aaf6e8 Holy fucking shit fix that input group with buttons rounded corner noise 2013-02-28 21:19:02 -08:00
Mark Otto
9d763e805b Remove margin between buttons in button groups; use border-radius mixins to avoid reseting border-radii that don't need resetting 2013-02-28 19:34:02 -08:00
Mark Otto
74c8a5611d Increase margins and line-height on h3; overhaul button dropdown docs 2013-02-05 00:49:54 -08:00
Mark Otto
c09b994eea Add justified button groups for link buttons; reorganize dropdowns and button groups docs sections 2013-02-05 00:30:03 -08:00
Mark Otto
c64aa26d06 Add @btn-color variable and use in buttons and carets; fixes dropup caret as well 2013-02-02 13:03:18 -08:00
Mark Otto
ab38493e91 Restore button groups 2013-01-16 13:04:29 -08:00
Mark Otto
76ed6b0b2c Remove comment out code and simplify what's left for button group toggles 2013-01-13 04:05:34 -08:00
Mark Otto
583fc4b962 buttons and button group flattening improvements 2013-01-12 18:52:06 -08:00
Mark Otto
fb4fc323a2 remove font-sizes from button group btn sizes 2013-01-12 17:54:30 -08:00
Mark Otto
a9a66e9c34 finetune buttons flattened colors 2013-01-12 17:51:57 -08:00
Mark Otto
c11f41ba04 flatten buttons and forms 2012-12-21 00:50:28 -08:00
Mark Otto
72f13e2870 Merge branch '2.2.3' into 3.0.0-wip
Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap-affix.js
	docs/assets/js/bootstrap-alert.js
	docs/assets/js/bootstrap-button.js
	docs/assets/js/bootstrap-carousel.js
	docs/assets/js/bootstrap-collapse.js
	docs/assets/js/bootstrap-dropdown.js
	docs/assets/js/bootstrap-modal.js
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap-scrollspy.js
	docs/assets/js/bootstrap-tab.js
	docs/assets/js/bootstrap-tooltip.js
	docs/assets/js/bootstrap-transition.js
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/index.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/index.mustache
	docs/templates/pages/javascript.mustache
	js/bootstrap-affix.js
	js/bootstrap-alert.js
	js/bootstrap-button.js
	js/bootstrap-carousel.js
	js/bootstrap-collapse.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tab.js
	js/bootstrap-tooltip.js
	js/bootstrap-transition.js
	js/bootstrap-typeahead.js
	less/bootstrap.less
	less/responsive.less
	less/type.less
	package.json
2012-12-20 00:02:52 -08:00
Mark Otto
9b4e5746a4 More button tweaks 2012-12-19 22:54:04 -08:00
Mark Otto
c38b7206eb overhaul buttons 2012-12-19 22:25:56 -08:00
Mark Otto
cddca18f12 Fixes #6174: Caret alignment in small and mini buttons 2012-12-10 10:59:57 -08:00
Mark Otto
19ee7999f4 remove single corner border-radius mixins 2012-12-01 14:25:28 -08:00
Mark Otto
9239bfbc7b more vars changed, remove @white var 2012-11-30 15:05:23 -08:00
Mark Otto
b0e2b5813d more consistent variable naming patterns 2012-11-30 14:45:25 -08:00
Mark Otto
7a3d15eb21 Part 1 of unCamelCasing variables 2012-11-30 14:37:24 -08:00
Mark Otto
fca35c0dba Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/alerts.less
	less/button-groups.less
	less/buttons.less
	less/tests/css-tests.html
2012-11-30 00:13:30 -08:00