0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-13 01:08:58 +01:00
Commit Graph

1877 Commits

Author SHA1 Message Date
Mark Otto
6d048471c4 Re-add carousel captions as optional
* They're hidden by default in the mobile-first views because otherwise they just cover up the slides
* In mobile they're centered, and then are shown left aligned at larger viewports
2013-02-16 02:47:15 -08:00
Mark Otto
ce21926704 All Glyphicons now require a base class, e.g. .glyphicon.glyphicon-star 2013-02-16 01:26:43 -08:00
Mark Otto
d8e2668c1d Overhaul carousel a bit more:
* Drop custom type arrow controls for glyphicons icons instead for more consistent rendering
* Remove the captions and instead let folks implement what they want in the carousel
* Move the indicators to the bottom middle instead of top right
* Lighten up gradients on the edges for less harsh lighting
2013-02-16 01:22:15 -08:00
Mark Otto
f38e50cdf1 Don't affix the fixed navbars in mobile views 2013-02-16 00:19:17 -08:00
Mark Otto
6789a30a3d fix #6950: use var for font-family 2013-02-15 16:51:16 -08:00
Mark Otto
96953c2072 update makefile to work again; gitignore the compiled docs _gh_pages folder; test makefile with darkened navbar active bg 2013-02-13 12:30:56 -08:00
Danny Keane
e8dc036d25 Added retina image support mixin 2013-02-11 18:23:21 -08:00
Mark Otto
63c1377ee7 Fixes #6852: add cursor pointer to carousel indicators 2013-02-08 09:56:04 -08:00
Mark Otto
1b2b049ef8 Fixes #6841: Add new Firefox placeholder, comments 2013-02-08 08:32:29 -08:00
Mark Otto
3eed90c187 Fixes #6837: Enable text alignment utility classes on tables
* Removes text-align from td elements (no need to set that one)
* Specifically sets th to text-align: left; at a global level (no longer within .table) to override browser defaults
* Removes font-weight: bold; from th while we're at it since that's browser default already
2013-02-08 08:24:10 -08:00
Mark Otto
52581839c7 remove modal test file 2013-02-07 19:34:23 -08:00
Mark Otto
b04acb37e8 finish modal tweaks 2013-02-07 19:31:12 -08:00
Mark Otto
a623b8c10f update docs modals 2013-02-07 19:21:56 -08:00
Mark Otto
8ca70bd83a Overhaul modal to make it responsive and not super lame 2013-02-06 02:07:40 -08:00
Mark Otto
421f9f67c4 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap.js
	docs/css.html
	docs/templates/pages/base-css.mustache
	js/bootstrap-popover.js
	less/mixins.less
	less/tooltip.less
2013-02-05 22:42:54 -08:00
fat
3b56227553 Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2013-02-05 22:30:54 -08:00
fat
4814281540 clean up styles 2013-02-05 22:29:59 -08:00
Mark Otto
0fe9148b91 Fixes #6190: Add print utility classes 2013-02-05 22:17:28 -08:00
fat
5e4db94c24 Merge branch '2.3.0-wip' of git://github.com/ghusse/bootstrap into ghusse-2.3.0-wip 2013-02-05 22:10:41 -08:00
fat-kun
042bb9b515 Merge pull request #6780 from agatronic/2.3.0-wip
less: Move to new selector interpolation, supported from 1.3.1
2013-02-05 21:29:59 -08:00
Mark Otto
37a6879ca5 White navbar brand text for inverted navbar 2013-02-05 20:39:09 -08:00
Mark Otto
28e1702052 nuke rogue conflict comment and remake 2013-02-05 19:59:02 -08:00
Mark Otto
43da258bd9 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/examples/hero.html
	less/buttons.less
	less/carousel.less
	less/close.less
	less/dropdowns.less
	less/labels-badges.less
	less/mixins.less
	less/navbar.less
	less/navs.less
	less/pagination.less
	less/responsive-navbar.less
	less/scaffolding.less
	less/sprites.less
	less/thumbnails.less
	less/type.less
