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
4,290 Commits 108 Branches 89 Tags 547 MiB
90b195872e
Commit Graph

936 Commits

Author SHA1 Message Date
Mark Otto
8eb1549842 remove .hide specificity override from grid classes 2012-12-20 13:57:14 -08:00
Mark Otto
6bd5dc7d9f Add important flag to .show/.hide utility classes; remove .hide requirement from modals 2012-12-20 13:53:38 -08:00
Mark Otto
a5e04c0799 Merge branch '2.3.0-wip' into 3.0.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/templates/pages/base-css.mustache
	less/dropdowns.less
	less/forms.less
 2012-12-20 13:47:36 -08:00
Mark Otto
5e4f663e69 Undo important on hide/show utilties; punt to 3.0 2012-12-20 13:46:07 -08:00
Mark Otto
30d8eb3ed5 Merge branch 'blakeembrey-dropdown-selectors' into 2.3.0-wip 2012-12-20 01:34:19 -08:00
Mark Otto
f706acb11c Fixes #6339: Use important flag on .hide and .show utility classes 2012-12-20 01:30:32 -08:00
Mark Otto
cdb25e11ef lighter buttons closer to todays versions 2012-12-20 01:21:09 -08:00
Mark Otto
c00f29e4d4 Fixes #6236: Fix popover font-size in input groups 2012-12-20 00:54:58 -08:00
Mark Otto
cc6974b74e Remove dropdown submenu CSS 2012-12-20 00:27:05 -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
9726fded1c Get on that carousel indicator lifestyle with some new hawtness 2012-12-19 23:52:38 -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
a27952efd0 Unfuck the fucked gradient with it's fucked mix() of background colors; nuke commented out code 2012-12-19 23:12:38 -08:00
Mark Otto
9b4e5746a4 More button tweaks 2012-12-19 22:54:04 -08:00
Mark Otto
afef81c0d7 remove commented out buttons css, update docs 2012-12-19 22:30:08 -08:00
Mark Otto
c38b7206eb overhaul buttons 2012-12-19 22:25:56 -08:00
Mark Otto
7449e2e5a1 Remove @black and just use #000 2012-12-19 22:02:57 -08:00
Mark Otto
b6945a2168 Rename .hero-unit to .jumbotron becaue fuck dashes in filenames and sports metaphors are cooler than ad ones 2012-12-19 21:37:16 -08:00
Mark Otto
c6cc1b1a1d Drop .label component. Instead, just use .badge because fuck dupe code and stuff. 2012-12-19 21:18:32 -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
26b999b76a no need for margin-top on .typeahead, it's set on .dropdown-menu 2012-12-19 19:46:44 -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
dc6142751f Fixes #6337: scope '.media .pull-left' and '.media .pull-right' to immediate children only 2012-12-19 18:47:34 -08:00
Mark Otto
28c928f010 Use normalize as separate file instead of with other resets; still need to punt other styles 2012-12-19 18:43:55 -08:00
Mark Otto
840e47eabd Update clearfix mixin and class per @necolas's feedback 2012-12-19 17:49:20 -08:00
Mark Otto
529ecc5a77 Version bump 2012-12-10 18:31:04 -08:00
Mark Otto
cddca18f12 Fixes #6174: Caret alignment in small and mini buttons 2012-12-10 10:59:57 -08:00
Mark Otto
847b632577 IE10 fix in responsive utilities, not regular utilities 2012-12-10 10:29:16 -08:00
Mark Otto
83a6a55d2c Move IE10 responsive fix to responsive utilities so Customizer gets it 2012-12-10 10:25:18 -08:00
Mark Otto
ab5d7f863c move reset after vars and mixins 2012-12-10 09:57:23 -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
Blake Embrey
c105906780 Update .dropdown-menu selectors to avoid conflicts with other elements. Fixes #6197 2012-12-10 16:42:58 +10: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
070c125cec Restore print styles 2012-12-08 21:05:05 -08:00
Mark Otto
68d1d7fc83 Test removal of print styles for customized builds 2012-12-08 21:02:37 -08:00
Mark Otto
bc0b94a3fd Merge branch 'master' into 3.0.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/css.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/javascript.mustache
	less/breadcrumbs.less
	less/tables.less
	less/tests/css-tests.html
 2012-12-08 17:40:42 -08:00
