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

622 Commits

Author SHA1 Message Date
Mark Otto
443b605246 remove -moz-box-shadow from .box-shadow() mixin, but keep -webkit since that's needed for most iOS and Android mobile browsers 2012-09-30 23:17:07 -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
2b06edc7d7 remove firefox <3.6 css hacks for buttons 2012-09-30 22:49:14 -07:00
Mark Otto
bbd543db53 Merge branch '2.1.2-wip' into exploratory
Conflicts:
	docs/getting-started.html
	docs/templates/pages/getting-started.mustache
2012-09-30 22:45:39 -07:00
Mark Otto
da43c7c27c run make after merge 2012-09-30 22:41:26 -07:00
Mark Otto
ad96435d27 Merge branch '2.1.2-wip' into box-sizing-exercise 2012-09-26 16:02:33 -07:00
Mark Otto
cd5ae9e030 change up carousel 2012-09-26 11:20:27 -07:00
Mark Otto
6b578ec8de move mixins that generate css to utilities.less with different class names, but the same mixins 2012-09-26 08:59:57 -07:00
Mark Otto
ecbf1159a4 remove .dividers from breadcrumbs, instead use :after and content 2012-09-25 22:57:20 -07:00
Mark Otto
d1affe6154 restore gradient to navbars 2012-09-25 22:53:41 -07:00
Mark Otto
f8efc75a66 increase padding on navbar links, remove font-size override on .navbar from docs css 2012-09-25 22:51:05 -07:00
Mark Otto
c59e5251e1 initial pass at removing navbar-inner from .navbar component 2012-09-25 22:48:02 -07:00
Mark Otto
f12946be5a thumbnails cleanup: no more UL or LI elements needed, instead just use standard grid markup 2012-09-25 22:40:48 -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
Jacob Thornton
88b1e44dd6 change tooltip/popover insert strategy
remove modal-open class
hopefully resolve z-index headaches
2012-09-24 23:28:38 -07:00
Jacob Thornton
4a2443901f reverting d797a5fbd7 2012-09-24 23:19:33 -07:00
Mark Otto
f4d3d7da2e ensure 100% width for .uneditable-inputs in <767px viewports 2012-09-23 16:06:28 -07:00
Mark Otto
af871d57c9 fixes #5216: calculate heading sizes via math rather than fixed pixel amounts 2012-09-22 22:16:12 -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
443c43f6c4 fixes #5102, #5166, #5194, #5205: add overflow: visible; to .nav-collapse.collapse so that dropdowns overflow correctly in the navbar in IE7-8 2012-09-20 10:28:27 -07:00
Mark Otto
6c3cd6fd9d fixes #5212: text emphasis classes only get hover with links 2012-09-20 09:06:43 -07:00
Mark Otto
2d90c816ac add new vars for common border-radius, upping border-radius of inputs to 4px; add border-radius changes to -large, -small, -mini for buttons and paginations 2012-09-18 21:16:08 -07:00
Mark Otto
2769241aeb add new vars for common font-sizes and paddings with large, small, and mini components; resize pagination and buttons to better match each other 2012-09-18 20:56:20 -07:00
Mark Otto
37460e58d3 Merge branch '2.1.2-wip' of https://github.com/uberspeck/bootstrap into uberspeck-2.1.2-wip 2012-09-18 14:58:39 -07:00
Mark Otto
cc3de8bd6e fixes #5177: remove color on .btn-large .caret, but keep sizing change; also start to add CSS tests for buttons 2012-09-18 12:00:57 -07:00
Mark Otto
78992bbf42 fixes #5178: update normalize to avoid resetting audio and video elements in android 2012-09-18 11:23:16 -07:00
Mark Otto
3b3def4898 fixes #5087: add hover states to text emphasis classes for links 2012-09-17 23:19:52 -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
cedb3c7c56 fixes #5173: proper popover offsets; added docs examples to enable tests in the future 2012-09-17 23:03:32 -07:00
Mark Otto
26ca131a95 Merge branch 'wpbrains-media-component' into 2.1.2-wip 2012-09-17 18:15:44 -07:00
Mark Otto
143fef9f95 overhaul the docs and css to merge into 2.1.2 since this was against master 2012-09-17 18:15:39 -07:00
Mark Otto
917b46a343 resolve conflicts and remake 2012-09-17 16:43:18 -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
03a406d920 fixes #5041: add new navbar css tests for each variation, remove width: 100%; from .navbar-static-top 2012-09-17 15:49:22 -07:00
Mark Otto
15bb78ce80 fixes #5107: make all .btn-group inline-block by default instead of just within a .btn-toolbar 2012-09-12 16:37:41 -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
38303dd997 revert the js evaluation in .box-shadow mixin, fix last mixin usages to escape if using >1 shadows 2012-09-12 15:53:29 -07:00
Brian Campbell
2c8eff0eec Updated pagination to support .pagination-large, .pagination-small, .pagination-mini matching button sizes. Updated related docs. 2012-09-12 14:10:03 -06:00
Mark Otto
0489c708c7 fixes #5040 manually: remove overflow: auto; from .modal to resolve sporadic modal right padding issues with scrollbars 2012-09-10 22:51:16 -07:00
Mark Otto
7110b243f5 more tests and experiments 2012-09-10 10:11:02 -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
61332d727e fixes #5020: submenu support in dropup 2012-09-07 11:34:05 -07:00
Mark Otto
f2bd7d9f27 fixes #5018: .btn-block in .modal-footer no longer has left margin 2012-09-07 11:10:00 -07:00
Mark Otto
7a0f5c6c00 fixes #5010: .pager span selector should be scoped to immediate children only 2012-09-07 11:04:51 -07:00
Mark Otto
d4a16d35eb fixes #4996: incorrect border radius on a table 2012-09-05 10:05:54 -07:00
Mark Otto
3fa4ca2d87 Merge branch 'spantaleev-patch-1' into 2.1.2-wip 2012-09-05 10:04:38 -07:00
Mark Otto
dfb3175d4b rebuild after merge 2012-09-05 10:04:28 -07:00
Mark Otto
08b8571cb8 version bump to get this started 2012-09-05 10:00:57 -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
8cda830eaf fixes #4146: IE7-8 responsive image helper 2012-09-03 01:13:42 -07:00
Mark Otto
9d5f9eca85 fixes #4909: add color utility classes .text-warning, etc and document them 2012-09-03 00:47:48 -07:00
Mark Otto
3737904859 fixes #4922: use basefontsize for realz on .lead 2012-09-02 13:25:03 -07:00
Mark Otto
02f6bd65f5 fixes #4910: use @baseLineHeight * 1.5 for .lead font-size 2012-09-01 12:00:13 -07:00
Mark Otto
0f85e8b7f8 fixes #4824: scope table grid sizes to .table instead of table 2012-08-31 22:37:46 -07:00
Mark Otto
beb0b64096 fixes #4889: btn-link disabled styles 2012-08-31 14:02:18 -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
Mark Otto
55982664d0 Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip 2012-08-27 21:06:29 -07:00
Mark Otto
1eaf1cf418 fixes #4653: add hover states to stateful table rows 2012-08-27 21:06:21 -07:00
Jacob Thornton
d797a5fbd7 fix for open elements under modal when .modal-open 2012-08-27 20:43:12 -07:00
Mark Otto
3b67ece2d1 fixes #4666: overrides for input types with .btn-block 2012-08-27 15:39:55 -07:00
Mark Otto
85dcbd0b34 add min-height: 1px; to .span* classes to prevent grid columns from collapsing 2012-08-27 15:12:22 -07: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
22c4f3d058 fixes #4718: add vertical-align: middle; to .btn-group to ensure proper alignment next to standard .btn 2012-08-27 12:05:15 -07:00
Mark Otto
1c9d5c43b0 fixes #4640: pagination span issues resolved by scoping selectors to appropriate children, not all children; clarify docs on use of spans for disabled and active links 2012-08-27 10:56:46 -07:00
Mark Otto
a2b9a5e1fe fixes #4680: proper margin on buttons in navbar forms 2012-08-27 10:52:11 -07:00
Mark Otto
fcd08fce8f fixes #4578: add clearfix to .navbar-inner to clear floats 2012-08-27 10:32:07 -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
96542f14ab fixes #4540: adjust vertical alignment of .btn-group in .navbar 2012-08-27 10:04:58 -07:00
Mark Otto
1b8f4f5bc5 fixes #4512: improved borders on navbars 2012-08-26 23:23:47 -07:00
Mark Otto
f15eb7b499 fixes #4506: clearfix added to .dl-horizontal to account for empty dd elements 2012-08-26 23:06:56 -07:00
Mark Otto
f744ad57fc fixes #4676 manually: example html updated 2012-08-25 22:31:10 -07:00
Mark Otto
d9593e217d avoid top margin on input-append/prepend in .navbar-form 2012-08-24 14:45:02 -07:00
Mark Otto
0682780cd8 fixes #4657: proper border radius property in tables 2012-08-23 15:04:41 -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
be64955e25 nuke 10px right margin on .navbar .nav 2012-08-23 09:38:56 -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
Mark Otto
4775bc910c fixes #4604: add span support to .pager component 2012-08-22 20:28:08 -07:00
Andreas Cederström
a9764c34a7 Add info state to form validation 2012-08-22 11:24:02 +02:00
Andreas Cederström
361889def9 Add .warning to table rows 2012-08-22 11:20:31 +02:00
Mark Otto
5d41742f17 fixes #4505: lighten navbar text and link color so hover looks darker 2012-08-21 14:53:34 -07:00
Mark Otto
8d00fe4c03 running make on previous merge 2012-08-21 14:43:13 -07:00
Mark Otto
46c10c8b58 alternate fix to #4522: increase line-height on btn-mini 2012-08-21 14:38:47 -07:00
Mark Otto
190d3c9c3e fixes #4526: box-shadow on .radio and .checkbox if .control-group has a form field state 2012-08-21 14:22:26 -07:00
Mark Otto
e2ecd2df6c Merge branch 'incbee-master' into 2.1.1-wip 2012-08-21 14:16:09 -07:00
Mark Otto
45978b6674 run make 2012-08-21 14:16:01 -07:00
Mark Otto
b1c93c2700 fixes #4523: more specific selectors on white icon inversion 2012-08-21 14:15:01 -07:00
Mark Otto
1c134d9a7f update version numbers to 2.1.1 2012-08-21 13:11:25 -07:00
Mark Otto
8a2b9f4a5f remove entity in content property on dropup carets--not necessary at all 2012-08-21 13:02:02 -07:00
Mark Otto
01572f00bb ie7 button group and button toggle padding changes 2012-08-20 12:27:45 -07:00
Mark Otto
58dd1f20ae fix vertical button-groups in ie7 2012-08-20 12:20:22 -07:00
Mark Otto
2fda6a45aa bump up height of progress bars, give some extra depth with stacking bars, and then make the stacked bars actually work 2012-08-20 11:22:37 -07:00