2013-02-05 19:53:44 -08:00
Mark Otto
c97d304c0c derp, fix broke css and recompile 2013-02-05 19:43:49 -08:00
Mark Otto
9443eb6e21 restore comma between selectors 2013-02-05 19:40:32 -08:00
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
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
1f8e2d2617 Merge branch 'dionysiosarvanitis-master' into 2.1.2-wip 2012-09-07 11:41:35 -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
Dionysios G. Arvanitis
cc4f8b9f6c remove offset margin in row-fluid mobile layout 2012-09-07 17:54:15 +03:00
Giuliano Velli
7762a77c21 Modified the file to conform to bootstrap standards and fix an IE7 css selector issue
Signed-off-by: Giuliano Velli <giuliano@giusi.org>
2012-09-07 09:59:52 +02: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
08b8571cb8 version bump to get this started 2012-09-05 10:00:57 -07:00
Slavi Pantaleev
5ff5d351bf Do not force white icons in active tab links
Active `.nav-tabs` elements are not blue (like pills),
so forcing a white icon there is not appropriate.
2012-09-05 19:07:53 +03:00
Mark Otto
73ef263d5f improve comments in image styles 2012-09-04 11:31:48 -07:00
Mark Otto
a1d2ee6542 fixes #4885: correct use of skew in .skew() mixin for FF 2012-09-04 11:08:08 -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
acf2a64016 fixes #4935: properly comment responsive image techniques and add CSS tests to support 2012-09-03 17:35:35 -07:00
Mark Otto
8cda830eaf fixes #4146: IE7-8 responsive image helper 2012-09-03 01:13:42 -07:00
Mark Otto
f25129361b add comment to go with updated box-shadow mixin 2012-09-03 01:04:53 -07:00
Mark Otto
f46813a8c8 Merge pull request #4763 from Luis-TP/2.1.1-wip
Improve .box-shadow mixin by utilizing regex function to no longer require escaping
2012-09-03 01:03:37 -07:00
Mark Otto
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
2da2169a56 fixes #4828: make fluid grid inputs size the same as fixed grid inputs 2012-08-29 13:06:47 -07:00
Mark Otto
2137cd65fb fixes #4819: manual fix of missing .control-label in responsive767 file, coupled with a remake 2012-08-29 13:05:43 -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
7d412b1e14 fixes #4741: undo previous version's attempt at firefox gradient changes and add gradient tests 2012-08-27 21:18:55 -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
Luis Aleman
2719ac3e9b Unescaped box-shadows to take advantage of new box-shadow mixin 2012-08-27 19:14:00 -04:00
Luis Aleman
67eae2a503 Do not need to write box-shadow in full 2012-08-27 19:13:37 -04:00
Luis Aleman
96a1797af1 No longer need to write box-shadows in full when using lighten or other functions 2012-08-27 19:13:11 -04:00
Luis Aleman
1b7a3ca416 Changed box-shadow mixin to accept infinite, comma separated, shadows 2012-08-27 19:10:20 -04: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
15317419f4 fixes #4577: no margin on .control-row .span* in responsive 2012-08-27 11:46:47 -07:00
Mark Otto
8a5dde556b fixes #4644: ensure new static navbar negative indents on responsive layouts like fixed navbars 2012-08-27 11:05:01 -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
12d5c88c20 fixes #4742: add default value to striped gradient 2012-08-27 09:53:23 -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
cfa039d2e0 Merge branch 'sparanoid-master' into 2.1.1-wip 2012-08-26 22:30:49 -07:00
Tunghsiao Liu
ec6b320003 Add .transition-delay mixin 2012-08-26 13:09:10 +08:00
Mark Otto
bb9d1af1ca fixes #4672 manually: placeholder comment 2012-08-25 21:51:07 -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
1973c64342 Merge branch 'PavelDemyanenko-patch-1' into 2.1.1-wip 2012-08-21 14:42:25 -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
b1c93c2700 fixes #4523: more specific selectors on white icon inversion 2012-08-21 14:15:01 -07:00
philippm
6e7ba4e24a Fix all submenus expanded recursively in dropdown
The problem was that the CSS selector made *all* of a submenu's nested
menus visible. Fixed by applying the selector to the immediate nested
menu only.
2012-08-21 22:10:36 +01:00
Mark Otto
311c00a29b fixes #4532: navbar responsive carets for dropdown-menus now hidden, also fixes borders on navbar form 2012-08-21 14:07:20 -07:00
Mark Otto
6dc13573bf add css tests and stuff for #4528 2012-08-21 13:42:00 -07:00
Mark Otto
1c134d9a7f update version numbers to 2.1.1 2012-08-21 13:11:25 -07:00
Mark Otto
94f9f9de73 Merge branch 'UTGuy-master' into 2.1.1-wip 2012-08-21 13:07:11 -07:00
Mark Otto
e5060b8d92 clean up spacing and run make 2012-08-21 13:07:06 -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
UTGuy
5fc5d26917 Update less/variables.less
https://github.com/twitter/bootstrap/issues/4508