Mark Otto
9376a7c221 Fixes #5729: Nested striped tables 
* Scopes striping to immediate children of the tbody and tr
* For nested tables, sets a background color of @bodyBackground, to override the default transparent bg
 2012-12-08 12:57:21 -08:00
Mark Otto
cacc213762 Nesting tables 
* Add simple test to css-tests.html
* Scope .table-bordered to immediate children th/td elements only
 2012-12-08 12:52:19 -08:00
Mark Otto
1c5b8e967e Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip 2012-12-07 09:51:57 -08:00
Mark Otto
be45a821bb Fixes #6148: Icons in mini buttons properly aligned 2012-12-07 09:51:01 -08:00
Mark Otto
1413f976ae Merge pull request #6151 from tierra/pre-code-white-space-fix 
Fix code block white-space breaks within pre tags.
 2012-12-07 09:48:14 -08:00
Mark Otto
2c7ab23d7a Fixes #6136: Proper scoping of breadcrumbs divider 2012-12-07 09:43:09 -08:00
Bryan Petty
f4466dd9c7 Fix code block white-space breaks within pre tags. 2012-12-06 11:33:00 -07:00
Mark Otto
306c1b4914 Remove commented out old popover CSS 2012-12-05 11:06:16 -08:00
Mark Otto
33e14fe5bf Merge branch '2.2.2-wip' into 3.0.0-wip 
Conflicts:
	README.md
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/examples/fluid.html
	docs/scaffolding.html
	less/breadcrumbs.less
	less/popovers.less
	less/responsive.less
 2012-12-05 11:05:10 -08:00
Mark Otto
869b69c66c Fixes #6115: scope breadcrumb styles to immediate children only 2012-12-03 13:09:38 -08:00
Andreas Cederström
68cbba347b Fixing header color for success, error and info alerts 2012-12-03 14:20:14 +01:00
Mark Otto
30d6a71ccd Revert vertical gradient spec to 'to bottom' as 'top' doesn't work in IE10 2012-12-02 20:40:24 -08:00
Mark Otto
139f1be49d reset text align in popovers given inline insertion 2012-12-02 02:30:00 -08:00
Mark Otto
ea61cdb740 remove overrides on inner html of popover-content 2012-12-02 01:34:58 -08:00
Mark Otto
e8b3c36068 run make on modal popover fix 2012-12-02 00:09:45 -08:00
Mark Otto
19ee7999f4 remove single corner border-radius mixins 2012-12-01 14:25:28 -08:00
Mark Otto
98b0d475ae version bump to 3.0 2012-11-30 22:30:50 -08:00
Mark Otto
ebd2215e49 remove deleted css files, run make 2012-11-30 16:31:24 -08:00
Mark Otto
10c14e8955 first pass at nuking scaffolding 2012-11-30 16:29:30 -08:00
Mark Otto
b8b266ca7c popovers and tooltips vars 2012-11-30 15:40:44 -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
fe8061b84e more tests for form styles; includes lightening help text 2012-11-30 13:35:20 -08:00
Mark Otto
f9a47e3a5f Refine containers and navbars 
* Don't reset width on .container, .navbar-* .container, etc
* Instead, use max-width to ensure proper styling for all navbars
 2012-11-30 12:42:37 -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
4fd164d45b consolidate font resets into scaffolding 2012-11-30 00:24:17 -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
Mark Otto
fe7b6decb1 Merge pull request #6039 from desheikh/2.2.2-wip 
help-block margin-top should also apply after a span.uneditable-input
 2012-11-29 23:32:38 -08:00
