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
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
