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

2929 Commits

Author SHA1 Message Date
Mark Otto
aa25ce779d Fixes #14329: Fixed list-groups nested inside of collapsing panels, from @apexskier 2014-08-27 23:17:37 -07:00
Mark Otto
0a816e009f Fixes #14337: Round .jumbotron corners within .container and .container-fluid 2014-08-27 23:01:58 -07:00
Mark Otto
190452a36d typo 2014-08-27 22:40:46 -07:00
Mark Otto
f4eefd28d1 Merge branch 'master' into sr_friendly_hidden_content
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
2014-08-27 22:38:46 -07:00
Mark Otto
d14d60e04c Merge pull request #14452 from vsn4ik/update_print_less
Update print.less from source (html5-boilerplate).
2014-08-27 22:30:53 -07:00
Jaume Alemany
3ce160754c Make popover-arrow-color default to popover-bg 2014-08-27 14:20:49 +02:00
vsn4ik
a03d269287 Less: Remove empty lines and blanks. 2014-08-26 02:24:09 +04:00
vsn4ik
4c15fa8642 Update print.less from source (html5-boilerplate). Simplyfy table style. 2014-08-26 02:04:34 +04:00
Mark Otto
a9cd2ce4c9 Merge branch 'master' of github.com:twbs/bootstrap 2014-08-23 13:44:41 -07:00
Mark Otto
56bb92ac4f Fixes #14386: Reset font, text, and line-height properties in popovers 2014-08-23 13:42:45 -07:00
Mark Otto
7e8f10fd1a Merge pull request #14408 from vsn4ik/dropdown_menu_disabled_style
Refactor dropdown.less. Optimize ".dropdown-menu > .disabled" selector.
2014-08-23 13:39:10 -07:00
Mark Otto
9a39ee90b4 Fixes #13943 again: lighten links, and text, in navbar. Still not 100% compliant, but it's better. 2014-08-23 13:26:37 -07:00
Mark Otto
dfa2759a52 Fixes #14348: Add visibility styles to collapse and tab content to match .hidden 2014-08-23 12:25:27 -07:00
Mark Otto
f265137c05 Fixes #14440: Remove unused nav variable 2014-08-23 12:21:17 -07:00
vsn4ik
8d7700b2b6 Use single .dropdown-menu 2014-08-16 19:20:13 +04:00
Mark Otto
6c87895eec fixes #14310: reset .active as well for button links 2014-08-04 10:01:20 -07:00
Heinrich Fenkart
b10b373c60 Follow-up to #13074: use spec syntax instead of deprecated mixins 2014-08-04 06:19:42 +02:00
Mark Otto
6424acf69a Fixes #14234: Reset the hack IE8-10 with another hack just for IE11 for temporal inputs and line-height 2014-08-02 21:16:32 -07:00
Mark Otto
9d0872b748 Fixes #14251: Remove the -webkit-overflow-scrolling to prevent Safari from screwing up widths 2014-08-02 19:05:46 -07:00
Mark Otto
c7970106a2 Merge pull request #13074 from haydenbleasel/master
WebKit CSS3 carousel transforms for supported devices
2014-08-02 18:40:21 -07:00
Mark Otto
b9e6848dc8 Fixes #14253: Add borders for tables that follow bodies in panels 2014-08-02 13:55:02 -07:00
Mark Otto
feed9aed5b Fixes #13202: Always use overflow: auto; on .table-responsive to prevent content breaking out of containers 2014-08-02 13:05:11 -07:00
Mark Otto
98d693ba7b Fixes #14142: Adding horizontal padding to captions in tables in panels. 2014-07-23 21:03:46 -07:00
Mark Otto
078aafe7fd Fixes #14221: Make .form-control-static work in inline forms as well 2014-07-23 20:54:07 -07:00
Mark Otto
6dde491ddf Fixes #14168: bold nested kbd elements 2014-07-23 20:49:47 -07:00
Mark Otto
5713bd74d6 Fixes #12669 again: Redeclare the line-heights again for date inputs in IE8+ 2014-07-23 20:32:05 -07:00
XhmikosR
7ba5c5d5e4 Update grunt-csscomb. 2014-07-22 08:25:35 +03:00
wangsai
45acf4e040 Tabs to spaces 2014-07-17 20:13:16 +08:00
Mark Otto
8c586a8e3e Fixes #14074: Make open dropdown nav links in navbar use gradients 2014-07-12 17:59:02 -07:00
Mark Otto
fe0ef38898 Fixes #14095: Add basic styling for captions, which we've for some reason been missing all this time. 2014-07-12 15:55:15 -07:00
Mark Otto
05ba466f6c Merge pull request #14104 from KyleMit/add-pointer-events
Add Pointer Events
2014-07-12 15:43:49 -07:00
Mark Otto
3e8cddf867 Fixes #13974, #14123: Remove translate3d repaint performance enhancement for text rendering and position wonkiness 2014-07-12 15:22:41 -07:00
Mark Otto
bd292ca3b8 Fixes #14107: Lighten placeholder text 2014-07-12 15:13:18 -07:00
Kyle
c298fb1a88 Add Pointer Events 2014-07-09 19:21:45 -04:00
Mark Otto
c769d7c21f Part 1 for fixing #13996: Revert the width: 100% \9; IE hack for SVG img-responsive 2014-07-07 16:59:59 -07:00
Hayden Bleasel
30d1236a1d CSS3 Carousel code formatting 2014-07-08 09:49:08 +10:00
Mark Otto
9ed9eb97ee Follow up to #13907: Add .focus styles for buttons 2014-07-07 00:56:06 -07:00
Mark Otto
6f88238a6b Merge pull request #14051 from loic/issue13325
Address margins on .navbar-right to fix #13325 #13464.
2014-07-07 00:39:06 -07:00
Heinrich Fenkart
dc22226b95 Fix small typo introduced in e2029e1 2014-07-07 09:23:12 +02:00
Mark Otto
117ca8167a Merge branch 'master' of github.com:twbs/bootstrap 2014-07-06 23:45:36 -07:00
Mark Otto
225819ae66 Merge pull request #14029 from BBosman/touch-action
Add touch-action: manipulate to .btn
2014-07-06 23:43:43 -07:00
Loic Bistuer
e88fa90991 Address margins on .navbar-right to fix #13325 #13464.
This commit follows f9fde56.
2014-07-07 12:56:52 +07:00
Hayden Bleasel
d6d8e204e6 Added Firefox support for CSS3 carousel transition 2014-07-07 12:20:06 +10:00
Mark Otto
8e2348e9ed Fixes #13746: Add docs section for brand image 2014-07-06 18:39:37 -07:00
Mark Otto
9be2bbb5ef Fixes #14053: Don't show radio/checkbox in justified button groups 2014-07-06 16:48:41 -07:00
Mark Otto
e2029e122c Fixes #13997: Move min-height for radio/checkbox to their inner label 2014-07-06 15:09:20 -07:00
Mark Otto
b4b82e815c Merge pull request #13920 from AndreiRailean/patch-1
assign background to row of .table-striped
2014-07-05 20:16:10 -07:00
Mark Otto
b5205bf848 Merge pull request #13923 from ilikeprograms/gray-base-variable
Added @gray-base variable to make @gray-{shade} reference, also allows @...
2014-07-05 20:04:47 -07:00
Mark Otto
9677c95d83 Fixes #13967: Don't reset the cite element's font-style 2014-07-05 20:02:02 -07:00
Mark Otto
f22e7d857a Fixes #13953: Remove the progress bar min-width styles for low percentages to avoid jumping progress 2014-07-05 20:01:18 -07:00
Mark Otto
0378a6be2a Fixes #13943: Lighten the navbar inverse link color more since our text contrast change in v3.2.0 2014-07-05 19:59:50 -07:00
Mark Otto
f9fde567be Merge pull request #13464 from nickcolley/#13325-navbar-right-first
Changed last-child to first-child to fix #13325
2014-07-05 18:51:47 -07:00
Bas Bosman
4975978083 Remove superfluous cursor:pointer 2014-07-03 13:17:14 +02:00
Bas Bosman
47521fd7d0 Add touch-action: manipulate to buttons 2014-07-03 12:53:23 +02:00
Mark Otto
3537481c97 Fixes #12738 again: use max-device-width instead of max-width for .navbar-collapse height in landscape devices 2014-07-03 00:55:32 -07:00
Mark Otto
fcf9470a20 typo 2014-07-02 23:35:37 -07:00
Mark Otto
96b545c6b5 Fixes #13989: Don't extend the input sizes; manually chain the selectors 2014-07-02 23:14:23 -07:00
Mark Otto
b4958aba69 merge in and resolve conflicts 2014-07-02 22:54:56 -07:00
Boris Serdyuk
77c1a528ab place feedback icon lower, only if it really need 2014-07-01 20:23:22 +04:00
Thierry Goettelmann
165c7889bd Change cursor from "default" to "not-allowed" if disabled 2014-06-26 16:31:37 +02:00
Thierry Goettelmann
76ca3677f5 Remove "pointer" cursor on disabled list-group-item 2014-06-26 15:50:20 +02:00
Mark Otto
4045740c54 Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-06-25 16:57:22 -07:00
Mark Otto
e40df7cfac fixes #13912: make radios/checkboxes work with inline forms again 2014-06-25 16:56:36 -07:00
Thomas Coleman
fdacff2297 Fixed @gray-base value being once space short 2014-06-25 16:09:57 +01:00
Thomas Coleman
41f27fd813 Added @gray-base variable to make @gray-{shade} reference, also allows @gray-base to be modified with less#modifyVars and the vars to cascade 2014-06-25 15:00:41 +01:00
Andrei Railean
ac67bc857f removing redundant background declarations on TDs 2014-06-25 15:16:25 +10:00
Andrei Railean
71974e2f4d assign background to row of .table-striped
if background is not set on row, striping doesn't work properly in responsive tables where row and cells are set to  display: block.
2014-06-25 14:01:34 +10:00
Gleb Mazovetskiy
8ad583063b Move variable declaration before its use for Sass
In Sass, variable must be declared before it is used.
This also removes Miscellaneous section, because horizontal line color
and form / list paddings are Typography.
2014-06-24 18:30:24 +02:00
Heinrich Fenkart
e9ac7c1e1c Partly revert cb7eb674ac
Fixes #13911
2014-06-24 17:08:16 +02:00
Mark Otto
b8a04f8c60 Merge pull request #13882 from thomaswelton/issue-13713-use-variable-small
Use @font-size-small variable to calculate <small> font-size
2014-06-23 12:59:46 -07:00
Mark Otto
df7cfe8652 Fixes #13903: Restore side padding on .btn-block 2014-06-23 10:38:45 -07:00
Thomas Welton
09cf618acf Use @font-size-small variable to calculate <small> font-size fixes #13713 #13809 2014-06-23 18:00:18 +01:00
Mark Otto
e98fc373e3 Fixes #13872 more: add overrides for lg and sm input modifiers 2014-06-20 13:24:14 -07:00
Mark Otto
1e53dcd137 Fixes #13872: Always apply padding to .form-control-static for that vertical alignment 2014-06-19 18:33:41 -07:00
Mark Otto
8bd4163ad4 fixes #13881: restore existing striped progress bar behavior with theme styles 2014-06-19 18:14:56 -07:00
Mark Otto
a4fa8d07c8 grunt dist 2014-06-19 15:24:24 -07:00
Bas Bosman
ae793ad749 Use full deprecation version 2014-06-19 11:09:35 +02:00
Mark Otto
a012ba465d lol words 2014-06-18 23:21:44 -07:00
Mark Otto
99f176e7ec rewrite striped and active to deprecate the parent selectors, change the docs 2014-06-18 22:35:05 -07:00
Mark Otto
d4eb5552b3 Merge branch 'master' into new_striped_progress_bar_class 2014-06-18 22:29:37 -07:00
Mark Otto
53d68a099d Merge pull request #13859 from twbs/skew_you
Change skew(x,y) to skewX skewY
2014-06-18 22:27:12 -07:00
Mark Otto
2a380f6bd8 fixes #13347: make striped progress bars its own class 2014-06-18 21:58:29 -07:00
Mark Otto
c7cd63107b fixes #13346: add a variable for .dl-horizontal's offset 2014-06-18 21:52:34 -07:00
Mark Otto
783b2268c2 change skew(x,y) to skewX skewY because mdn told me so 2014-06-18 21:26:53 -07:00
Mark Otto
f4dd02f531 Merge pull request #13857 from twbs/list_group_small
List group headings and small/.small
2014-06-18 19:50:53 -07:00
Mark Otto
80ffe45afe Merge pull request #13851 from ahoereth/patch-1
Add white-space: nowrap; to .dropdown-header
2014-06-18 19:49:44 -07:00
Mark Otto
43d21b97f2 fixes #13093: reset the background color and remove background image on disabled theme buttons 2014-06-18 19:14:26 -07:00
Mark Otto
20b6ae6357 fixes #13020: proper color for small/.small in list group headings 2014-06-18 18:47:32 -07:00
Mark Otto
74a264fb98 fixes #13021: add .form-group-sm/-lg 2014-06-18 18:19:17 -07:00
Mark Otto
46e8a5817d fixes #10073: add width: 100%; for ie10 and below to size svg.img-responsive correctly 2014-06-18 17:34:09 -07:00
Ross Allen
8c403dc1dc Darken @gray-light to meet accessibility guidelines
`@gray-light` darkens from #999 to #777, which puts `.text-muted` at the
threshold for the 4.5:1 WCAG minimum contrast[1]. #777:#fff is 4.48:1.