Mark Otto
322a56354f run make with nav img fix 2012-11-29 23:27:20 -08:00
Zulfiqar Ali
ddd154481b added compiled css file 2012-11-29 17:40:23 +08:00
Mark Otto
78390d12af Fix the carousel after we scoped selectors 2012-11-28 15:40:51 -08:00
Mark Otto
f1349a2450 Fixes #5533: Remove filter gradient from disabled links on dropdowns 2012-11-28 02:22:37 -08:00
Mark Otto
8fb36cb3dd Fixes #5594: Vertical button groups show use max-width, not width, and be scoped to immediate children buttons only 2012-11-28 02:21:34 -08:00
Mark Otto
296b838405 Fixes #5616: scope carousel state classes to immediate children only 2012-11-28 02:17:50 -08:00
Mark Otto
bf3a5df371 Fixes #5930: redeclare font-size for popoves in btn-groups 2012-11-28 02:10:23 -08:00
Mark Otto
783120dffa Fixes #5927: Scope button group 5px button left margin to immediate children 2012-11-28 01:51:04 -08:00
Mark Otto
014d3cedf5 Fixes #5940: Prevent @headingsColor from changing alert colors 2012-11-28 01:48:34 -08:00
Mark Otto
bfc97fdaf6 Fixes #4852: IE8 popover carets fixed 
* IE8 refused a negative z-index to place the previous :after behind the .arrow, so I had to flip the styles.
* .arrow is the gray border/background, .arrow:after is now the white inner arrow
* Added a hex IE8 fallback to ensure the arrow shows for <IE9 as rgba() isn't supported
* Simplified some of the CSS for the popover carets
 2012-11-28 01:38:21 -08:00
Mark Otto
fda5bb135e Fixes #5963: Add large button example to icons, fix vertical alignment in large buttons 2012-11-28 00:46:09 -08:00
Mark Otto
74f51105e9 Fixes #6010: Navbar dropdown caret should match link hover color 2012-11-28 00:42:17 -08:00
Mark Otto
02097700e8 Fixes #6035: use font-size vars in button groups 2012-11-28 00:31:52 -08:00
Mark Otto
dc10e6bbf8 Fixes #5935: Updated vertical gradient mixin 2012-11-28 00:19:35 -08:00
Mark Otto
7e56e2265d Merge branch '2.2.2-wip' into exploratory 
Conflicts:
	less/button-groups.less
 2012-11-22 22:04:21 -08:00
Mark Otto
a367fd4938 Fixes #5925: Adjust top margin of input group in navbar 2012-11-16 01:19:15 -08:00
Mark Otto
88c2497368 Fixes #5912: User correct selector for form field states. 
Previously, we were using a generic label selector, but as this was changed in the main forms awhile back, we need to change it here.
 2012-11-16 01:16:27 -08:00
Mark Otto
fa1c130552 Change important badges/labels to danger 2012-11-15 09:17:11 -08:00
Mark Otto
a43bf14ea5 Merge branch '2.2.2-wip' into exploratory 2012-11-15 09:15:37 -08:00
Mark Otto
0df0b5f1f5 run make after latest merges 2012-11-14 15:19:16 -08:00
Drew Goodwin
c8856eeff3 fixes #5873: @navbarInverseBrandColor not used 2012-11-10 17:58:00 -08:00
Mark Otto
54486de88c run make again 2012-11-09 09:21:14 -08:00
Mark Otto
c0bbe1692c Merge branch '2.2.2-wip' into exploratory 
Conflicts:
	docs/assets/css/bootstrap.css
	less/navbar.less
	less/variables.less
 2012-11-05 18:27:25 -08:00
Mark Otto
79b7017227 version bump 2012-11-05 09:32:48 -08:00
Mark Otto
d38bda1480 Fixes #5471: Remove color from .navbar and .navbar-inverse and reassign to .navbar-text to prevent unintended cascading 2012-11-04 22:50:07 -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
51f293ba4c Fixes #5662: white-space: nowrap; on code element 2012-11-04 13:30:36 -08:00
Mark Otto
075e320a83 remove unnecessary bg declarations in buttons per #5684 2012-11-04 13:26:03 -08:00
Mark Otto
fb51efcbd4 Fixes #5113: increase .typeahead z-index for proper use with modals 2012-11-04 13:01:31 -08:00
Mark Otto
1af0021014 Merge branch '2.2.2-wip' into exploratory 
Conflicts:
	docs/assets/css/bootstrap.css
	less/type.less
 2012-11-04 12:42:00 -08:00
