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

320 Commits

Author SHA1 Message Date
Mark Otto
293a3baca3 More forms overhaul
* Refactor the .forms-horizontal code--much simpler now and built on the Bootstrap grid system instead
* Remove all the margins on form controls for simpler styling everywhere else--was overriding that way too often
* Drop .help-inline, but keep .help-block
* Drop the unused input grid class overrides
2013-05-09 15:05:06 -07:00
Blake Embrey
9716b73f67 Make the border-radius on input-groups to be overrides instead of resets on every size. 2013-05-09 14:48:27 -07:00
Mark Otto
c459c657f8 Update forms
* Overhaul the form control sizing section to only show sizing via grid columns as parents, not as classes on inputs
* Restore the inline-form option
* Restore the bottom margin on form controls and make them block level instead of inline-block
* More misc docs cleanup for forms
2013-05-07 21:56:55 -07:00
Mark Otto
14861e9cc3 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-03 14:11:23 -07:00
Mark Otto
b5d68f59c2 Add cursor: pointer; to .checkbox and .radio and their inline counterparts 2013-05-03 11:56:00 -07:00
Mark Otto
bec8c90fd7 Cleanup .navbar-form styles
* Nuke the commented out navbar forms code that's not currently needed
* Add a few more examples to the .navbar-form docs section
* Remove (for now at least) top padding on checkbox and radios
2013-05-02 22:54:14 -07:00
Kevin Ingersoll
08fea3304a Fix input border flicker in Chrome from @garoevans, closes #7689 2013-05-03 15:33:12 +12:00
Kevin
9ce7f22e99 Adding media queries breakpoints variables 2013-04-27 18:47:47 +02:00
Mark Otto
e0d60b1325 Fixes #7617: lowercase and dash gray color vars 2013-04-21 19:35:36 -07:00
Mark Otto
5fbe66307f more specific comment, better placement of code 2013-04-13 21:45:21 -07:00
Paul Tyng
811a79e16c override normalize.css override 2013-04-13 16:46:17 -03:00
Mark Otto
896ee79473 more consistent forms vars; drop search border radius since no more search form 2013-03-31 17:33:55 -07:00
Mark Otto
626189dbfc @state-*-background to @state-*-bg vars 2013-03-31 17:24:06 -07:00
Mark Otto
9fff2d3fb6 Change error to danger for all classes; add panels component 2013-03-30 14:15:18 -07:00
Mark Otto
aee25786a7 fuck everything about .clear_float() -- restore .clearfix() as mixin 2013-03-30 13:23:18 -07:00
Andreas Cederström
090545ffdf Make sure form actions are properly aligned with form-horizontal 2013-03-28 11:33:18 +01:00
Mark Otto
00169b48bd Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	less/grid.less
2013-03-14 13:25:59 -07:00
Mark Otto
d219b8b964 Set border-box globally instead 2013-03-10 13:24:07 -05:00
Luke Page
5054c17ab8 make less files compile with strict maths in 1.4.0 2013-03-06 16:38:20 +00:00
Mark Otto
bfdc6f8607 Remove support for .uneditable-input 2013-03-03 23:31:09 -08: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
d3cc8f79f4 remove old todo comment 2013-02-17 20:26:44 -08:00
Mark Otto
53091be6d2 remove unnecessary select border reset 2013-02-17 20:26:21 -08:00
Mark Otto
6993fadf7e Simplify input and input group sizing
* Remove .input-mini because who really needs inputs that small
* Remove unnecessary border-radius resets from large and small input groups
2013-02-02 17:31:26 -08:00
Gil Barbara
24f0505bde Update input-group-addon for input sizes 2013-02-01 01:39:26 -02:00
Gil Barbara
e69912c163 Update line-height and padding for input sizes 2013-01-31 19:00:22 -02:00
Mark Otto
9ba14cfb7c More navbar derping 2013-01-16 16:14:41 -08:00
Mark Otto
992e0d922a Re-add and update form styles:
* Restore forms.less file
* Overhaul .radio.inline .checkbox.inline to be .radio-inline or .checkbox-inline
* Update docs to reflect changes
2013-01-16 12:23:05 -08:00
Mark Otto
a33d45f308 Merge branch '3.0.0-wip' into bs3-flatten 2013-01-12 14:16:49 -08:00
Mark Otto
dc5c6d6be8 Simplify form validation states while enabling them to be applied to one field at a time. 2012-12-26 15:57:52 -06:00
Mark Otto
d0baa99aed Remove .text-info and .info form validation states 2012-12-26 14:59:58 -06:00
Mark Otto
070109abc1 Remove .controls-row; instead, folks should use .row and .span* for all their grid input sizing needs when multiple inputs per line are required 2012-12-26 14:09:36 -06:00
Mark Otto
c17673dc61 Restore .form-horizontal 2012-12-26 13:59:09 -06:00
Mark Otto
c11f41ba04 flatten buttons and forms 2012-12-21 00:50:28 -08:00
Chris Rebert
30f72e69e3 add comment regarding caveat of #6199 impl per discussion in/of 14844db862 2012-12-20 11:00:47 -08:00
Mark Otto
14844db862 Holy shit, buttons, button states, and input states updated 2012-12-19 23:37:33 -08:00
Mark Otto
09dde5c84a Merge branch '3.0.0-wip' of https://github.com/cvrebert/bootstrap into cvrebert-3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	less/mixins.less
2012-12-19 23:18:02 -08:00
Mark Otto
51b1a027da Merge branch 'bs3-input-groups' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
2012-12-19 21:02:54 -08:00
Mark Otto
19a94d08d6 Remove support for multiple buttons in input groups because fuck that shit. 2012-12-19 19:33:14 -08:00
Chris Rebert
3b5d4f52a3 fixes #5605: style as disabled all form controls & btns under a disabled fieldset
this is a resubmission of #5875, but now against branch 3.0.0-wip
does not exclude elements under a fieldset's legend
issue #6058 is a duplicate of #5605
2012-12-09 23:42:05 -08:00
Mark Otto
4245e8ebb5 Fix checkbox and radios example 2012-12-09 22:13:40 -08:00
Mark Otto
4c82dd3645 Refactor input groups
* Deprecate .input-append and .input-prepend
* Use new, single base class for component, .input-group
* Deprecate .addon for .input-group-addon
* For compatibility with all buttons, require .input-group-btn to wrap buttons and button dropdowns
* Still need to reimplement with segmented button dropdowns, but that's dependent on a refactor of those first
2012-12-09 21:46:14 -08:00
Mark Otto
adc2c779a0 grid vars updated 2012-11-30 15:43:07 -08:00
Mark Otto
e34b3730b7 form state vars 2012-11-30 15:38:31 -08:00
Mark Otto
a09cea44ae more vars changed 2012-11-30 15:27:13 -08:00
Mark Otto
12a00f62a9 remove color variables, swap others were appropro 2012-11-30 15:18:49 -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
fe8061b84e more tests for form styles; includes lightening help text 2012-11-30 13:35:20 -08:00
Mark Otto
7313702cf3 Inputs now 100% width by default
* Includes text inputs, selects, and textareas
* Updated docs to include .span* sizes wherever possible
* Commented out responsive 1200px inputs grid
* Still some derp to be done to improve more, but this is a decent first stab
2012-11-30 00:53:07 -08:00
Mark Otto
8d09e7c24d remove some unhelpful comments 2012-11-30 00:26:02 -08:00
Mark Otto
4fd164d45b consolidate font resets into scaffolding 2012-11-30 00:24:17 -08:00
Mark Otto
71d8bebfbc remove from form styles 2012-11-30 00:21:44 -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
Mark Otto
bca3ff4ed6 Fixes #5853: Maintain 10px margin above help block when following input groups 2012-11-29 23:39:33 -08:00
Mark Otto
f087b3428c remove element from selector 2012-11-29 23:33:09 -08:00
Zulfiqar Ali
693fd0db2a help-block margin-top should also apply after a span.uneditable-input 2012-11-28 16:47:59 +08:00
Zulfiqar Ali
701f871e7d help-block margin-top should also apply after a span.input 2012-11-27 07:30:54 +08:00
Mark Otto
ee93541421 Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	less/buttons.less
	less/forms.less