The “Example” headers in docs become #959595, which is contrast ratio
3:1, the minimum for larger text. Since the headers are less important
than the surrounding text, 3:1 is fine and an improvement on the
previous #bbb:#fff (1.92:1).

Fixes issue #13847.

[1] http://www.w3.org/TR/UNDERSTANDING-WCAG20/visual-audio-contrast-contrast.html
2014-06-18 14:47:14 -07:00
ahoereth
de55fb85a0 Add white-space: nowrap; to .dropdown-header
Dropdowns adjust their width to the width of their containing a elements - which have no line breaks ([*](f226463b05)). Consistent to this dropdown-headers also should be prevent to contain line breaks.
2014-06-18 19:07:55 +02:00
Bas Bosman
128e52ff29 Fix dismissible spelling 2014-06-18 00:00:28 +02:00
Chris Rebert
37acbb983d min-content is standard, so no need to vendor prefix it
Also, makes little sense to say that Firefox sets a `-webkit`-prefixed value
2014-06-13 11:37:40 -07:00
Mark Otto
ed2da1c354 Merge pull request #13351 from Cecchi/nested-kbd
Add nested kbd element styles for actual keys or inputs
2014-06-10 23:09:25 -07:00
Mark Otto
1d97cbed0f Merge pull request #13671 from 04818419/text-transformation
text transformation added
2014-06-10 22:56:38 -07:00
Mark Otto
4fd4681221 Merge pull request #13687 from smmoosavi/patch-1
Color Contrast for panel heading
2014-06-10 22:49:23 -07:00
Mark Otto
dcbe484a09 New text align class, .text-nowrap, for preventing text from breaking to new lines. Applies it to the grid docs table. 2014-06-10 21:20:34 -07:00
Mark Otto
631e04b6fc Fixes #13548: Use position: absolute; to fix checkbox and radio line-height problems that were introduced after #13003 2014-06-10 20:50:58 -07:00
Mark Otto
fd0a81a57a hidden and auto 2014-06-10 19:20:56 -07:00
fat
54939ef0f0 fixes 13609 - Modal is shifting left just before the hiding animation 2014-06-10 19:06:24 -07:00
Bas Bosman
c6c8093085 Fix gutter variable 2014-06-10 16:46:04 +02:00
Mark Otto
3556f9e3ad Merge branch 'master' of github.com:twbs/bootstrap 2014-06-10 00:25:52 -07:00
Mark Otto
e06970948b Fixes #13616: Add custom gutter support to containers 2014-06-10 00:24:23 -07:00
Mark Otto
070862667a Merge pull request #13670 from nadangergeo/master
Table-responsive: changed overflow-x to auto to hide scrollbar when it's not overflown, fixes #13669.
2014-06-10 00:14:33 -07:00
Mark Otto
8d9ef8f0a1 Addresses part of #13643: Correct webkit-linear-gradient syntax in horizontal gradients 2014-06-08 23:02:16 -07:00
Mark Otto
85cde774b9 remove max-width: 100%; from table and place it on .table 2014-06-08 16:54:05 -07:00
Mark Otto
aee18bcc4a Merge pull request #13707 from bcullman/bcullman-remove-table-max-width
removing unnecessary max-width on tables
2014-06-08 16:53:14 -07:00
Mark Otto
4e67dc8109 Merge pull request #13738 from thomaswelton/issue-13737-fix-ie11-rem-sizing
Use px for font-size fixes #13737
2014-06-08 16:38:17 -07:00
Mark Otto
5dbfdd47c5 fixes #13375 2014-06-08 14:08:06 -07:00
Mark Otto
d1872b4c98 Merge branch 'master' into pr/13736
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
2014-06-08 13:57:44 -07:00
Mark Otto
14c3760033 Merge pull request #13735 from skhilko/master
Fix bug where a panel recieve extra top border when placed within a collapsible panel
2014-06-08 13:53:53 -07:00
Mark Otto
34891de173 grunt 2014-06-08 11:19:35 -07:00
Mark Otto
3ee5542c99 Merge pull request #13649 from ItsJonQ/repaint-fixes-2
Repaint Fixes When Scrolling
2014-06-08 11:14:57 -07:00
Chris Rebert
739bf379a9 set not-allowed cursor on disabled radio+checkbox labels; fixes #13281
[skip validator] [skip sauce]
2014-06-06 17:23:28 -07:00
Thomas Welton
ea99e3c91b Use px for font-size fixes #13737 2014-06-05 12:07:40 +01:00
Ben Zumhagen
5872a7e0ac Resolves Issue #13689
Doing this the right way this time. Hiding .panel-footer top border when
preceeded by a .list-group. This should resolve the "double border"
issue.
2014-06-04 22:18:40 -04:00
Siarhei Khilko
f87a023153 Fix bug where a panel recieve extra top border
https://github.com/twbs/bootstrap/issues/13734

