rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00
Code Issues Actions Packages Releases Activity
4,812 Commits 108 Branches 89 Tags 549 MiB
dd691b5c36
Commit Graph

1502 Commits

Author SHA1 Message Date
Mark Otto
15c7e73abd Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
	less/navbar.less
 2013-02-05 19:39:49 -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
0a3e3a50fe Merge branch '2.3.0-wip' into 3.0.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
	less/type.less
 2013-02-04 11:12:09 -08:00
Mark Otto
9480eb89cb Revamp button mixins and pseudo states 
* Remove .darken-button-states and .buttonBackground mixins (latter wasn't being used anyway)
* Create new .btn-pseudo-states mixin for setting button background and border colors for default and pseudo states
 2013-02-02 19:16:15 -08:00
Mark Otto
2f7087eae9 Merge branch '3.0.0-wip' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip 2013-02-02 19:08:59 -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
Mark Otto
04aae2f56c Merge branch '3.0.0-wip' of https://github.com/gilbarbara/bootstrap into gilbarbara-3.0.0-wip 2013-02-02 17:01:29 -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
dbe8aed76e Merge pull request #6763 from rjregenold/2.3.0-wip 
fixes jankiness with anchor tags in carousel.
 2013-02-02 12:35:39 -08:00
Luke Page
6b9bb547bf Move to new selector interpolation, supported from 1.3.1 2013-02-02 07:58:27 +00:00
Mark Otto
94e256c016 Refactor navbar dividers 
* Instead of .divider-vertical, use .divider
* Makes use of .nav-divider mixin
* Dividers are horizontal to start, matching the default state of navbar nav links
* Dividers become vertical above 768px via media queries
 2013-02-01 22:56:09 -08:00
Mark Otto
dad9889aeb Fixes #6657: Upgrade Normalize to 2.1.0 2013-02-01 21:49:54 -08:00
Mark Otto
0bfbf1446d Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-01 21:44:35 -08:00
Mark Otto
8f0bc9e79b Merge branch 'dospuntocero-master' into 2.3.0-wip 2013-02-01 21:41:13 -08:00
Mark Otto
d2ea2cdedd add horizontal-three-color gradient test 2013-02-01 21:41:02 -08:00
Mark Otto
d53af49afe Refactor colors and progress bars 
* Buttons and progress bars now make use of more semantic global @brand- colors
* Progress bars have been rewritten to reduce the number of possible selectors
* Instead of .progress .bar, it's .progress-bar for individual bars of color, ultimately making for less CSS
 2013-02-01 16:21:38 -08:00
Nikhil Dabas
b7b2e4f8a1 Fixing inline lists for IE7 2013-02-02 02:04:30 +05:30
Gil Barbara
24f0505bde Update input-group-addon for input sizes 2013-02-01 01:39:26 -02:00
Mark Otto
52aa67fa1c only round jumbotron corners at 768px+ 2013-01-31 18:11:45 -08:00
Mark Otto
b02a0fe768 Button up navbar form which was adding 2px padding to .navbar 2013-01-31 18:09:49 -08:00
Gil Barbara
e69912c163 Update line-height and padding for input sizes 2013-01-31 19:00:22 -02:00
RJ Regenold
2f44d8d2da removes anchor tag definition. 2013-01-31 12:49:53 -06:00
RJ Regenold
ed2cf5b3e3 its not dyslexic being easy. 2013-01-31 11:04:12 -06:00
RJ Regenold
e38d08d4c0 fixes jankiness with anchor tags in carousel. 2013-01-31 10:03:53 -06:00
Mark Otto
135e834bf4 Merge branch 'baslr-master' into 2.3.0-wip 2013-01-30 18:22:11 -08:00
Mark Otto
d44acb7f88 Merge pull request #6750 from nextgenthemes/3.0.0-wip 
Update less/carousel.less
 2013-01-30 12:44:10 -08:00
nextgenthemes
72da31e028 Update less/carousel.less 
lessified .carousel-caption
 2013-01-30 18:14:22 +01:00
Guillaume Gautreau
6803ff70f9 Tooltip positionning on special cases 2013-01-26 13:50:26 +01:00
baslr
6afb1055e3 .icon-folder-close same width as icon-folder-open 
.icon-folder-close same width as icon-folder-open. this prevents
buttons from wobbling if the icon changes from closed folder
to open folder
 2013-01-26 01:01:10 +01:00
Francisco arenas
2428904b4b Update less/mixins.less 
horizontal three color gradient added
 2013-01-24 03:37:52 -02:00
Mark Otto
d30f47efb2 Tighten up badges docs; less bottom margin on h3 2013-01-19 18:53:41 -08:00
Mark Otto
c21c3f101b Merge branch '3.0.0-wip-badges-to-counters' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip-badges-to-counters 2013-01-19 17:06:40 -08:00
Vickash Mahabir
c77a459b35 IE8 compatible fix for disabled button hover 2013-01-19 19:32:55 -04:00
Vickash Mahabir
665de0455c Change .badge to .counter, make appearance more OSX-ish, and remove colors 2013-01-18 17:35:23 -04:00
Vickash Mahabir
b741c731a2 Fix logic error where a disabled button would change color in an enabled fieldset 2013-01-18 12:12:30 -04:00
Vickash Mahabir
27ff51dae6 Fix that thing with disabled buttons changing color on hover 2013-01-18 11:55:17 -04:00
Mark Otto
5075f4973b Semibold dat .navbar .brand 2013-01-17 20:30:40 -08:00
Mark Otto
d9b35c2602 Merge branch '2.3.0-wip' into 3.0.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/css.html
	docs/customize.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/layout.mustache
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	less/navbar.less
 2013-01-17 20:23:33 -08:00
Mark Otto
f068cdeb63 Combine .thumbnail and .img-thumbnail into simpler selectors 2013-01-17 20:18:03 -08:00
Mark Otto
ca74b9882b Change .img-polaroid to .img-thumbnail 
* Same code, but different classes was confusing
* Now .img-thumbnail just extends .thumbnail
 2013-01-17 20:16:04 -08:00
Mark Otto
89b6477bdc Remove .info from table rows 2013-01-17 20:13:11 -08:00
Mark Otto
5663833bfc Restore .btn-info 2013-01-17 19:51:22 -08:00
Mark Otto
b30b8c2c12 Restore nav tabs, pills, justified variation, disabled links, and a few more things. Still need to add the dropdowns back though. 2013-01-17 17:02:35 -08:00
Mark Otto
8765df47cd remove global text-shadow from alerts components because it was fucking up buttons in a real way 2013-01-17 15:43:23 -08:00
Mark Otto
237f5e15d3 Nuke shadows around thumbnails 2013-01-17 14:25:40 -08:00
Mark Otto
01b465928e overhaul alerts section of tests 2013-01-17 12:24:16 -08:00
Mark Otto
bbb3c0a0e6 Merge branch 'ravage84-patch-2' into 2.3.0-wip 2013-01-17 12:21:34 -08:00
Mark Otto
26f9f4e3a5 Remove navbar search 2013-01-17 12:02:17 -08:00
Mark Otto
32ebe2efd1 mo betta navbar dropdowns 2013-01-17 11:55:37 -08:00
Mark Otto
597a248d4a Rearrange navbar.less and improve vertical divider support 2013-01-17 11:34:46 -08:00
Mark Otto
360f0c5359 Fix floats in navbar 2013-01-17 11:20:19 -08:00
Mark Otto
01b32f472d Simplify and bring back the grid mixin for generating spans and offsets 2013-01-17 10:49:10 -08:00
ravage84
650c77ddb9 Update less/tests/css-tests.html 
Extended css-tests with alerts (alerts and alert-blocks)
 2013-01-17 11:34:00 +01:00
Mark Otto
7e46b6f636 Update nav and add bounds for tablet container 2013-01-17 00:58:34 -08:00
Mark Otto
2398245e17 Remove all old responsive styles since we're motherfucking mobile first son 2013-01-17 00:43:58 -08:00
Mark Otto
687d4a3eeb Move grid/container styles to grid.less; update docs; add offsetting back 2013-01-17 00:42:31 -08:00
Mark Otto
630005687d Remove ported navbar css that was already commented out 2013-01-17 00:13:12 -08:00
Mark Otto
f535201781 improve navbar vars and fix side nav alignment 2013-01-16 23:33:26 -08:00
Mark Otto
6b193dc22d More navbar tweaks, including making fixed navbars work in the docs by adding padding to body 2013-01-16 16:20:29 -08:00
Mark Otto
9ba14cfb7c More navbar derping 2013-01-16 16:14:41 -08:00
Mark Otto
960804cea3 mo betta new navbar styles; hook up some changed vars 2013-01-16 15:35:41 -08:00
Mark Otto
ee9403e2d2 flatten the progress bars 2013-01-16 15:19:55 -08:00
Mark Otto
baa8c3ec9e restore alerts, and make them suck much less 2013-01-16 15:16:04 -08:00
Mark Otto
1288304e91 Make jumbotron mo responsive 2013-01-16 15:07:57 -08:00
Mark Otto
cf693b5632 Add in responsive for 1200px+ layout; increase padding for that viewport size 2013-01-16 14:48:25 -08:00
Mark Otto
13a80f33c8 fix up sidenav and components page 2013-01-16 14:10:33 -08:00
Mark Otto
beb2c13f4d Prevent grids from collapsing, fix affixed side nav for docs 2013-01-16 13:11:45 -08:00
Mark Otto
a7a06a05a4 Remove commented out files; leave responsive stuff commented out for now 2013-01-16 13:08:27 -08:00
Mark Otto
910ca85a70 restore remaining components 2013-01-16 13:07:41 -08:00
Mark Otto
bc7fd582ed restore pagination and pager 2013-01-16 13:07:08 -08:00
Mark Otto
2127690e73 restore breadcrumbs 2013-01-16 13:06:15 -08:00
Mark Otto
2407217686 restore wells and close 2013-01-16 13:05:20 -08:00
Mark Otto
ab38493e91 Restore button groups 2013-01-16 13:04:29 -08:00
Mark Otto
a4cc704220 Restore dropdowns.less 2013-01-16 12:44:31 -08:00
Mark Otto
c76f1cd97e restore glyphicons 2013-01-16 12:30:44 -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
cb99c4b63a restore table styles 2013-01-16 11:48:20 -08:00
Mark Otto
0df7411362 Derp on type styles a bit more; bring back and fix up more more docs styles 2013-01-16 11:38:34 -08:00
Mark Otto
cb0691d92f mo betta type margins for headings 2013-01-16 10:57:00 -08:00
Mark Otto
8fd26040d8 Port over temp responsive styles to bootstrap.less; readd buttons 2013-01-16 10:52:33 -08:00
Mark Otto
5a3cb0d778 remove extra border-radius props 2013-01-16 10:49:19 -08:00
Mark Otto
85db846b65 mobile-first navs, navbar, grids, and type 2013-01-15 17:55:14 -08:00
Mark Otto
a67c86e40f Fixes #6586: remove top 5px margin from navbar input group button groups 2013-01-15 10:27:30 -08:00
Mark Otto
c34ef69100 add text alignment classes from 3.0 2013-01-15 10:15:02 -08:00
Mark Otto
09696143e0 type and stuff 2013-01-15 10:14:12 -08:00
Mark Otto
25c9b6b59a nuke and flatten and stuff 2013-01-14 22:05:55 -08:00
Mark Otto
7d8d5c7838 Merge branch '2.3.0-wip' 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/components.html
	docs/css.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/extend.mustache
	docs/templates/pages/getting-started.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/buttons.less
	less/forms.less
	less/navbar.less
	less/popovers.less
	less/responsive-767px-max.less
	less/responsive.less
	less/tables.less
	less/tooltip.less
	less/type.less
	less/variables.less
	package.json
 2013-01-13 04:26:52 -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
1916eb7c7f Fix btn link hover and tweak dropdown border/shadows 2013-01-13 04:04:16 -08:00
Mark Otto
01db5db2f6 white text on buttons on hover for links 2013-01-12 20:08:13 -08:00
Mark Otto
ea1a12593d Nuke shadow on pagination 2013-01-12 19:46:47 -08:00
Mark Otto
8670021935 fixed navbars fixings 2013-01-12 19:44:51 -08:00
Mark Otto
1ea647ce98 Remove shadows from active links in navbar 2013-01-12 19:02:58 -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
ff02043bbc Flatten navbar 2013-01-12 14:31:18 -08:00
Mark Otto
a33d45f308 Merge branch '3.0.0-wip' into bs3-flatten 2013-01-12 14:16:49 -08:00
Mark Otto
7a3f078fb4 Remove parent div from pagination component 
* No more div.pagination; it's now just ul.pagination
* No more .pagination-right or .pagination-centered
* Sizes remain
* Any further customization, such as alignment, should be done on the individual application or site level.
 2013-01-12 13:15:19 -08:00
Mark Otto
19e2ad0eb6 Fixes #6538: Add th support to all the .table-rounded selectors 2013-01-11 23:38:53 -08:00
Mark Otto
6f894c62a5 Fixes #6528: Make .navbar a:hover .caret use @navbarlinkcolorhover and not -active 2013-01-11 23:35:22 -08:00
Mark Otto
4de3a77a64 Fixes #6547: Make blockquotes use multiple of @baseFontSize 2013-01-11 20:55:09 -08:00
Mark Otto
767a293b4d Increase input group margin on bottom and vertically center to match inputs 2013-01-11 20:46:21 -08:00
Mark Otto
56a24027c3 Fixes #6473: Make .input-prepend and .input-append inline-block to match other form states 2013-01-11 20:42:44 -08:00
Mark Otto
d3b3b4c48f Fixes #6474: remove duplicate .btn border colors to make @btn-border work 2013-01-11 20:40:17 -08:00
Mark Otto
d7c93fc647 Fixes #6478: scope table backgrounds to immediate td/th elements 2013-01-11 20:38:14 -08:00
Mark Otto
7b3f74311e Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-01-11 20:27:00 -08:00
Mark Otto
7626cc629f Remove overflow: auto; from .tab-content 2013-01-11 20:26:48 -08:00
Mark Otto
b9b5cd786d Fixes #6555: remove .controls-row from responsive 2013-01-11 20:23:37 -08:00
Fabien
c91bf424b0 Add glyphicons font path variable 2013-01-11 18:32:00 +01:00
Mark Otto
1d87bcc9f5 Merge branch 'aronwoost-patch-1' into 2.3.0-wip 2013-01-09 21:37:11 -08:00
Mark Otto
91dd77939b Add text alignment utility classes 2013-01-09 18:56:08 -08:00
Aron Woost
aeb0e85151 replaced tabs with spaces 2013-01-09 10:15:15 +01:00
Patrick H. Lauke
848ca6e315 Basic keyboard accessibility CSS tweaks 
Mostly doubling-up :hover styles to also cover :focus, as a first step
to making the framework more keyboard-friendly.
Additionally, fixed two small markup issues in the docs/examples to
make the "Learn more" large primary button-styled links
keyboard-focusable (as without href they're treated as non-tabable
anchors).
 2013-01-02 22:39:21 +00:00
Mark Otto
1c0e4fc7bb Popovers are now flexible width: 
* Instead of a fixed width, we use max-width
* Width has been increased from 240px to 280px
* Added ability to hide the title via CSS :empty selector if no title is provided
 2012-12-28 14:18:59 -06:00
Mark Otto
6f8e315b1d Merge branch 'sparanoid-transition-duration' into 2.3.0-wip 
Conflicts:
	docs/assets/img/bootstrap-docs-readme.png
 2012-12-28 13:08:49 -06:00
Tunghsiao Liu
3096a377a2 Add transition-duration mixin 2012-12-28 16:19:12 +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
2ef4fde09f Drop .input-block-level modifier as inputs are already width: 100%; 2012-12-26 14:19:48 -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
0da31ceb51 Cleanup spacing in variables file 2012-12-26 14:06:21 -06:00
Mark Otto
c17673dc61 Restore .form-horizontal 2012-12-26 13:59:09 -06:00
Mark Otto
330b143b40 Add longer tooltip example to docs, tighten up line-height on tooltip; run make 2012-12-26 09:36:07 -06:00
Mark Otto
d206ec1659 Remove .badge-info and .badge-inverse; change docs label of .badge-important to .badge-danger 2012-12-24 02:06:28 -08:00
Mark Otto
f74990d898 Version bump 2012-12-22 16:10:06 -08:00
Mark Otto
c11f41ba04 flatten buttons and forms 2012-12-21 00:50:28 -08:00
Mark Otto
5d4e718446 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2012-12-20 20:56:00 -08:00
Mark Otto
5508d3d5b3 Remove reset.less now that Normalize 2 is fully integrated 2012-12-20 20:52:43 -08:00
Mark Otto
7b7581d44a Finish migrating to Normalize 2: 
* Port print styles from reset.less to scaffolding.less
* Port responsive image styles from reset.less to scaffolding.less
 2012-12-20 20:52:20 -08:00
Mark Otto
d6d828154a Merge pull request #6354 from cvrebert/3.0.0-wip 
add comment regarding caveat of #6199 impl per discussion in/of 14844db862
 2012-12-20 15:33:52 -08:00
Mark Otto
69f6149489 Normalize indentation from 4 to 2 spaces 2012-12-20 14:11:40 -08:00
Mark Otto
1c33b857a6 Convert normalize comments to // style 2012-12-20 14:08:09 -08:00
Mark Otto
be74ad7e0d Merge branch '3.0.0-wip' into bs3-normalize 
Conflicts:
	less/bootstrap.less
 2012-12-20 14:02:54 -08:00
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
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
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
ac20a08281 Use @border-radius-base var for nav tabs 2012-12-17 10:11:33 -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
e324a1beb0 Simplify syntax of nesting with inline lists 2012-12-10 10:28:18 -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
165729254b squash new line 2012-12-10 10:13:04 -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
0f2a423b8d Once more, update all the favicons to retina 2012-12-03 13:25:56 -08:00
Mark Otto
869b69c66c Fixes #6115: scope breadcrumb styles to immediate children only 2012-12-03 13:09:38 -08:00
Mark Otto
d470fb72da nuke comments 2012-12-03 09:23:02 -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
eca23e9b0f add source attribution for IE10 fix 2012-12-02 21:01:53 -08:00
Mark Otto
f514c87d6b Enable responsive features in IE10 when snapped 2012-12-02 20:57:34 -08: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
Blake Embrey
fbec803b55 Add relative positioning to .modal-body - Fixes #5991 2012-12-02 09:53:05 +10: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
0fabca01db Remove more fluid grid stuff 
* No more fluid layout
* No fluid grid overrides for tables.less
* No more fluid example page
 2012-11-30 16:18:40 -08:00
Mark Otto
adc2c779a0 grid vars updated 2012-11-30 15:43:07 -08:00
Mark Otto
b8b266ca7c popovers and tooltips vars 2012-11-30 15:40:44 -08:00
Mark Otto
e34b3730b7 form state vars 2012-11-30 15:38:31 -08:00
Mark Otto
0a93bc143d hero unit and pagination vars 2012-11-30 15:36:16 -08:00
Mark Otto
51c418d468 alignment 2012-11-30 15:34:35 -08:00
Mark Otto
62a2220035 navbar vars 2012-11-30 15:33:56 -08:00
Mark Otto
a09cea44ae more vars changed 2012-11-30 15:27:13 -08:00
Mark Otto
01421ecd62 remove sprites vars, change zindex vars 2012-11-30 15:23:13 -08:00
Mark Otto
12a00f62a9 remove color variables, swap others were appropro 2012-11-30 15:18:49 -08:00
Mark Otto
0ef347706c more vars changing 2012-11-30 15:09:57 -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
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
030a058174 Remove .navbar-inner from navbar tests 2012-11-30 12:36:55 -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
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
721b568303 update comment 2012-11-29 23:27:09 -08:00
Mark Otto
c5173cdb92 Merge branch 'idavemm-patch-1' into 2.2.2-wip 2012-11-29 23:26:22 -08:00
Mark Otto
acc037de15 add holder and replace placehold.it 2012-11-29 20:59:14 -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
Zulfiqar Ali
693fd0db2a help-block margin-top should also apply after a span.uneditable-input 2012-11-28 16:47:59 +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
Zulfiqar Ali
701f871e7d help-block margin-top should also apply after a span.input 2012-11-27 07:30:54 +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
Tony Narlock
ace6dc0c25 Fix typo in reset.less 2012-11-19 16:49:47 -05:00
Mark Otto
a10d68f291 Fixes #5937: Border radius vars in button groups 2012-11-18 12:30:35 -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
cd1f72f484 Merge pull request #5894 from amid2887/patch-3 
Update less/tables.less ( typing, use variable, add border-radius reset )
 2012-11-14 01:20:20 -08:00
amid2887
41889f74d0 Update less/tables.less 
Possible typing.

Add @baseBorderRadius as value for some rules.

Add border-radius clearing for first and last td in the last tbody for table with tfoot.
 2012-11-13 17:49:33 +07:00
Drew Goodwin
c8856eeff3 fixes #5873: @navbarInverseBrandColor not used 2012-11-10 17:58:00 -08:00
Mark Otto
f2bbee2075 remove * line-height 2012-11-08 23:56:29 -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
34880e3ef5 Fixes #5596: switch vars in .size mixin 2012-11-04 19:59:50 -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
David
46d38b10b8 Prevent IE8 from misplacing imgs 
Fixed imgs in a nav that were misplaced on IE8.
 2012-11-02 15:04:34 +01: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
Ninir
be03a53086 Replaced hardcoded CSS rules with mixins 2012-10-31 11:09:44 -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
b5af762ef5 Merge branch '2.1.2-wip' 
Conflicts:
	js/bootstrap-dropdown.js
 2012-10-29 22:01:58 -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
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
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
b18c009051 fixes #5473: use baselineheight var for input bottom margin 2012-10-10 09:47:08 -07:00
Mark Otto
7e534ce98a fixes #5443: reset background gradient on disabled dropdown links 2012-10-07 21:45:16 -07:00
Mark Otto
e4f522990e fixes #5416: use correct variable for inverse navbar responsive links 2012-10-07 21:43:37 -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
630a88d3ce Merge pull request #5281 from GotenXiao/pagination-active-background 
Use paginationActiveBackground var to finish fixing #4295
 2012-10-02 15:23:59 -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
7763cab608 Merge branch '2.1.2-wip' of https://github.com/advancedrei/bootstrap into advancedrei-2.1.2-wip 2012-10-01 16:15:26 -07:00
Mark Otto
5cf7c803e2 Merge branch '2.1.2-wip-modal-responsivefix' of https://github.com/andriijas/bootstrap into andriijas-2.1.2-wip-modal-responsivefix 2012-10-01 15:29:21 -07:00
Mark Otto
d36e37214b fixes #5319: add backface-visibility for webkit skewing 2012-10-01 15:26:17 -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
c77d4266c0 Merge pull request #5369 from amid2887/2.1.2-wip 
Add missing icon class definition for navs.less
 2012-10-01 10:27:13 -07:00
amid2887
46764a7165 Add missing icon class definition for navs.less 
add missing icon class definition for navs:
'[class*=" icon-"]'

P.S. Sorry for 2 pull requests with the same problem..
 2012-10-01 14:32:51 +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
c82b9d1e7c remove gradientbar mixin 2012-09-30 23:54:35 -07:00
Mark Otto
973646ea67 vars less spacing and cleanup 2012-09-30 23:52:02 -07:00
Mark Otto
142643589f remove bluedark var 2012-09-30 23:50:54 -07:00
Mark Otto
3f4076c635 consolidate border-radius on code 2012-09-30 23:49:26 -07:00
Mark Otto
3934e55254 remove dupe ff3/4 button fixes; also remove headingscolor var 2012-09-30 23:46:48 -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
0cd186183c add comment for filter opacity browser requirements 2012-09-30 22:54:44 -07:00
Mark Otto
840cad69af remove translucent bg mixin 2012-09-30 22:52:32 -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
40a8a93b22 Merge branch 'amid2887-master' into 2.1.2-wip 2012-09-30 22:41:11 -07:00
amid2887
d49dd766c8 Add missing icon class definition for buttons.less 
add missing icon class definition for buttons:
'[class*=" icon-"]'
 2012-10-01 12:27:37 +07:00
Artem Kustikov
0944e036ae Fix for #4550 
Also fixes dropdowns hiding behavior for case when two or more dropdowns
with [data-toggle=dropdown] exist on the page
 2012-09-27 21:45:37 +03:00
Andreas Cederström
ecbb0ed4df Making modal work with max width 767px - fixes #4860 2012-09-27 11:46:54 +02: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
2eb4c6fc79 cleanup breadcrumbs less code (nesting) 2012-09-25 22:57:49 -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
151ed38cdc remove references to row fluid elsewhere 2012-09-25 22:18:34 -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
f0b4f05a27 remove ie7 support from mixins 2012-09-25 22:02:29 -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
Robin Lewis
b29d947477 Use paginationActiveBackground var to finish fixing #4295 2012-09-25 21:12:01 +01: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
a4bf6ef0a0 match decimal placements in type.less 2012-09-23 15:16:13 -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
67585bd34e fixes #5211 manually: spacing in mixins to match others 2012-09-20 09:07:48 -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
f69e244a60 Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-09-17 15:28:41 -07:00
Mark Otto
1ea09b751e fixes #5163: add new var for navbar collapse's default view, use that in responsive navbar css 2012-09-17 08:52:19 -07:00
Robert McLaws
6aa15eb01f Support for left-opening dropdown submenus 
Adds a new class called .dropdown-submenu-left. It is useful when you
have a .pull-right DropDown that has submenus. Without this, the menu
opens left past the page boundary, which can trigger the scrollbars and
cause other nastiness.
 2012-09-16 03:02:31 -04:00
Adrien Cahen
5331fe39df fix active tab bg on non-white body 2012-09-13 12:16:18 -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
65d322958c add space 2012-09-12 16:11:03 -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
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
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
cd2b12f788 fixes #5064 manually: remove fancy quote mark 2012-09-10 22:41:14 -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