Mark Otto
22d1506d23 remove margin on .inline lists 2012-11-04 12:39:27 -08:00
Mark Otto
508cc1fef4 change up list classes to use .list- prefix 2012-11-04 12:38:35 -08:00
Mark Otto
269be76f4a Merge branch '2.2.2-wip' into exploratory 2012-11-04 12:37:44 -08:00
Mark Otto
28da31218f Refine new inline list option 2012-11-04 12:36:37 -08:00
Mark Otto
68f26d959f Merge branch '2.1.2-list-inline' of https://github.com/andriijas/bootstrap into andriijas-2.1.2-list-inline 2012-11-04 12:27:30 -08:00
Mark Otto
83a3789b5e add justified nav links for tabs and pills 2012-11-04 00:52:10 -07:00
Mark Otto
25fded1ff4 responsive images, updated shadows on navbars, remove responsive file from docs 2012-11-04 00:31:43 -07:00
Mark Otto
a56de2b84f Merge branch 'glyphicons_font' into exploratory 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/css/docs.css
	less/sprites.less
 2012-11-03 16:15:54 -07:00
Mark Otto
c0eacca0db Navs refactor, restoring .nav-list 2012-11-03 16:14:44 -07:00
Mark Otto
a12eb2b9f5 rgba() tooltip bg 2012-11-03 13:44:55 -07:00
Mark Otto
a249d1c8ee Merge branch '2.2.2-wip' into exploratory 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/scaffolding.html
	docs/templates/pages/scaffolding.mustache
 2012-11-03 13:44:01 -07:00
Mark Otto
2c93190283 Fixes #5776: Reside white-space for popovers 2012-11-03 13:42:08 -07:00
Mark Otto
a8b9342aea Fixes #5739: Port in HTML5 BP print styles 2012-11-03 13:37:34 -07:00
Mark Otto
ead5dbeba5 Fixes #5775: Collapse labels/badges 
* When :empty, display: none;
* Add documentation for change in behavior
 2012-11-03 13:18:23 -07: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