A panel placed inside of a collapsible panel recieve extra top border.

This commit reduces the effect of a selector to apply a border only to
the collapsible panel body itself, not to any panel placed within it.
2014-06-04 15:20:36 -07:00
bcullman
445deb7e2d removing unnecessary max-width on tables 2014-05-29 13:13:03 -07:00
سید مرتضی موسوی
67a332c97b fix variables in panels.less 2014-05-27 17:09:47 +04:30
سید مرتضی موسوی
6e4825aef1 Color Contrast for panel heading
related to #13686
2014-05-27 15:31:13 +04:30
Konstantin Kulinicenko
585f4787f7 text transformation added
Transform text in components with text capitalization classes.
2014-05-24 15:33:15 +02:00
Nadan Gergeo
36616db81d Table-responsive: changed overflow-x to auto to hide scrollbar when it's not overflown, fixes #13669. 2014-05-24 05:50:45 +02:00
Mark Otto
d66b65ddde Merge branch 'master' into icon_paths
Conflicts:
	dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.css.map
2014-05-22 23:01:42 -07:00
Mark Otto
10e9fef85c Merge pull request #13651 from twbs/ios-temporal
update explanatory comment about iOS date/time inputs bug
2014-05-22 21:48:56 -07:00
Mark Otto
fab9ab8fe9 Reset the padding on radio/checkbox labels in form-inline 2014-05-22 18:42:21 -07:00
Chris Rebert
3261ab704e update explanatory comment about iOS date/time inputs bug
Per:
* http://jsbin.com/purer/2/edit
* 6e8aa78384/README.md (ios-temporal-input-line-height)
Thanks @mdo <3