should fix this issue
2012-08-21 11:21:28 -03:00
Pavel Demyanenko
fe3ed433e4 Fix bug Collapse broken in IE 2012-08-21 14:33:15 +04:00
Mark Otto
aa2cec6f2f fixes #4178: translate3d instead of translate 2012-08-20 14:26:38 -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
78cb09b440 run make and add comment 2012-08-20 11:31:24 -07:00
Mark Otto
ed13ec50f8 Merge branch 'patch-1' of https://github.com/krnlde/bootstrap into krnlde-patch-1 2012-08-20 11:28:43 -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
Mark Otto
47697c5f35 Merge branch 'progress-multi-2.1.0-wip' of https://github.com/jpommerening/bootstrap into jpommerening-progress-multi-2.1.0-wip 2012-08-20 11:13:07 -07:00
Mark Otto
73cf9c4db8 fixes #4469 manually: reset width on file inputs 2012-08-20 10:28:41 -07:00
Jonas Pommerening
a1951ed7c0 stack mutliple progress bars 2012-08-20 10:12:03 +02:00
Mark Otto
e510306196 bump versions to 2.1.0 2012-08-19 23:07:18 -07:00
Mark Otto
a667fd93ab pre font-size increase; revert static top navbar, undo contents section for now 2012-08-19 23:01:24 -07:00
Mark Otto
4e979f084d fix static navbar container issues, clean up docs presentation by unfixing the top navbar in favor of static one, start adding table of contents for longer sections of docs 2012-08-19 21:12:52 -07:00
Mark Otto
94ba211c40 fixes #4462: mixins instead of vanilla css 2012-08-19 20:32:29 -07:00
Mark Otto
b745b7768a fixes #4458: improve support for .btn + .btn in .btn-groups and .btn-toolbars 2012-08-19 17:07:41 -07:00
Mark Otto
887f11d47f fixes #4455: improve small styles and add to docs 2012-08-19 13:12:43 -07:00
Kai Dorschner
1e190d8036 Fix for thumbnails in responsive design 2012-08-19 17:32:40 +03:00
Mark Otto
e79eb75e09 fixes #4044: make z-index of tooltips same as fixed navbar so they overlay it if generated from within 2012-08-18 17:05:37 -07:00
Mark Otto
e6e0e2ac9b fixes #4442: allow for .btn within a .btn-toolbar without .btn-group 2012-08-18 16:50:26 -07:00
Mark Otto
50638530e6 fixes #4445: .btn-link shouldn't have a pressed button-like state at all, so nuking everything on :active as well 2012-08-18 16:30:47 -07:00
Mark Otto
1ae194597c nuke subnav styles from responsive navbar 2012-08-17 16:32:34 -07:00
Mark Otto
256a25f25c fixes #4260 and #4322: set vertical-align to top on input-prepend components to solve modal rounding issues 2012-08-17 16:28:45 -07:00
Mark Otto
5b947b8a2f fix up padding on small buttons, add button examples 2012-08-17 16:11:52 -07:00
Mark Otto
f9deb8017a Merge branch '2.1.0-wip' of https://github.com/tobz/bootstrap into tobz-2.1.0-wip 2012-08-17 16:04:35 -07:00
Mark Otto
2b22c0c56e fixes #4438: button groups in inline forms now render inline 2012-08-17 16:00:36 -07:00
Mark Otto
9e6322dbab fixes #4428: specifity on .search-query increased 2012-08-17 12:59:32 -07:00
Mark Otto
077577c7f3 fixes #4421: add static top navbar class 2012-08-17 11:46:23 -07:00
Mark Otto
b86e1fb62a additional navbar contrast: add inset shadow since we nuked the border 2012-08-17 11:31:21 -07:00
Mark Otto
79e05d0c0e change css version # 2012-08-17 11:24:48 -07:00
Mark Otto
39f779b5d3 Merge pull request #4419 from natansh/2.1.0-wip
Fix typo to make dropdown active link show icon-white
2012-08-17 11:23:22 -07:00
Mark Otto
ded21ebc91 fixes #4416 in a different way: scope active state of navbar links to just the immediate navbar link, not dropdown elements 2012-08-17 11:22:45 -07:00
Natansh Verma
bb61175eba Fixes typo for issue #4413. 2012-08-16 17:09:55 +05:30
Mark Otto
54c645e33d tweak transition 2012-08-15 14:49:55 -07:00
Mark Otto
fd509cb370 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-08-15 14:45:41 -07:00
Mark Otto
ada5589184 add transition to thumbnails 2012-08-15 14:45:35 -07:00
tobz
27e9214e05 Removed pixel designation from a zeroed-out property. 2012-08-15 10:38:59 -03:00
tobz
ddefdbf31f Added default top margin of 1px for icons. 2012-08-15 10:38:21 -03:00
tobz
6bfa58ea4d Updated margin adjustments of button-based icon overrides. 2012-08-15 10:37:49 -03:00
Mark Otto
b0437bef76 Merge pull request #4274 from Marmelatze/three-color-gradient
Force percentage value on .vertical-three-colors() gradient mixin.
2012-08-14 22:07:17 -07:00
Mark Otto
61a8ef2feb Merge branch 'fix/center-text-navbar' of https://github.com/mikaelkael/bootstrap into mikaelkael-fix/center-text-navbar 2012-08-14 16:27:01 -07:00
Mark Otto
9c72246d49 navbar and dropdown fixes, for alignments and for ie7/8 dropdown hidden bugs from #3946 2012-08-14 16:24:58 -07:00
Mark Otto
f3479a3953 compensate for ie7 button padding with no borders, fix indentation 2012-08-14 15:44:25 -07:00
Mark Otto
f933a41c7b remove bottom margin on radios and checkboxes 2012-08-14 15:34:10 -07:00
Mark Otto
780636d955 fixes #3674: checkbox vertical alignment in IE9 2012-08-14 15:29:47 -07:00
Mickael Perraud
41093a328e Center text in navbar with change to @baseLineHeight (18 -> 20px) 2012-08-15 00:11:57 +02:00
Mark Otto
5144c77b27 fixes #4358: make select elements 30px tall to match inputs 2012-08-14 14:57:49 -07:00
Mark Otto
50df524ba1 remove borders entirely from fixed navbars 2012-08-14 14:53:45 -07:00
Mark Otto
dbcd87331d fixes #4371: scope hovers on table rows to tbody 2012-08-14 14:51:33 -07:00
Mark Otto
662fface3b Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-08-14 14:32:10 -07:00
Mark Otto
0b0d7f104c fixes #4396: pull right dropdown menus no longer overlaid by submenus 2012-08-14 14:32:03 -07:00
Mark Otto
2a6deb92b1 fixes #4395: scope dropdown menu caret in navbar to first level dropdown only 2012-08-14 14:29:31 -07:00
Melvin
f6ac297903 Fix .thumbnail line-height 2012-08-14 21:06:35 +03:00
Mark Otto
4bf93a2d76 fixes #4265: restore chromium select fix 2012-08-13 23:03:35 -07:00
Mark Otto
97a23ef2e6 fixes #4342: navbar vars not in use, render navbar dividers 2012-08-13 22:57:40 -07:00
Mark Otto
9f8ce77751 running make on previous changes 2012-08-13 10:05:19 -07:00
Mark Otto
f6c7ac51f2 add some simple styles for showing white icons on hover where appropriate 2012-08-08 11:26:22 -07:00
Mark Otto
4eee78e051 fixes #4304: more specific selectors on table border classes to override .table-striped 2012-08-07 22:50:49 -07:00
Mark Otto
8ed77c41f0 fixes #4295: add vars for pagination 2012-08-07 22:37:38 -07:00
Florian Pfitzer
fa38ab573b Fixes vertical-three-colors in Firefox 2012-08-03 16:56:59 +02:00
Mark Otto
d27dcf3b07 cut down on selectors on .formFieldState() mixin to origin input catchall 2012-08-01 23:16:49 -07:00
Mark Otto
1482030679 fixes #4207: redeclare box-shadow on .formFieldState() mixin so transitions work in WebKit 2012-08-01 23:15:51 -07:00
Mark Otto
1e2edaef48 add test for #4236: button group, one button with text and one with icon, now line up properly 2012-08-01 22:52:53 -07:00
Mark Otto
fc7ecd78c8 add select element responsive CSS test 2012-08-01 20:58:33 -07:00
Mark Otto
225d0e0af3 label new css test 2012-08-01 19:36:28 -07:00
Mark Otto
1bb7c0e669 fixes #4254: make .span12 expand full width of a parent when responsive 2012-08-01 19:33:37 -07:00
Mark Otto
3c742fc08b add test for textarea at .span12, really fix docs footer 2012-08-01 19:25:50 -07:00
Mark Otto
72323051c3 increase padding on navbar responsive nav links, fix footer margins 2012-08-01 19:18:42 -07:00
Mark Otto
b979cd9e67 darken default button borders 2012-08-01 17:01:29 -07:00
Mark Otto
735001cb26 increase horizontal padding on inputs given new font-size 2012-08-01 11:53:00 -07:00
Mark Otto
fab1a80dcb increase margin on checkboxes and radios to center properly 2012-08-01 11:35:31 -07:00
Mark Otto
060e216712 fixes #4253: hover on responsive navbar 2012-08-01 09:18:00 -07:00
Mark Otto
196fb1d86a fixes #3615: remove last-child hack for IE7 since IE7 doesn't support :last-child 2012-07-30 22:26:54 -07:00
Mark Otto
59eba9afbc remove position from labels/badges in mini btns 2012-07-30 15:54:03 -07:00
Mark Otto
364dbb7931 fixes #3665: ensure inputs in a fluid row maintain grid sizing 2012-07-30 15:38:36 -07:00
Mark Otto
a9bf1e6e35 fixes #3900: nudge badges in buttons up 1px 2012-07-30 13:25:27 -07:00
Mark Otto
b2ebd5c46c update button styles to use updated 14px base font size, align carets to others with no opacity changes 2012-07-30 12:52:44 -07:00
Mark Otto
7fa99fb1fe fix navbar form alignment, and update examples to show these cases 2012-07-30 12:15:08 -07:00
Mark Otto
04164e4367 fixes #3858: add var for responsive navbar. also add additional examples to navbar docs 2012-07-30 10:25:04 -07:00
Mark Otto
b63543181a fix examples collapse classes, rename navbar-redux to navbar and delete the old one 2012-07-30 10:08:27 -07:00
Mark Otto
cfac4bb59d fixes #4221: correct border-collapse property for IE7 hack 2012-07-29 23:51:40 -07:00
Mark Otto
22a9a83656 fixes #3694: provide override classes for .hide and .pull-right for grid columns 2012-07-29 16:51:24 -07:00
Mark Otto
d63ebe3f3c more breadcrumb tweaks for contrast 2012-07-29 16:37:37 -07:00
Mark Otto
87ce3489d3 remove gradient, border, and box-shadow from .breadcrumb to differentiate from nav and buttons 2012-07-29 16:25:20 -07:00
Mark Otto
761429d88a Merge branch '2.1.0-wip-navbar' into 2.1.0-wip 2012-07-29 16:24:05 -07:00
Mark Otto
134d11b528 use shorthand on form field transitions for box-shadow mixin 2012-07-29 12:10:29 -07:00
Mark Otto
a30045daef reverse navbar styles to save code 2012-07-29 00:30:15 -07:00
Mark Otto
fe6a4b0b54 add .btn-block for a full-width button option 2012-07-27 15:42:58 -07:00
Mark Otto
16b4ac0d8f add docs for sub menu support on dropdowns, add caret via :after to submenu toggles 2012-07-27 10:35:15 -07:00
Mark Otto
9d5c431223 add basic support for sub menus in dropdown menus 2012-07-27 10:06:54 -07:00
Mark Otto
1e9b450619 add image styles, for now to scaffolding (soon to own file) 2012-07-27 00:06:43 -07:00
Mark Otto
6474190746 increase height of homepage jumbotron, update vars and styles of popovers 2012-07-26 23:42:36 -07:00
Mark Otto
7590e65f6f fix search form, mostly in navbar 2012-07-24 01:44:12 -07:00
Mark Otto
87aa61001e fixes #4118: responsive modal gets width auto and improved positioning for narrower widths 2012-07-24 00:44:11 -07:00
Mark Otto
c37aa99e28 modal heading line-height 2012-07-24 00:37:19 -07:00
Mark Otto
4912dd441d fix h3 in modal and make modal unhidden by removing important from earlier issue 2012-07-24 00:35:54 -07:00
Mark Otto
cd441e082f fixes #4156: don't override border radius if stacked nav has one child 2012-07-23 23:56:13 -07:00
Jacob Thornton
e25bcb93fc Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 2012-07-22 18:29:01 -07:00
Jacob Thornton
dcf75697ec some progress on affix plugin 2012-07-22 18:28:39 -07:00
♒∆✝
cf70fb629f Merge pull request #3842 from alienlebarge/2.1.0-wip
<img /> tag with `height` attr are not responsive
2012-07-22 14:59:08 -07:00
Mark Otto
5b8ff7061b fixes #4136: use @dropdownBorder var, but keep IE7-8 fallback 2012-07-22 14:31:39 -07:00
Mark Otto
1d4660beea nuke commented out code from last fix 2012-07-19 21:25:42 -07:00
Mark Otto
3c1a0fbda4 fixes #4103: simpler fix for tfoot in .table-border 2012-07-19 21:25:24 -07:00
Mark Otto
89d7ec5290 fixes #4102: properly round top left corners of .table-border with caption/colgroup; also fix css tests page layout and footer 2012-07-19 21:06:42 -07:00
Mark Otto
aac3736eea fixes #3845: add .btn-link for transparent buttons styled as links 2012-07-17 23:32:52 -07:00
Mark Otto
cb1a59caa0 Merge branch '2.1.0-wip' of https://github.com/gcoop/bootstrap into gcoop-2.1.0-wip
Conflicts:
	docs/base-css.html
	docs/templates/pages/base-css.mustache