2012-11-04 19:59:07 -08:00
Mark Otto
62c78e46f8 more required input tweaks 2012-11-04 19:53:13 -08:00
Mark Otto
91bcccd9a8 simplify invalid input css 2012-11-04 19:43:09 -08:00
Mark Otto
f3b3814606 Merge pull request #5786 from cvrebert/2.2.2-wip
fixes #5494: style invalid fields as invalid regardless of required-ness
2012-11-04 19:41:59 -08:00
Mark Otto
7e6cc0bf7e Fixes #5785: allow for segmented button groups in input groups 2012-11-04 19:08:02 -08:00
Chris Rebert
76f9c9128e fixes #5494: style invalid fields as invalid regardless of required-ness 2012-11-04 18:26:25 -08:00
Mark Otto
1477e081d4 Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	docs/getting-started.html
	docs/templates/pages/getting-started.mustache
	less/accordion.less
	less/alerts.less
	less/breadcrumbs.less
	less/buttons.less
	less/code.less
	less/dropdowns.less
	less/forms.less
	less/navbar.less
	less/progress-bars.less
	less/responsive-navbar.less
	less/tables.less
	less/thumbnails.less
	less/tooltip.less
	less/wells.less
2012-11-02 09:36:51 -07:00
Mark Otto
d0c75bbc83 fixes #5742: add cursor: pointer; to labels and selects 2012-11-01 09:44:51 -07:00
Mark Otto
b18c009051 fixes #5473: use baselineheight var for input bottom margin 2012-10-10 09:47:08 -07:00
Mark Otto
4ab7b77aa3 Merge branch '2.1.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/labels-badges.less
	less/navbar.less
	less/tables.less