[skip sauce] [skip validator]
2014-05-21 16:50:23 -07:00
ItsJonQ
7da34cc0ec Applied translate3d to modal, navbar-fixed and affix to combat browser repaint 2014-05-21 17:24:43 -04:00
Mark Otto
91d51d3fba Merge branch 'master' into icon_paths 2014-05-20 23:21:12 -07:00
Chris Rebert
5f59f96020 Merge pull request #13600 from twbs/resize-note-correction
change note in .resizable() mixin for accuracy
2014-05-17 15:29:07 -07:00
Chris Rebert
f6bebbd83a reference other more recent source regarding the IE viewport bug 2014-05-14 17:08:53 -07:00
Chris Rebert
7287582cf2 more precise docs link 2014-05-14 16:41:40 -07:00
Chris Rebert
95683ddfca change note in .resizable() mixin for accuracy
Not a Safari bug. It's standards-compliant.

Quoting from http://www.w3.org/TR/css3-ui/#resize :
> ### 8.1. `resize` property
>
> * Applies to: elements with `overflow` other than `visible`
>
> The `resize` property applies to elements whose computed `overflow` value is something other than `visible`.

Original comment was added in commit 648c468927.
2014-05-14 15:33:41 -07:00
Mark Otto
c42cd8164c Merge branch 'master' into icon_paths
Conflicts:
	dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.css.map
2014-05-12 20:26:23 -07:00
Mark Otto
5938774296 Merge pull request #13369 from armikbd/bootstrap-itsme
Dropdown menu in justified button-group
2014-05-12 20:23:34 -07:00
Mark Otto
31956be6ef Merge branch 'master' into icon_paths
Conflicts:
	dist/css/bootstrap-rtl.css
	dist/css/bootstrap.css.map
	dist/js/bootstrap.min.js
	docs/dist/css/bootstrap.css.map
	docs/dist/js/bootstrap.min.js
2014-05-12 19:57:49 -07:00
Daniel
056a192f95 Squashed commit of the following:
commit 81324491f4913d6797c3c9e4df83a1aefd7d9116
Author: Daniel <dano.husar@gmail.com>
Date:   Sat May 10 17:37:29 2014 +0100

    use opacity mixin

commit 694b0a3fcd196e8cba9e4c23850f903c0804cb44
Author: Daniel Husar <dano.husar@gmail.com>
Date:   Fri May 9 13:47:35 2014 +0100

    Update button-groups.less
2014-05-10 17:39:34 +01:00
Mark Otto
510f4fe50a Fixes #13478, reverts #10941 2014-05-08 15:41:08 -07:00
Mark Otto
4c3ef52fc1 Merge branch 'pr/13320'
Conflicts:
	dist/css/bootstrap-rtl.min.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap-rtl.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-04-30 19:48:22 -07:00