2012-07-17 23:14:58 -07:00
Mark Otto
326b665065 de-scope nav-header from .nav 2012-07-17 22:40:38 -07:00
Mark Otto
39f8996d6a fix dropdown vars and make hover state be link color again, add gradient to dropdown link hovers, fix caret positions and active states on nav tabs, tweak nav link padding 2012-07-17 22:26:53 -07:00
Mark Otto
478396fd4e remove list-type declarations from ul and ol elements since those should just use browser defaults 2012-07-17 19:11:41 -07:00
Mark Otto
e20d2dfe9d docs cleanup and blockquote cleanup for .pull-right option 2012-07-15 16:13:25 -07:00
Mark Otto
750badabf7 copy edits and tweaks to utility classes to ensure they always are specific enough 2012-07-13 14:43:51 -07:00
Mark Otto
5cb116beb8 cleanup subnav example 2012-07-13 10:58:20 -07:00
Mark Otto
549d61fc28 updated footer 2012-07-12 17:02:55 -07:00
Mark Otto
7d324ee35b Merge branch 'respclasses' of https://github.com/digitaldisseny/bootstrap into digitaldisseny-respclasses 2012-07-12 16:24:37 -07:00
Mark Otto
c884d6eaa6 clean up docs for subnav 2012-07-12 13:50:27 -07:00
Roberto - phproberto
f0ed383e51 Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into respclasses 2012-07-11 01:31:44 +02:00
Mark Otto
713105774f fixes #3706: add textColor and textShadow as options to .buttonBackground mixin 2012-07-10 00:45:44 -07:00
Mark Otto
a750551fee add vars for tooltip customization via background and color 2012-07-10 00:36:21 -07:00
Mark Otto
5d8e78e0fa fixes #3605: add support for input-prepend/-append to .form-search 2012-07-10 00:32:30 -07:00
Roberto - phproberto
83846ba0d6 Fixes #4002 responsive utilities classes 2012-07-10 08:12:16 +02:00
Mark Otto
64e87a85f5 remove popoverarrows mixin, relegate code to tooltips and popvers since we only used them once each; this fixes the problem of broken tooltips in 2.1 2012-07-09 22:14:30 -07:00
Mark Otto
f4877c2369 fix up docs popover examples and copy 2012-07-09 21:13:33 -07:00
Mark Otto
148e5a3d89 fixes #3291: remove float on responsive .thumbnails for 767px and down to ensure thumbnail images don't pop out of container in FF 2012-07-09 21:07:49 -07:00
Mark Otto
f495a8d0cc fixes #3210: add .btn to .navbar-form to remove bottom margin, improve vertical align of contents of .navbar-form 2012-07-09 21:01:29 -07:00
Mark Otto
93be608bf0 fixes #3384: add support for multiple inputs per line when using grid sizing 2012-07-09 20:49:17 -07:00
Mark Otto
dbea3e2784 update comments after merging gradient change 2012-07-09 00:53:56 -07:00
Mark Otto
646c87c151 Merge pull request #3937 from codler/patch-4
Update linear-gradient standard
2012-07-09 00:53:18 -07:00
Mark Otto
7800fee7e0 fixes #3973: same border on disabled inputs as default inputs: 2012-07-09 00:51:38 -07:00
Mark Otto
07f80e6fd8 fixes #4027: same margins on .pager and .pagination 2012-07-09 00:42:38 -07:00
Mark Otto
50a945e084 Merge branch '2.1.0-wip' of https://github.com/nextgenthemes/bootstrap into nextgenthemes-2.1.0-wip
Conflicts:
	less/buttons.less