2012-10-01 23:41:00 -07:00
Mark Otto
5035592988 fixes #5193 manually: checkbox and radio padding in .controls-row 2012-10-01 11:53:52 -07:00
Mark Otto
8da78223ff reset input and button heights with updated padding 2012-10-01 00:19:29 -07:00
Mark Otto
9872902e47 remove .border-radius mixin and replace with standard border-radius property, since -webkit-* and -moz-* are only needed for older versions 2012-09-30 23:11:54 -07:00
Mark Otto
08eea302ef remove remaining fluid grid css 2012-09-25 22:20:24 -07:00
Mark Otto
9e97098802 make .input-* classes match .btn-* size classes 2012-09-25 22:16:47 -07:00
Mark Otto
0220015edd remove all ie7 conditionals and mixins 2012-09-25 22:07:53 -07:00
Mark Otto
ce19e63d5b Merge branch '2.1.2-wip' into box-sizing-exercise
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/base-css.html
	docs/templates/pages/base-css.mustache
	less/forms.less
	less/mixins.less
2012-09-25 22:00:41 -07:00
Mark Otto
527d01ce99 headway, cleanup, and tests 2012-09-25 15:01:03 -07:00
Mark Otto
f4d3d7da2e ensure 100% width for .uneditable-inputs in <767px viewports 2012-09-23 16:06:28 -07:00
Mark Otto
c92a75999f fixes #5127: add @inputHeight to replace static instances of '30px' throughout forms 2012-09-20 11:45:59 -07:00
Mark Otto
532ee08213 fixes #5150: add btn-group support to input groups 2012-09-20 11:37:34 -07:00
Mark Otto
239e6a7d21 fixes #5082 manually: reset font-size for .dropdown-menu within .input-prepend/-append 2012-09-17 23:11:49 -07:00
Mark Otto
6881c193ca fixes #5039: properly set .row-fluid margins for .controls-row 2012-09-17 16:09:36 -07:00
Mark Otto
537c5cc33d use local var for a few other .box-shadow mixins to fix CSS not compiling 2012-09-12 16:18:52 -07:00
Mark Otto
bbadd429a8 change up box-shadow mixin usage everywhere to use escaping again, or local var if necessary for further var evaluation 2012-09-12 15:48:56 -07:00
Mark Otto
cd2b12f788 fixes #5064 manually: remove fancy quote mark 2012-09-10 22:41:14 -07:00
Mark Otto
dd1bce2611 latest tweaks to grid classes for forms 2012-09-08 12:50:37 -07:00
Mark Otto
b53da4b6e7 commenting out stuff and adding grid test page 2012-09-07 22:46:35 -07:00
Mark Otto
7e29581210 Merge branch '2.1.2-wip' into box-sizing-exercise
Conflicts:
	docs/scaffolding.html
	docs/templates/pages/scaffolding.mustache