Nick Colley
dd0b0cd664 Changed last-child to first-child
As noted by @jerem the first child will actually be the last shown
2014-04-30 01:08:24 +01:00
Sam Roth
3564369fdf Update type.less
For better readability on mobile devices
2014-04-27 15:40:25 -04:00
Nick Schonning
5ea66ba3b0 Minor Spacing fixes
Flagged upstream in bootstrap-sass by scss-lint
2014-04-26 15:24:25 -04:00
Hayden Bleasel
4fa2d9e0ca Improved mixin ability with nested media query 2014-04-23 20:36:49 +10:00
Chris Rebert
98acc69219 fix #13360 by making deprecation notices visible in customizer 2014-04-17 18:43:05 -07:00
Iqbal Kabir
132732e422 Dropdown menu in justified button-group
It seems that dropdown-menu in justified button-group appears at the far
left of the group. Check the problem in [Bootstrap
site](http://getbootstrap.com/components/#btn-groups-justified).
2014-04-17 13:21:09 +06:00
Cecchi MacNaughton
f18bff0a7c Add nested kbd element styles for actual keys or inputs 2014-04-15 14:12:39 -07:00
Chris Rebert
2127eb563f rm not particularly useful @zindex var comments 2014-04-15 11:01:51 -07:00
Sean Dwyer
06f6c9f006 Fix indent 2014-04-11 14:15:33 -07:00
Sean Dwyer
3777ef007d Fix form-control-feedback position when label has sr-only class 2014-04-10 17:43:53 -07:00
Mark Otto
1554b7cdd7 Merge pull request #13242 from killthekitten/fix-carousel-controls
Fix carousel-control margin asymmetry
2014-04-06 20:37:34 -07:00
Mark Otto
a444863268 Merge pull request #13217 from thedavidscherer/fix-13216
fixes #13216
2014-04-02 23:48:55 -07:00
Chris Rebert
f9e98a1422 re-deprecate @screen-xs-min per #12913
By definition, XS screens have no minimum size, only a maximum size.
(Symmetrically, LG screens have no maximum size, hence why there's no @screen-lg-max.)
2014-04-01 12:49:52 -07:00
Nikolay Shebanov
dffbf8ff78 Fix carousel control margin asymmetry 2014-03-31 12:46:29 +04:00
David Scherer
7dec5c79c8 fixes #13216
change `@zindex-popover` and `@zindex-tooltip` values to be greater than
those set for `@zindex-modal` allowing tooltips and popovers to be
displayed in front of modals (and all other content).
2014-03-28 14:56:12 -04:00
XhmikosR
8d3e987420 Merge pull request #13194 from twbs/normalize.css-3.0.1
Update normalize.css to v3.0.1
2014-03-28 07:18:10 +02:00
Дмитро Будник
015569a138 fix doc typo
one can find correct name of variable just few lines below the typo
2014-03-27 11:54:39 +02:00
XhmikosR
0c775f84ee Update normalize.css to v3.0.1 2014-03-27 08:00:20 +02:00
Mark Otto
acf5707323 Fixes #13066: Add z-index to the form control feedback icons so input groups don't render on top of them 2014-03-24 20:07:54 -07:00
Mark Otto
b4f4c7b16f Fixes #13037: add text-align: left; to prevent alignment change in dropdowns 2014-03-24 20:02:56 -07:00
Mark Otto
09a7770919 Merge pull request #13013 from ogonkov/patch-1
Support for hovering on cell's with some state
2014-03-24 19:57:55 -07:00
Chris Rebert
06451a58d0 expand issue # ref to full URL 2014-03-24 19:48:21 -07:00
Mark Otto
6f6bce5944 Fixes #13141: Add a max-width: 100%; to label elements so IE8 wraps text 2014-03-24 19:26:41 -07:00
Mark Otto
21084192b6 Fixes #13079: Scope .open class in button variant mixin to immediate children 2014-03-24 19:08:05 -07:00
Rob Fletcher
1be0b57d34 Fix vertical alignment of temporal inputs on iOS
Fixes #13098
Closes #13099
2014-03-20 01:13:21 -07:00
fat
615dcb5ca0 fixes #9855 2014-03-16 18:38:47 -07:00
Hayden Bleasel
bab63abee8 Removed unnecessary percentage sign for 3D translation 2014-03-16 17:07:55 +11:00
Hayden Bleasel
8ab6746cbe Utilised mixins rather than specific WebKit properties 2014-03-15 18:30:09 +11:00
Hayden Bleasel
da044d9c69 WebKit CSS3 carousel transforms for supported devices 2014-03-15 17:56:24 +11:00
Alexey
7ea9538def Support for hovering on cell's with state
If parent row are hovered, child cell with state should react to this.
2014-03-11 12:32:46 +03:00
Mark Otto
5f2845f307 remove comment 2014-03-10 16:43:57 -07:00
Mark Otto
74c391b9ad Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	dist/css/bootstrap.css.map
	docs/assets/js/customize.min.js
	docs/dist/css/bootstrap.css.map
2014-03-10 16:43:01 -07:00
Mark Otto
a83ca38713 Fixes #13003: Move padding on radio and checkbox options from the surrounding div to the label to remove the no-click deadzone caused by negative margin 2014-03-10 16:41:56 -07:00
Mark Otto
3fb5d0bbac Merge branch 'master' into modular-the-mixins 2014-03-10 13:21:56 -07:00
Julian Thilo
6234ba561a Merge pull request #13002 from ZDroid/hash
Add missing customizer comment
2014-03-10 11:08:56 +01:00
Zlatan Vasović
1a417357ad Add missing customizer comment 2014-03-10 08:35:50 +01:00
Mark Otto
0b7b374691 words 2014-03-10 00:10:07 -07:00
Mark Otto
a36643dd33 Merge branch 'master' into modular-the-mixins
Conflicts:
	dist/css/bootstrap.css.map
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap.css.map
2014-03-10 00:08:29 -07:00
Mark Otto
3a2d6e4050 Formatting, comment consolidation, and line endings 2014-03-10 00:05:57 -07:00
Mark Otto
1848b0f249 Merge branch 'master' of github.com:twbs/bootstrap 2014-03-09 23:57:31 -07:00
Zlatan Vasović
d50a89bea9 Use outline: 0 consistently 2014-03-10 07:55:29 +01:00
mrmrs
38d0908aff Add recompiled assets after nuking toc in mixins.less. 2014-03-09 23:51:38 -07:00
mrmrs
b0bc9ef815 Add consistent newline at end of files in less/mixins 2014-03-09 23:44:11 -07:00
mrmrs
2f380a9683 Merge branch 'master' into modular-the-mixins
* master:
  Replace some images on the Carousel example with some base64 encoded 1x1 gifs
  ugh grunt
  moar grunt
  mo copy
  http://www.youtube.com/watch?v=AJWtLf4-WWs
  grunt
  Copy change
  fix grammar in comment in forms.less
  Fixes #12759
  Fixes #12738
  replace .visible-{size} with .visible-{size}-{display} ; fixes #8869

Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map
	less/mixins.less
2014-03-09 23:28:08 -07:00
Mark Otto
3640d71ad7 proper var 2014-03-09 23:25:15 -07:00
mrmrs
348b7de7f7 Break mixins.less up into smaller modules.
Move all deprecated vendor prefix mixins to less/mixins/vendor-prefixes.less
Create mixins directory and move partials to that directory.

FIXES #12994
2014-03-09 23:18:48 -07:00
Mark Otto
ccb17f110d Merge branch 'master' into fix-8869 2014-03-09 22:01:38 -07:00
Chris Rebert
b1f71e5292 fix grammar in comment in forms.less 2014-03-09 21:35:48 -07:00
Mark Otto
a15c24410b Fixes #12759
Ensures proper sizing and alignment of input groups within inline and
navbar forms.

* Uses `inline-table` on the input group
* Nukes the widths to `width: auto`—without this, the parent input
group doesn’t size correctly and functions as `display: table;` or
`block`
2014-03-09 21:25:51 -07:00
Mark Otto
b4d66b7f6b Fixes #12738
* Removes default max-height from .navbar-collapse (so not every navbar
will get a max-height collapse section)
* Scopes regular 340px max-height to fixed top and bottom navbars only
(those are the only ones that really need a max-height to enable
scrolling)
* Adds a landscape media query for phones to cap the max-height at
200px for fixed navbars"
2014-03-09 20:45:32 -07:00
Mark Otto
1a5fb4ef24 Fixes #12843: Scope label styles for horizontal forms to a media query so their narrow viewport display looks just like a normal form 2014-03-09 17:22:52 -07:00
Mark Otto
2f955907f9 Fixes #12669: Properly reset line-height on date inputs for all sizes; Fix IE8+'s misaslignment of text within date inputs 2014-03-09 17:12:39 -07:00
Mark Otto
b69e4d636a Reorganize mixins and G R U N T 2014-03-09 16:50:30 -07:00
mrmrs
71e9902d9a Adjusts some section titles to be more explicit.
FIXES #12992
2014-03-09 16:25:27 -07:00
mrmrs
aedee95dbf Adds basic table of contents for mixins.less. You know for the kids. 2014-03-09 16:13:37 -07:00
Mark Otto
ef5d8e98e2 Merge branch 'master' into sr-only-focusable
Conflicts:
	dist/css/bootstrap.css
2014-03-08 20:34:29 -08:00
Mark Otto
7c3881086f Fix comment 2014-03-08 17:11:48 -08:00
Mark Otto
7c9a58f3d9 Merge pull request #12976 from ZDroid/comment
Update .hide-text() comment
2014-03-08 15:36:07 -08:00
Mark Otto
03701b8d4b Fixes #12966: Ensure icon font vars are loaded into Customizer 2014-03-08 15:32:24 -08:00
Zlatan Vasović
4b53ea30b4 Update .hide-text() comment 2014-03-08 10:49:48 +01:00
Zlatan Vasović
0f3b176a76 Improve badges mixinability 2014-03-07 18:54:53 +01:00
Mark Otto
0b06d5969b Merge pull request #12957 from BBosman/rename-mixin
Fix transition-timing-function mixin
2014-03-07 01:15:33 -08:00
mrmrs
d1d5d90413 Fixes #12748 2014-03-07 00:59:22 -08:00
Bas Bosman
55b639e928 Rename properties 2014-03-07 09:50:05 +01:00
Mark Otto
c03b8f1f0f Merge branch 'master' into pr/12670 2014-03-07 00:23:52 -08:00
Mark Otto
ad61c27885 Merge branch 'master' of github.com:twbs/bootstrap 2014-03-07 00:21:59 -08:00
Mark Otto
164b41b28d Fixes #12937: Darken active button states just a smidge more 2014-03-07 00:19:26 -08:00
Bas Bosman
cb7eb674ac Add autoprefixer 2014-03-07 09:01:54 +01:00
Mark Otto
901f358d16 Merge pull request #12739 from DaSchTour/twbs
add posibillity to hover links and not background in list-groups
2014-03-06 23:58:04 -08:00
Mark Otto
e180258b60 Comment for #12794 2014-03-06 23:51:07 -08:00
Mark Otto
f5f4a2da78 Merge pull request #12794 from epidemian/required-radio-button-groups
Fix UAs required message position on grouped radio buttons
2014-03-06 23:45:28 -08:00
Mark Otto
705ff7f227 Moving the embed to it's own CSS file, moving the docs to the Components page with an example, fixing a Glyhpicons list problem in the docs 2014-03-06 23:18:13 -08:00
Mark Otto
12c619f5b9 Merge branch 'master' into boulox-responsive-embed
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/css.html
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-03-06 22:40:25 -08:00
Mark Otto
7e299c6a49 Fixes #12683: Remove the overflow: hidden; from the .panel-group > .panel because it apparently serves no purpose and cuts off nested dropdown menus. 2014-03-06 22:32:21 -08:00
Mark Otto
df3eb66ede Merge branch 'master' into popovers-use-radii-var
Conflicts:
	dist/css/bootstrap.css.map
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap.css.map
2014-03-06 21:44:46 -08:00
Mark Otto
0c9308a3b2 Rewrite the disabled list group items to simplify styles 2014-03-06 21:40:22 -08:00
Mark Otto
c8614c0f15 Merge branch 'master' into pr/12490
Conflicts:
	less/list-group.less
2014-03-06 21:32:52 -08:00
Mark Otto
9dc796155c Fixes #12722: Fixes up responsive tables in print
Safari renders this fine for one reason or another, but Chrome still renders the media query styles to make tables responsive. This change scopes them to screen devices only, so printing looks boss everywhere.
2014-03-06 21:25:34 -08:00
mrmrs
4868096dbd Fixes #12934 2014-03-06 21:05:29 -08:00
Mark Otto
17e41098c8 Fixes #12824: Remove white-space: nowrap from code elements 2014-03-06 20:39:19 -08:00
Ahmad Nassri
de8b784913 .transition-timing-function Mixin
added .transition-timing-function(@timing-function) mixin, defaults to @timing-function.
2014-03-05 01:49:14 -05:00
Mark Otto
10eb167e35 Fixes #12901: Refactors list group active state for use on non-anchors 2014-03-04 22:42:13 -08:00
Mark Otto
7ffb90560e Merge branch 'master' of github.com:twbs/bootstrap 2014-03-04 16:56:09 -08:00
Mark Otto
24de9b0994 Fixes #12848: Account for and document progress bars at 0-3% 2014-03-04 16:55:15 -08:00
Chris Rebert
9dae5368f5 use full version number in deprecation note 2014-03-04 16:21:17 -08:00
Mark Otto
13ed379767 clarify deprecation /cc @cvrebert 2014-03-04 16:19:30 -08:00
Mark Otto
88f01c4934 Merge pull request #12917 from 5im0n/master
Update dont' working csscomb properties
2014-03-04 14:34:08 -08:00
Mark Otto
56c6525f23 Merge pull request #12863 from Sojaner/master
Fix for issue #12854 on push and pull resets
2014-03-04 14:21:28 -08:00
Mark Otto
7733f24373 Fixes #12868: Enables icon feedback on validation states for large/small inputs.
Also reorders the CSS to place Glyhpicons as a dependency before other components for fewer overrides and less specific CSS.
2014-03-04 14:12:57 -08:00
Mark Otto
1c66f30b6a Fixes #12913: Remove scoped media queries from custom xs grid mixins 2014-03-04 13:54:56 -08:00
Mark Otto
f45df64670 Fixes #12914: Darken immediate children hr elements in jumbotrons 2014-03-04 13:54:09 -08:00
Simon
02ca9de45f Update csscomb properties. 'colon-spac'e and 'stick-brace' don't take boolean values. 2014-03-04 15:29:53 +01:00
Mark Otto
0c269c9639 Merge pull request #12745 from ronnyhaase/panel-vars
Defined and use variables for .panel-heading & .panel-footer padding
2014-03-04 00:27:08 -08:00
Mark Otto
e381635b1f Fixes #12593: Add support for table bodies and table rows to the collapse plugin 2014-03-03 21:39:53 -08:00
Mark Otto
6bd54ef14b 100% less tumah 2014-02-27 12:17:08 -08:00
Mark Otto
ce4175b65e Merge pull request #12855 from lipis/patch-1
Added the very useful .animation-fill-mode() mixin
2014-02-27 12:12:44 -08:00
Mark Otto
2e02ed4e0c Fixes #12851: it's not a tumah 2014-02-27 11:08:24 -08:00
Sojaner
77cd015cf0 Fix for issue #12854 where push and pull resets
The col-*-push-0 and col-*-pull-0 classes try to reset the positioning using 0% but this prevents the opposite direction positioning to freeze and not being set correctly.
To fix that, these must set the position to auto instead of 0% with means left:auto and right:auto instead of left:0% and right:0%.
2014-02-27 12:35:58 +03:30
Lipis
b878491b9a Added the very useful .animation-fill-mode() mixin
I think that's the only animation property that was missing and it's quite useful.

https://developer.mozilla.org/en-US/docs/Web/CSS/animation-fill-mode
2014-02-26 17:59:36 +01:00
Chris Rebert
f1736e2d32 update GitHub issue link in comment 2014-02-25 10:17:44 -08:00
Chris Rebert
754791e3d9 fix #12836
Thanks @Quy.
2014-02-24 14:43:09 -08:00
Mark Otto
66a229bdbf Fixes #12822: Scope panel collapse styles to immediate panel bodies only 2014-02-22 22:46:03 -08:00
Mark Otto
7b60470e9b Fixes #12801: Add padding to the bottom of .form-control-static to match height of standard form controls 2014-02-22 14:16:11 -08:00
Mark Otto
7e551ecaf7 Update modals to use more consistent padding—modal body and footer now match modal header 2014-02-22 12:38:56 -08:00
Mark Otto
4ccf088a24 Merge branch 'master' into pr/12813
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-02-22 12:20:53 -08:00
Mark Otto
b99be29f32 Fixes #12756: Ensure horizontal dls are cleared by moving the clearfix out of the media query 2014-02-22 12:13:11 -08:00
Supergibbs
49094844ac Correctly set .btn-link colors in a .navbar and .navbar-inverse #12694 2014-02-21 20:51:06 -08:00
Chris Rebert
bdd7651e32 replace .visible-{size} with .visible-{size}-{display} ; fixes #8869 2014-02-21 17:44:40 -08:00
Mark Otto
b01f995ad7 Merge pull request #12459 from rubenstolk/hotfix/mixins/scale
Make both .scale(X) and .scale(X, Y) both work
2014-02-21 17:36:47 -08:00
Mark Otto
c7b07a5644 Merge pull request #12742 from ZDroid/table-responsive-mixin
Make .table-responsive usable as mixin
2014-02-21 17:34:27 -08:00
Chris Kankiewicz
4dde96b674 Removed unnecessary top margin from .modal-footer 2014-02-20 14:27:19 -07:00
Demian Ferreiro
ca15add174 Fix UAs required message position on grouped radio buttons
Instead of not rendering the element at all with display:none, use opacity:0 and z-index:-1 so the radio element has a defined position on the document and user agents can show the required message in the right place.
2014-02-19 17:30:55 -03:00
Zlatan Vasović
dfa5edca2c Make .table-responsive usable as mixin 2014-02-14 19:48:17 +01:00
rhaase
eef939916b Defined and use variables for .panel-heading & .panel-footer padding 2014-02-14 15:51:01 +01:00
DaSch
2fba53e600 add posibillity to hover links and not background in list-groups 2014-02-14 13:56:36 +01:00
Mark Otto
eb20d6f132 Fixes #11659, #12698, and #12349: Always apply position and z-index form controls in input groups for proper borders 2014-02-11 14:20:01 -08:00
Mark Otto
8551f42ae2 Merge branch 'master' into pr/12412
Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	test-infra/npm-shrinkwrap.canonical.json
2014-02-11 09:50:40 -08:00
Mark Otto
b4ba964801 Merge pull request #12673 from tlindig/tl_popover_arrow_size
use @popover-arrow-width for offset the popover
2014-02-10 20:52:43 -08:00
Mark Otto
9427310a09 Fixes #12674
* The problem with #12674 is that it reassigns the same variable, but the color values were purposely different.
* This uses Less's color functions to generate the proper darker colors.
* Why darker colors? Because those CSS carets render lighter than their solid border counterparts. Consider it a design hack.
2014-02-10 20:49:17 -08:00
Chris Rebert
c4e242bdb1 add .sr-only-focusable; fixes #12259 2014-02-10 10:34:38 -08:00
Tobias Lindig
221ac861e4 use @popover-arrow-width for offset the popover to account for the popover arrow 2014-02-10 10:57:11 +01:00
Ruben Stolk
a843bfda18 Make both .scale(X) and .scale(X, Y) both work 2014-02-10 10:12:38 +05:30
Mark Otto
41841c99c4 Merge branch 'master' of github.com:twbs/bootstrap 2014-02-08 17:29:25 -08:00
Mark Otto
44bb7b20c7 Fixes #12625: Only remove first list group item's top and last list group item's bottom borders when the list group is first or last 2014-02-08 17:29:10 -08:00
Mark Otto
2365717a3d Merge pull request #12433 from tagliala/list-inline-first-element-fix
Fix first element padding of list-inline
2014-02-08 16:59:59 -08:00
Mark Otto
65b10706b3 brace position 2014-02-08 16:56:59 -08:00
Mark Otto
e9199718d6 Merge branch 'master' into fix-12154
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-02-08 16:52:22 -08:00
Mark Otto
b6444c6472 Merge pull request #12552 from stoudenmire/carousel-icon-classname-fix
Fixes two typos in carousel.less
2014-02-08 16:03:25 -08:00
Mark Otto
e3cfd5821d Merge branch 'master' into pr/12462
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-02-08 16:01:56 -08:00
Mark Otto
c8315edd73 Merge branch 'master' into pr/12639
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-02-08 15:37:35 -08:00
Zlatan Vasović
4c16360036 Fix #12656: add @blockquote-font-size 2014-02-08 22:12:18 +01:00
Mark Otto
06f1293acf Merge branch 'master' into panels_and_tables
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-02-07 18:36:27 -08:00
Mark Otto
a2f08158d0 Nuke shit I added in 4d7b2ddba9 that shouldn't come until v4 2014-02-07 15:44:50 -08:00
Bas Bosman
a0052b5a37 Drop -o-user-select 2014-02-07 14:14:32 +01:00
Mark Otto
4d7b2ddba9 Fixes #12486: Restore full width inputs for input groups in inline forms and navbars 2014-02-07 02:58:10 -08:00
Mark Otto
d91d9b0ade Fixes #12447: Properly reset borders on table cells in panels 2014-02-07 02:38:01 -08:00
Mark Otto
da43f97be1 Override iOS search input's extra round corners 2014-02-07 02:08:32 -08:00
Mark Otto
228d4e59fc Fixes #12555: Rearrange variables to place grids and containers closer 2014-02-07 01:22:30 -08:00
Mark Otto
b124c4a6a4 Merge pull request #12620 from twbs/thumbnail-extend
use :extend in thumbnail Less
2014-02-06 19:32:31 -08:00
Mark Otto
42d7479dbf Merge pull request #12502 from ZDroid/moz
Remove redundant :-moz-placeholder styles
2014-02-06 19:31:29 -08:00
Mark Otto
ace0abfdb6 Merge branch 'master' into thumbnail-extend
Conflicts:
	dist/css/bootstrap.css
2014-02-06 18:52:03 -08:00
Chris Rebert
7c1511502e use :extend(.img-responsive) in Carousel's Less 2014-02-06 15:52:26 -08:00
Chris Rebert
fda8d91c86 use :extend in thumbnail Less 2014-02-06 15:42:54 -08:00
Chris Rebert
37c21a3ac7 use Less' extend feature in btn-group-lg etc. 2014-02-06 10:59:04 -08:00
Supergibbs
08ff305ed7 Added border radiuses to table when in a panel. Fixes #12461 2014-02-05 14:29:23 -08:00
Mark Otto
45e65eef3d Merge pull request #12025 from ZDroid/clean-visibility-mess
Fix #12015 and minify styles
2014-02-04 18:29:05 -08:00
Mark Otto
07098d1bb7 Fixes #12470: Scope large modal styles to minimum viewport width 2014-02-04 02:01:31 -08:00
Mark Otto
266a2e11e0 Merge pull request #12533 from 1000hz/tighten-popover-arrows-scope
Scope popover arrow css to direct descendant
2014-02-03 23:40:52 -08:00
Chris Rebert
149c4be726 die tabs, die! 2014-02-03 10:02:58 -08:00
stoudenmire
a484b3bd7a fixed two typos in carousel.less
carousel.less has two typos in glyphicon classnames. fixed them.
2014-02-03 16:24:07 +01:00
Cina S
847adb7dad Tightening up popover arrow css scope to apply only to direct descendant arrows. 2014-02-02 16:14:22 -06:00
Zlatan Vasović
1e09a9d1d7 Remove redundant :-moz-placeholder styles
No need for old Firefox versions support.
2014-02-01 14:20:41 +01:00
Frederick Marcoux
d1a7271ea1 Update variables.less 2014-01-31 15:25:09 -05:00
Frederick Marcoux
d3aad7e355 Added .list-group-item.disabled
Added support for disabled List group item.
2014-01-31 15:17:49 -05:00
Chris Kankiewicz
22e576c600 Fix issue causing .navbar-brand element height to be shorter than .navbar height 2014-01-30 14:59:54 -07:00
Geremia Taglialatela
0da527f169 fixed first element padding of list-inline 2014-01-30 14:55:19 +01:00
Mark Otto
d2f1887bb5 Merge branch 'master' into pr/12388
Conflicts:
	dist/css/bootstrap.min.css
2014-01-29 22:18:29 -08:00
Mark Otto
9195d8e8eb Follow up to #11655: don't reset opacity on disabled buttons 2014-01-29 21:57:44 -08:00
Mark Otto
d631e0b92d Fix #12422: Reset height on multiple select in input size mixin 2014-01-29 21:34:10 -08:00
Mark Otto
545c957f17 Fixes #12424: Account for Normalize change on figure element so that we don't potentially screw folks over 2014-01-29 21:23:23 -08:00
Mark Otto
493d143cbd v3 instead of rc1 2014-01-28 10:07:33 -08:00