2012-07-09 00:39:56 -07:00
Mark Otto
25d0b341a9 wasn't feeling the new buttons, downsizing again until we get a better balance 2012-07-09 00:31:54 -07:00
Mark Otto
9887d3cf4a updating docs examples to remove 13/18 resets, fix up buttons alignments and carets 2012-07-09 00:26:32 -07:00
Mark Otto
db9925510b fix up carousel alignment and line-height 2012-07-08 21:47:16 -07:00
Mark Otto
20676ddd4d adding getting started page based on Bootstrap University from awhile back, testing out side nav on docs instead of subnav bar 2012-07-08 01:47:36 -07:00
Mark Otto
5f861ef517 fix up docs to use default container, fix responsive home changes 2012-07-07 23:16:07 -07:00
nextgenthemes
7d1c8c2a0c Wrapped btn:hover, btn.disabled inside .btn 2012-07-07 23:20:50 +03:00
Mark Otto
3f2f96b0d7 reoder forms a bit 2012-07-07 12:52:05 -07:00
Mark Otto
e2b777d9a3 docs pre font-size and nowrap on prepend/append 2012-07-07 12:34:47 -07:00
Mark Otto
7cc916d137 Merge branch '21jumpst' into 2.1.0-wip 2012-07-07 00:48:15 -07:00
Mark Otto
c7f6499235 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-07-07 00:30:55 -07:00
Mark Otto
e2336ef02a remove specific values for the fluid grid system and instead use LESS's percentage() function 2012-07-07 00:30:43 -07:00
Mark Otto
7ff1b074ea Merge pull request #3986 from desandro/full-height-progress-bar
Full height progress bar
2012-07-06 13:44:09 -07:00
Mark Otto
dc6eaafb00 vertically align inline form content 2012-07-06 10:59:46 -07:00
Mark Otto
19ea4668e5 prevent small tags from increasing height of headings 2012-07-06 10:35:08 -07:00
Mark Otto
cd6915cdb4 tests cleanup on type, homepage content tweaks 2012-07-05 19:45:32 -07:00
Mark Otto
68146db004 buttons and pre updates for font-size 2012-07-05 15:15:57 -07:00
Mark Otto
3c07eaa251 updates to type scale 2012-07-05 15:11:54 -07:00
Mark Otto
c6ee96c025 fix up subnav styles, add subnav search form styles, add some basic docs for subnav 2012-07-05 10:37:23 -07:00
Mark Otto
a645664e50 update thumbnails to fix display issues and refine aesthetics 2012-07-05 10:12:15 -07:00
Mark Otto
62c386259b rewrite docs homepage, new graphics 2012-07-04 23:31:30 -07:00
Gavin Cooper (work)
b4125748b0 added ability to give rows in tables status classes .success .error and .info. 2012-07-04 12:22:34 +01:00
Dave DeSandro
26dad5f56d .progress .bar { height: 100% } 2012-07-02 17:21:26 -04:00
Mark Otto
70e81e6f55 new jumbotron 2012-07-01 08:42:09 -07:00
Mark Otto
fb29075926 Merge pull request #3976 from benvinegar/master
Fix Opera .clearfix bug when using contenteditable
2012-06-30 22:05:03 -07:00
Mark Otto
cd2d82150c standardize top level file comments 2012-06-28 21:46:45 -07:00
Mark Otto
98ebd54800 address issues with fixed subnav like borders, corners, etc 2012-06-28 21:20:40 -07:00
Mark Otto
c31a4e5131 remove responsive subnav from docs and place in navbar-responsive.less 2012-06-28 20:59:16 -07:00
Mark Otto
c09e8473e2 use variablef or wells background-color, update docs for glyphicons license mention, update popovers to remove that thick border and make them look mo betta 2012-06-28 10:03:46 -07:00
Han Lin Yap
2e3306d5dd Update linear-gradient standard 2012-06-26 12:30:43 +03:00
Mark Otto
b77ed4a3a3 fix dropdowns in button groups after font-size hack 2012-06-25 20:57:04 -07:00
Mark Otto
244a9ab79d reverse the gradient on striped progress bars so it matches the active state when animated 2012-06-25 20:20:32 -07:00
Ben Vinegar
3761d50c5a Fix Opera .clearfix bug when using contenteditable 2012-06-25 17:35:42 -07:00
Mark Otto
a85499749a Merge pull request #3856 from Calvein/patch-1
Remove useless ms prefixes
2012-06-25 17:10:02 -07:00
Mark Otto
d65e815a48 use @textColor to change help-block/help-inline font color 2012-06-25 16:47:29 -07:00
Mark Otto
94a3d4eb14 reorder media queries 2012-06-25 16:25:50 -07:00
Mark Otto
8c2db7d7d6 prevent button group buttons from wrapping in tight spaces by removing floats and replacing with font-size: 0; inline-block hack 2012-06-25 15:47:07 -07:00
Mark Otto
78849cf52e remove jank fix for dt bold text 2012-06-25 15:09:39 -07:00
Mark Otto
cd466f1d0b add tests for table grid sizing, solve bugs in fluid table grid sizing 2012-06-25 14:37:35 -07:00
Mark Otto
27845e4492 #3223: make table row hover optional class 2012-06-25 14:11:37 -07:00
Mark Otto
508a93d9e3 make fixing of subnav work again 2012-06-24 21:07:20 -07:00
Mark Otto
6662f62236 remove subnav file, instead add an optional class for .navbar 2012-06-24 21:03:39 -07:00
Mark Otto
87af5d3bbe more subnav optimizations 2012-06-24 20:42:31 -07:00
Mark Otto
71669dda63 tons of docs cleanup in css, adding subnav to official components 2012-06-24 20:26:48 -07:00
Mark Otto
160fe7ca59 create vars for responsive grid values, fixed and fluid, and document them in the customizer 2012-06-20 23:46:51 -07:00
Mark Otto
7301931a6d Merge branch '2.1.0-wip' of https://github.com/marcusds/bootstrap into 2.1.0-wip 2012-06-20 20:20:22 -07:00
Mark Otto
f5a2d82a3a Merge branch 'EngineerGio-patch-1' into 2.1.0-wip 2012-06-20 19:36:16 -07:00
Mark Otto
83e46b8df9 reorder for t-r-b-l 2012-06-20 19:36:06 -07:00
EngineerGio
5bd9217f9b Added border-radius mixins to set single corner radius and single side border radius 2012-06-21 01:50:28 +03:00
Mark Otto
d704d6f0ed #3861: add span to pagination selectors for full support of non-link pagination items 2012-06-19 23:37:47 -07:00
Mark Otto
ce140662a0 remove unused container reset 2012-06-19 20:01:03 -07:00
Mark Otto
9df832b4bb add separate vars for dropdown link hover and active states 2012-06-19 19:17:42 -07:00
Mark Otto
b54264cde0 add basic vertical button group support 2012-06-19 14:42:46 -07:00
Mark Otto
64ba423b6d #2764: add disabled styles to navs and dropdowns 2012-06-19 13:52:07 -07:00
Mark Otto
d14f06fc4e round select list corners 2012-06-19 13:25:35 -07:00
Mark Otto
9aa5a6db12 updated tests and homepage marketing copy 2012-06-19 13:21:35 -07:00
Mark Otto
bae3cfd183 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-06-17 12:40:43 -07:00
Mark Otto
3add79c071 #3864: use @baseLineHeight in alerts.less 2012-06-17 12:40:36 -07:00
Ross Laird
626b45d691 Corrected spelling error 2012-06-15 13:07:44 -07:00
François Robichet
fb31cdba9c Remove useless ms prefixes 2012-06-15 15:23:40 +03:00
Mark Otto
b1cb556503 improve inline-block of append/prepend inputs with font-size: 0; 2012-06-14 11:56:46 -07:00
alienlebarge
7b726f974f fix responsive height of image 2012-06-14 14:53:04 +02:00
Marcus Schwab
97cbefa72f Merge remote-tracking branch 'upstream/2.1.0-wip' into 2.1.0-wip 2012-06-11 02:04:14 -07:00
Marcus Schwab
bd19b42c15 Proper spacing between offsets
row-fluids don't have the same negative margin-left as rows. This was
throwing everything off.
So added a different rule for first-child and subsequent "spans".
2012-06-11 01:51:19 -07:00
Mark Otto
f2e39233f5 rewrite alerts and progress bars sections 2012-06-10 15:12:02 -07:00
Marcus Schwab
c3f5d7c62d ajgon's fluid offsets working with first-child 2012-06-07 17:23:22 -07:00
Igor Rzegocki
f8d68002dc Added offsets for .row-fluid 2012-06-07 17:23:22 -07:00
Mark Otto
eef87c96af #3684: reset width to auto for input type='image' 2012-06-04 20:27:42 -07:00
Mark Otto
8df906e641 Merge branch 'wachunga-2.0.4-wip' into 2.1.0-wip 2012-06-04 08:47:48 -07:00
Mark Otto
9cceb0bba7 Merge branch '2.0.4-wip' of https://github.com/wachunga/bootstrap into wachunga-2.0.4-wip 2012-06-04 08:47:41 -07:00
Mark Otto
5563b8448e fix #3693: rounded corners on search form 2012-06-04 08:45:51 -07:00
Mark Otto
eb3a4b8f75 fix placeholder for FF by attaching input and textarea when we call the mixin 2012-06-04 08:33:42 -07:00
Mark Otto
ad9bfeef7a fix cut off icons 2012-06-02 22:34:20 -07:00
Jacob Thornton
5e5965ca6f Merge branch 'accessibility' into 2.1.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
	docs/javascript.html
	docs/templates/pages/javascript.mustache