2012-09-07 22:34:51 -07:00
Mark Otto
de36456f5d fixes #4957: use input border var for select element instead of #ddd 2012-09-04 11:00:25 -07:00
Mark Otto
f46813a8c8 Merge pull request #4763 from Luis-TP/2.1.1-wip
Improve .box-shadow mixin by utilizing regex function to no longer require escaping
2012-09-03 01:03:37 -07:00
Mark Otto
0b122bc5c5 remake the box-size grid, nuke fluid grid docs, fix up examples, clean up form styles 2012-08-28 13:33:06 -07:00
Mark Otto
e27b1355b5 fixes #4771: widen .form-horizontal labels and .dl-horizontal terms given larger font-size of 2.1.0 2012-08-28 10:12:04 -07:00
Mark Otto
609142eee2 fixes #4729: only use margin-top on .help-block when it follows an input, select, textarea 2012-08-27 22:42:12 -07:00
Luis Aleman
2719ac3e9b Unescaped box-shadows to take advantage of new box-shadow mixin 2012-08-27 19:14:00 -04:00
Mark Otto
cf9334bd7d fixes #4725: width of .uneditable-input should match standard text input width 2012-08-27 12:07:28 -07:00
Mark Otto
54e3a26dda fixes #4562: correct select and input widths at 220px (changed with 2.1.0 when we changed padding) 2012-08-27 10:08:16 -07:00
Mark Otto
bb9d1af1ca fixes #4672 manually: placeholder comment 2012-08-25 21:51:07 -07:00
Mark Otto
5cbb826961 Merge pull request #4560 from andriijas/2.1.1-wip-table-row-warning
.warning for table tr  and .info for .control-group
2012-08-23 09:47:44 -07:00
Mark Otto
ac4420237c fixes #4591 properly: remove -1px left margin on .input-append .add-on 2012-08-22 20:32:47 -07:00
Andreas Cederström
a9764c34a7 Add info state to form validation 2012-08-22 11:24:02 +02:00
Mark Otto
6dc13573bf add css tests and stuff for #4528 2012-08-21 13:42:00 -07:00
Mark Otto
73cf9c4db8 fixes #4469 manually: reset width on file inputs 2012-08-20 10:28:41 -07:00
Mark Otto
256a25f25c fixes #4260 and #4322: set vertical-align to top on input-prepend components to solve modal rounding issues 2012-08-17 16:28:45 -07:00
Mark Otto
2b22c0c56e fixes #4438: button groups in inline forms now render inline 2012-08-17 16:00:36 -07:00
Mark Otto
9e6322dbab fixes #4428: specifity on .search-query increased 2012-08-17 12:59:32 -07:00
Mark Otto
f933a41c7b remove bottom margin on radios and checkboxes 2012-08-14 15:34:10 -07:00
Mark Otto
780636d955 fixes #3674: checkbox vertical alignment in IE9 2012-08-14 15:29:47 -07:00
Mark Otto
5144c77b27 fixes #4358: make select elements 30px tall to match inputs 2012-08-14 14:57:49 -07:00
Mark Otto
4bf93a2d76 fixes #4265: restore chromium select fix 2012-08-13 23:03:35 -07:00
Mark Otto
735001cb26 increase horizontal padding on inputs given new font-size 2012-08-01 11:53:00 -07:00
Mark Otto
fab1a80dcb increase margin on checkboxes and radios to center properly 2012-08-01 11:35:31 -07:00
Mark Otto
364dbb7931 fixes #3665: ensure inputs in a fluid row maintain grid sizing 2012-07-30 15:38:36 -07:00
Mark Otto
134d11b528 use shorthand on form field transitions for box-shadow mixin 2012-07-29 12:10:29 -07:00
Mark Otto
7590e65f6f fix search form, mostly in navbar 2012-07-24 01:44:12 -07:00
Mark Otto
5d8e78e0fa fixes #3605: add support for input-prepend/-append to .form-search 2012-07-10 00:32:30 -07:00
Mark Otto
93be608bf0 fixes #3384: add support for multiple inputs per line when using grid sizing 2012-07-09 20:49:17 -07:00
Mark Otto
7800fee7e0 fixes #3973: same border on disabled inputs as default inputs: 2012-07-09 00:51:38 -07:00
Mark Otto
3f2f96b0d7 reoder forms a bit 2012-07-07 12:52:05 -07:00
Mark Otto
e2b777d9a3 docs pre font-size and nowrap on prepend/append 2012-07-07 12:34:47 -07:00
Mark Otto
dc6eaafb00 vertically align inline form content 2012-07-06 10:59:46 -07:00
Mark Otto
cd2d82150c standardize top level file comments 2012-06-28 21:46:45 -07:00
Mark Otto
d65e815a48 use @textColor to change help-block/help-inline font color 2012-06-25 16:47:29 -07:00
Mark Otto
d14f06fc4e round select list corners 2012-06-19 13:25:35 -07:00
Mark Otto
b1cb556503 improve inline-block of append/prepend inputs with font-size: 0; 2012-06-14 11:56:46 -07:00
Mark Otto
eef87c96af #3684: reset width to auto for input type='image' 2012-06-04 20:27:42 -07:00
Mark Otto
5563b8448e fix #3693: rounded corners on search form 2012-06-04 08:45:51 -07:00
Mark Otto
eb3a4b8f75 fix placeholder for FF by attaching input and textarea when we call the mixin 2012-06-04 08:33:42 -07:00
Mark Otto
7875e4833c fix broken css tests, add fluid input-prepend/-append to tests, fix input-prepend/append for responsive for both fluid and fixed sizing 2012-05-28 17:32:24 -07:00
Mark Otto
a7529e158b remove color from labels 2012-05-25 09:19:10 -07:00
Mark Otto
78790da03c fix resizing issues from incorrectly changing <767px grid classes to inline-block, fix height issue on textareas 2012-05-17 22:00:49 -07:00
Mark Otto
6be09df1bf Merge branch '2.0.4-wip-forms' of github.com:twitter/bootstrap into 2.0.4-wip-forms 2012-05-15 09:07:31 -07:00
Mark Otto
a9d4b667ff finish fixing uneditable-input and remake 2012-05-15 09:07:19 -07:00
Mark Otto
532569fe59 updated forms to rearrange focus state, reinstate uneditable-input, and a few other cleanup tidbits 2012-05-15 09:04:44 -07:00
Mark Otto
ecf84bdac5 correct regressions against 2.0.3 2012-05-15 00:17:02 -07:00
Mark Otto
e28efd7da0 consolidate and relabel new form selectors 2012-05-14 23:42:32 -07:00
Mark Otto
a0809ceebe add forms test page for all html5 input types and refactor selectors 2012-05-14 23:40:06 -07:00
Mark Otto
a2fb9ed42f #3449: make legend and form-actions the same border color 2012-05-13 17:43:04 -07:00
Milos Gavrilovic
20eae67147 Update .placeholder() mixin call
In less/mixins.less this mixin is being created with @placeholderText
color as default, which is actually set as @placeholderText: @grayLight
in less/variables.less so it's redundant to make call like this:

.placeholder(@grayLight);
2012-05-10 12:25:22 +03:00
Mark Otto
805ca03457 fix #3179: cut off radios and checkboxes 2012-04-24 01:33:00 -07:00
Mark Otto
99a916d5eb remove background color from radios and checkboxes for IEs 2012-04-23 03:05:10 -07:00
Jacob Thornton
2881269e16 lots of property ordering 2012-04-16 16:34:08 -07:00
Mark Otto
13e4d1d5ac fix #2990: text wrapping in .uneditable-input 2012-04-15 00:35:30 -07:00
Mark Otto
9e9be2dc0d fix #2989: clear .checkbox/.radio floats 2012-04-14 23:19:42 -07:00
Mark Otto
3bc7553f66 Merge branch 'au-phiware-patch-1' into 2.0.3-wip 2012-04-14 20:56:13 -07:00
au-phiware
16855b920e Silence comment (just like the others) 2012-04-15 12:31:07 +10:00
Mark Otto
a7d8145a32 fix #3036: add bg color to inputs 2012-04-14 13:18:37 -07:00
Mark Otto
1d30225e2c Merge branch 'jasny-patch-2' into 2.0.3-wip
Conflicts:
	less/forms.less
2012-04-07 16:43:48 -07:00
Mark Otto
0a71f171bc readd bootstrap.zip, add @inputBorderRadius var to close #2946 2012-04-07 16:17:15 -07:00
Arnold Daniels
fedce0cec7 Allow multiple buttons in .input-prepend and .input-append.
This has a look similar to button groups.
2012-04-05 23:08:32 +03:00
Mark Otto
2ea437f353 fix #2908: unfloat inputs using .span* in fluid row 2012-04-02 22:49:19 -07:00