4b3fb30877 tweaks to icons defaults and in buttons improve vertical align 2012-11-02 01:39:40 -07:00
Mark Otto
72198a59c0 removing glyphicons images, swapping in new icon font with new classes 2012-11-02 01:20:06 -07:00
Mark Otto
d0c75bbc83 fixes #5742: add cursor: pointer; to labels and selects 2012-11-01 09:44:51 -07:00
Mark Otto
d350f577e9 fixes #3222: simpler positioning of modals 2012-10-31 21:43:32 -07:00
Mark Otto
14b941744c fixes #5700: restore white text on active dropdown/typeahead text 2012-10-31 10:51:27 -07:00
Mark Otto
64326322b4 fixes #5725: hover state for a.muted; also reformatted CSS 2012-10-31 10:46:04 -07:00
fat
3b3dd3ac3c 2.2.1 - hotfix for carousel 2012-10-30 21:59:56 -07:00
Mark Otto
bf10a43ed9 derp, add that in the right spot 2012-10-29 21:34:10 -07:00
Mark Otto
5bb6c42405 fixes #4511: remove focus on opened modal window 2012-10-29 21:33:20 -07:00
Mark Otto
81c3c1c68c add media.less to customizer page 2012-10-29 21:02:05 -07:00
Mark Otto
41ad16fe40 v2.2.0 instead of v2.1.2 2012-10-29 21:00:53 -07:00
Andreas Cederström
233e050adf Adding .inline for ul and ol 2012-10-26 09:47:55 +02:00
Mark Otto
c33169a6ba fixes #5572: document .input-block-level 2012-10-18 11:19:16 -07:00
Jacob Thornton
ac6625de5f add updater function and rebuild 2012-10-17 21:37:34 -07:00
Mark Otto
709870aa3e fixes #5496: use correct var for dropdown active link text 2012-10-16 20:34:42 -07:00
Mark Otto
78f7ad95f4 fixes #5542: move '.hero-unit p' font-styles to '.hero-unit' so they apply to all elements, including ul and ol, within the component. 2012-10-16 19:56:34 -07:00
Mark Otto
31007c01d8 fixes #5478: remove double background color on dropdown links 2012-10-10 10:29:22 -07:00
Mark Otto
7e534ce98a fixes #5443: reset background gradient on disabled dropdown links 2012-10-07 21:45:16 -07:00
Mark Otto
6203535d2f Changing title of docs pages to simply say 'Bootstrap' like the docs home page 2012-10-07 21:38:28 -07:00
Mark Otto
7d649c9d4a fixes #5430: scope link styles in .dropdown-menu to .dropdown-menu li > a 2012-10-05 11:13:21 -07:00
Mark Otto
3726ce24bb finish off scoping of grid sizing to table elements 2012-10-03 09:43:14 -07:00
Mark Otto
11ee1633b4 fixes #5257: add data-original-title attribute selector to abbr element 2012-10-03 09:36:45 -07:00
Mark Otto
dd8b745b88 use border-radius vars where possible 2012-10-03 09:26:52 -07:00
Mark Otto
7732d8b9b0 Merge branch '2.1.2-wip' into exploratory 2012-10-02 15:41:31 -07:00
Mark Otto
1bd4723038 fixes #5392: hover on submenu should maintain white icons for active parent a tag 2012-10-02 13:19:11 -07:00
Mark Otto
3bb9e0d753 increase border radius on navbar 2012-10-01 23:42:21 -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
7c9597f4e7 remove double border effect: instead of inset shadow and border on fixed navbars, only border 2012-10-01 23:34:03 -07:00
Mark Otto
1b814458c9 improve dropdown submenu docs; add docs for left submenu; remove all dupe css for left submenu 2012-10-01 16:41:13 -07:00
Mark Otto
f8ac403d8b fixes #5123: scope table grid classes to td and th elements only, plus drop columns 13-24 2012-10-01 13:08:21 -07:00
Mark Otto
bc4f5d565e fixes #5275: inline-block badges and labels, then fix padding accordingly 2012-10-01 12:04:10 -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
e6d6c7a413 Merge branch '2.1.2-wip' into exploratory 
Conflicts:
	docs/assets/css/bootstrap.css
	less/navs.less
 2012-10-01 11:27:40 -07:00
Mark Otto
239ce24f92 fixes #5188: add .google-maps class to reset responsive images on case-by-case basis 2012-10-01 10:49:19 -07:00
Mark Otto
32181816f7 run make on previous merge 2012-10-01 10:27:42 -07:00
Mark Otto
8da78223ff reset input and button heights with updated padding 2012-10-01 00:19:29 -07:00
Mark Otto
56935c64c0 remove left margin reset from old grid system 2012-10-01 00:11:05 -07:00
Mark Otto
eb555b7a9d remove .nav-list, instead use .nav-stacked on .nav-tabs or .nav-pills from now on 2012-10-01 00:06:44 -07:00
Mark Otto
26386ad615 remove tabbable tabs on left, right, and bottom; instead, from here out use stacked pills or tabs 2012-10-01 00:05:18 -07:00
Mark Otto
ecf6077f48 remove table grid sizing, it can use the new default grid columns instead 2012-09-30 23:59:35 -07:00
Mark Otto
3f4076c635 consolidate border-radius on code 2012-09-30 23:49:26 -07:00
Mark Otto
bfe51163e2 run make on prev commit 2012-09-30 23:47:00 -07:00
Mark Otto
4b0d71abc1 carousel refinements 2012-09-30 23:44:23 -07:00
Mark Otto
de6ec034db single CSS file for all css, including responsive 2012-09-30 23:24:07 -07:00
Mark Otto
3f2938948d remove more ie7 css hacks 2012-09-30 23:20:43 -07:00
Mark Otto
08446563b9 clean up comments in reset, remove ie7 css hacks 2012-09-30 23:19:55 -07:00
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