2012-06-02 16:11:35 -07:00
Jacob Thornton
ebc6935663 2.0.3 -> 2.0.4 2012-06-01 11:04:27 -07:00
Mark Otto
7875e4833c fix broken css tests, add fluid input-prepend/-append to tests, fix input-prepend/append for responsive for both fluid and fixed sizing 2012-05-28 17:32:24 -07:00
Mark Otto
6fc5674466 Merge branch 'raymccoy-no-filters' into 2.0.4-wip 2012-05-28 17:17:36 -07:00
Mark Otto
9699e1d707 scope float right dropdown menus to immediate children 2012-05-28 01:13:24 -07:00
Corey Innis
8a06339501 fixes .placeholder to work as a "grouped selector"
adding the `&` combinator to `.placeholder` makes it work for the global case (in forms.less) as well as within `.navbar-search .search-query`

the result can be seen in the generated bootstrap.css, which include the -ms vendor extension.
2012-05-27 18:12:08 -07:00
Mark Otto
a7529e158b remove color from labels 2012-05-25 09:19:10 -07:00
Mark Otto
fe30bd6055 make bootstrap like google maps a bit more 2012-05-24 20:18:52 -07:00
Mark Otto
72e3b3beb3 Merge branch 'ademaro-patch-1' into 2.0.4-wip 2012-05-24 19:17:49 -07:00
Ademaro
34e5bc5f1d ie support placeholder color (http://msdn.microsoft.com/en-us/library/ie/hh772745(v=vs.85).aspx) 2012-05-24 13:57:02 +04:00
Mark Otto
5d27fbb32d Merge branch 'pvorb-patch-1' into 2.0.4-wip 2012-05-23 00:05:13 -07:00
Mark Otto
3b6b6eb242 fix field state mixin 2012-05-23 00:04:54 -07:00
Tomás Arribas
642f75141d Do not use filters in fade animations 2012-05-21 02:56:57 +02:00
Paul Vorbach
faf2866f96 Remove re-declaration of font-fam, font-size, and line-height in p 2012-05-20 11:54:21 +03:00
Mark Otto
78790da03c fix resizing issues from incorrectly changing <767px grid classes to inline-block, fix height issue on textareas 2012-05-17 22:00:49 -07:00
Jacob Thornton
9889948f58 abandon activedescendant because it was awful 2012-05-17 00:39:14 -07:00
Jacob Thornton
a7b49a7d92 nearly everything working with activedescendant... then decide it's wrong. 2012-05-17 00:23:11 -07:00
Mark Otto
e009ed23fc move navbar and update paths so it sits in tests 2012-05-15 09:45:53 -07:00
Mark Otto
6be09df1bf Merge branch '2.0.4-wip-forms' of github.com:twitter/bootstrap into 2.0.4-wip-forms 2012-05-15 09:07:31 -07:00
Mark Otto
a9d4b667ff finish fixing uneditable-input and remake 2012-05-15 09:07:19 -07:00
Mark Otto
532569fe59 updated forms to rearrange focus state, reinstate uneditable-input, and a few other cleanup tidbits 2012-05-15 09:04:44 -07:00
Mark Otto
ecf84bdac5 correct regressions against 2.0.3 2012-05-15 00:17:02 -07:00
Mark Otto
87f6e426b3 three columns 2012-05-14 23:50:34 -07:00
Mark Otto
c8cafa5d5a move forms test to less/tests 2012-05-14 23:45:25 -07:00
Mark Otto
e28efd7da0 consolidate and relabel new form selectors 2012-05-14 23:42:32 -07:00
Mark Otto
a0809ceebe add forms test page for all html5 input types and refactor selectors 2012-05-14 23:40:06 -07:00
Mark Otto
826a8714e2 #3257: share .navbar-fixed-top styles with .navbar-fixed-bottom 2012-05-13 22:11:35 -07:00
Mark Otto
ea15660973 #3420: properly scope dropdown open state to immediate children only 2012-05-13 21:52:18 -07:00
Mark Otto
a2fb9ed42f #3449: make legend and form-actions the same border color 2012-05-13 17:43:04 -07:00
Mark Otto
c02c3c60c9 Merge branch 'aziz-patch-7' into 2.0.4-wip 2012-05-13 14:42:12 -07:00
Mark Otto
8f44245850 document .hyphens() mixin 2012-05-13 14:31:31 -07:00
Mark Otto
23401e811f Merge branch 'Synchro-hyphenation' into 2.0.4-wip 2012-05-13 14:29:08 -07:00
Mark Otto
1a8561d084 Merge branch 'hyphenation' of https://github.com/Synchro/bootstrap into Synchro-hyphenation 2012-05-13 14:28:32 -07:00
Mark Otto
6f61c96f02 Merge branch '2.0.4-wip' of github.com:twitter/bootstrap into 2.0.4-wip 2012-05-13 13:59:26 -07:00
Mark Otto
3a21891824 #3469: add variables for dropdown menu dividers 2012-05-13 13:58:42 -07:00
Milos Gavrilovic
20eae67147 Update .placeholder() mixin call
In less/mixins.less this mixin is being created with @placeholderText
color as default, which is actually set as @placeholderText: @grayLight
in less/variables.less so it's redundant to make call like this:

.placeholder(@grayLight);
2012-05-10 12:25:22 +03:00
David Hirtle
452d8c1df0 Gradient mixins blow up in IE7/8 if you happen to use rgba() colors as params 2012-05-04 13:50:16 -07:00
Synchro
ca369c4b2a Add Opera prefix 2012-05-01 17:54:53 +02:00
Synchro
dcc89e7400 Coding style 2012-05-01 17:06:19 +02:00
Synchro
5ffb6d6706 Add .hyphens mixin 2012-05-01 17:01:26 +02:00
Mark Otto
59ec4c7154 make responsive input fields not wrap for fluid input prepend/append by setting block back to inline-block (oversight of 2.0.3) 2012-04-30 15:40:49 -07:00
Mark Otto
ad46b0980c expand input css tests to fixed width grid 2012-04-30 15:06:26 -07:00
Allen Bargi
ab178060be let's reuse color variables, instead of hardcoding colors. 2012-04-26 17:38:47 +03:00
Allen Bargi
99c3b7810b No need to specify units when a value is 0, thanks to RECESS 2012-04-25 18:16:59 +03:00
Giuliano Velli
4fbb400754 Added Medias code and documentation
Fix for Issue #1711

Added media.less and edited bootstrap.less and responsive.less to
manage media components.

Added a section to the documentation (Media, in components.html) outlining how Medias work. Edited bootstrap.css and bootstrap-responsive.css to add the code for the demos

Signed-off-by: Giuliano Velli <wpbrains@giusi.org>
2012-04-24 17:19:17 +02:00
Mark Otto
66ac6e14db heading 2012-04-24 06:53:48 -07:00
Mark Otto
7b282798a3 officially drop support for offset on thumbnails since it breaks BC 2012-04-24 06:52:57 -07:00
Mark Otto
5be84ad0b7 restore margins on thumbnails, add comments about it's changes and how responsive affects it 2012-04-24 06:45:21 -07:00