rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-13 01:08:58 +01:00
Code Issues Actions Packages Releases Activity
11,545 Commits 108 Branches 89 Tags 553 MiB
167c6fa93a
Commit Graph

2888 Commits

Author SHA1 Message Date
Mark Otto
0cf14b3768 Merge pull request #15697 from kkirsche/patch-6 
[Fix Issue #15682] .caret is smaller in Firefox than other browsers
 2015-02-08 17:33:19 -08:00
Mark Otto
8ef21c73aa Merge pull request #15728 from kkirsche/patch-11 
[Fix Issue #15719] Add a variable for .form-group's margin-bottom
 2015-02-08 16:27:52 -08:00
Jitendra Vyas
7dd72d83fa Removed visibility: hidden !important from .hidden class 
This .hidden was taken from HTML 5 Boilerplate and yesterday we discussed on twitter that visibility: hidden !important can be removed now. https://twitter.com/jitendravyas/status/562940090553733121
 2015-02-05 13:28:22 +05:30
Kevin Kirsche
2dfc58fa5c [Fix Issue #15683] readonly input should not have a not-allowed cursor 
[Fix Issue #15683] `readonly` input should not have a `not-allowed` cursor. Instead, this pull request displays a standard cursor and only displays the not-allowed cursor on disabled items.

Revise docs wording to clarify cursor display
 2015-02-03 08:58:11 -05:00
Kevin Kirsche
8a9374325b Use form-group margin variable 2015-02-02 15:16:26 -05:00
Kevin Kirsche
99fc85e8d0 [Fix issue #15719] Add a variable for .form-group's margin-bottom 
[Fix issue #15719] Add a variable for .form-group's margin-bottom
 2015-02-02 15:13:01 -05:00
Haralan Dobrev
b46dbef326 Extract responsive embed nested classes 
I think this is the more common coding convention across Bootstrap.

Extract nested classes as first-class citizens and assume HTML would use both.
 2015-02-02 19:26:30 +02:00
Kevin Kirsche
119ce267a6 [Fix Issue #15682] .caret is smaller in Firefox than other browsers 
[Fix Issue twbs/bootstrap#15682] .caret is smaller in Firefox than other browsers
 2015-01-29 07:46:45 -05:00
Mark Otto
2641ba6f0f Merge pull request #15628 from kkirsche/patch-1 
[Fix Issue #15561] Fix badges not being resized inside .btn-group-xs if .btn-xs is not applied
 2015-01-21 18:50:33 -08:00
Kevin Kirsche
4c5d1faa35 Fix having multiple selectors on a single line. 2015-01-21 16:38:58 -05:00
Kevin Kirsche
848701a1b3 Fix issue twbs/bootstrap#15561 
Fix issue twbs/bootstrap#15561 regarding badges not shrinking to fit inside of .btn-group-xs
 2015-01-21 12:01:25 -05:00
Chris Rebert
07a3ea5f54 Add .glyphicon-* aliases for other ISO 4217-ish currency codes 
Fixes #15617.
 2015-01-20 16:24:48 -08:00
Geremia Taglialatela
e90f98dd0c Trim whitespaces 2015-01-19 21:26:01 +01:00
Mark Otto
4ed95f5fa2 fixes #15497: increase decimals on line-height-large from 1.33 to 1.3333333 to fix button sizing in Win 8.1 Chrome 2015-01-18 15:03:14 -08:00
Mark Otto
db8eeaa17a Fixes #15142: Add position: relative; to .dropup for proper placement of menus 2015-01-18 13:39:40 -08:00
Mark Otto
1bf1ba7103 Merge branch 'master' into pr/15278 
Conflicts:
	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.css.map
	docs/dist/css/bootstrap.min.css
 2015-01-18 12:24:29 -08:00
Mark Otto
de491e914a fixes #15493: inherit color on small/.small in .panel-title 2015-01-17 21:35:55 -08:00
Mark Otto
e39b5b5b25 Merge pull request #15551 from lee101/master 
Fix table-striped to work with bootstraps tooltips on rows
 2015-01-17 21:07:13 -08:00
Kevin Jannis
be8eafd76b Added blank line between selectors in badges 2015-01-16 21:44:27 +01:00
Chris Rebert
85a6595a71 .form-control: add note about <select> & border-radius 
Refs #15340
 2015-01-16 11:02:51 -08:00
Kevin Jannis
1c131fb95d Added blank lines between selectors for alerts 2015-01-16 10:06:35 +01:00
Mark Otto
dbffb0b47f Fixes #15536, #15559: Add .form-group sizing support to .form-control-static 2015-01-15 16:03:13 -08:00
Mark Otto
6bf8636a91 Merge pull request #15567 from twbs/fix-15565 
Use @link-hover-decoration for .btn-link too; fixes #15565
 2015-01-15 15:36:19 -08:00
Mark Otto
619843472a Merge pull request #15482 from liias/patch-1 
Add .disabled class styling for .btn-styles in theme
 2015-01-15 15:34:34 -08:00
Kevin Jannis
bb479b8f47 Added blank line between selectors in jumbotron 2015-01-15 20:17:02 +01:00
Chris Rebert
65721f5315 Use @link-hover-decoration for .btn-link too; fixes #15565 
[skip sauce]
[skip validator]
 2015-01-14 14:43:21 -08:00
Lee Penkman
0c8cb3f2dc Fix table-striped to work with bootstraps tooltips on rows 2015-01-13 14:18:52 +13:00
liias
ba8a40e788 Add .disabled class styling for .btn-styles 
Bootstrap itself has .btn-default.disabled styled. IE8 with angularjs has some weird behaviour if anchor has disabled attribute set, so I use disabled class as a workaround and assume the .disabled class styles the buttons the same as disabled attribute would.
 2015-01-02 11:28:09 +02:00
Chris Rebert
ad138ed885 Disable .glyphicon-door & .glyphicon-key for the time being 
Closes #15419
Refs #10106
 2014-12-29 16:44:33 -08:00
Mark Otto
b615bd938b Merge branch 'master' of https://github.com/twbs/bootstrap 
Conflicts:
	dist/css/bootstrap.css.map
 2014-12-22 19:30:51 -08:00
Mark Otto
c41970c579 Fixes #15422: Alternate fix for temporal input sizing in input groups 2014-12-22 19:28:29 -08:00
Chris Rebert
75ec7393ec Add summary of #11526 to explanatory Less comment 
[skip sauce]
[skip validator]
 2014-12-22 17:24:37 -08:00
Chris Rebert
d84f726da4 IE11 & current Firefox are still affected. 
Refs #11623
 2014-12-22 17:24:26 -08:00
Chris Rebert
15c9c3aef7 add more refs to browser-related bugs in Less comments 2014-12-22 17:24:26 -08:00
Chris Rebert
e5051e76fe Reference iOS Safari temporal input bug in explanatory Less comment 
Refs #11266, #13098, #15415

[skip sauce]
[skip validator]
 2014-12-22 15:03:48 -08:00
Chris Rebert
c275850982 Remove reference to old fixed WebKit bug in Less comment. 
Per https://github.com/twbs/bootstrap/issues/1969#issuecomment-36971094

[skip sauce]
[skip validator]
 2014-12-22 14:58:44 -08:00
Mark Otto
4d2f68c437 Merge pull request #15391 from stubbornella/master 
Fixes #14990: Media bodies take up full width
 2014-12-20 22:15:15 -08:00
Mark Otto
8777803acf Merge pull request #15307 from vsn4ik/part_of_15148 
Fix part of #15148.
 2014-12-20 22:12:47 -08:00
Chris Rebert
b8844f639f fix "propertes" typos in comments 2014-12-19 18:19:18 -08:00
Nicole Sullivan
7551723054 Fixes #14990: Media bodies take up full width 
Signed-off-by: Beatrice Peng <bpeng@pivotal.io>
 2014-12-17 11:19:06 -05:00
Chris Rebert
e674ea553d Add docs for #15340 
border-radius CSS property doesn't affect <select>s in some browsers.
Hence, @input-border-radius doesn't affect <select class="form-control"> in some browsers.
Closes #15340.

[skip sauce]
[skip validator]
 2014-12-15 11:58:55 -08:00
Bastien
c8855a7ad1 Add glyphicons fonts in woff2 2014-12-12 14:22:41 +01:00
Bastien
bc36e31280 Add new brand-primary color in the doc and the true color in comment 2014-12-12 11:07:16 +01:00
Chris Rebert
cb4c3a0eae glyphicons.less: lowercase F in codepoint number for consistency 2014-12-11 11:45:33 -08:00
vsn4ik
d7d6384d39 Fix margin-bottom on dropdown (navbar-fixed-bottom). 2014-12-05 23:30:30 +03:00
Matt Smith
dbe4765416 Nested button groups with only one child now have rounded corners (Iss.#15270) 2014-12-03 11:44:35 -05:00
Mark Otto
ced63b0a02 Merge pull request #15244 from zalog/patch-2 
Center .icon-prev and .icon-next in carousel
 2014-11-30 14:20:21 -08:00
Mark Otto
bcb90ef3a0 Bump Glyphicons to v1.9 2014-11-30 01:31:49 -08:00
Mark Otto
7e27e749d1 Fixes #15140: Restore more missing .media styles from shipping #14801 2014-11-29 21:36:57 -08:00
Mark Otto
7c71b4874b Fixes #15074: Fix the nesting problem with form control size variants 2014-11-29 20:57:04 -08:00
Mark Otto
c2d868cfbe Fixes #15124: Restore .media-object 2014-11-29 18:33:20 -08:00
Mark Otto
c22b8dca14 Fixes #15148: make the dropdown and dropup menus have the same margins 2014-11-29 18:31:09 -08:00
Catalin Zalog
8770f55f1e Center .icon-prev and .icon-next 
Center .icon-prev and .icon-next the same way .glyphicon icon are.
And this is the html markup:
<a class="left carousel-control" href="#carousel-main-menu" role="button" data-slide="prev">
<span class="icon-prev" aria-hidden="true"></span>
</a>
 2014-11-27 13:06:42 +02:00
Heinrich Fenkart
c2abfc0a44 grunt 2014-11-17 18:57:02 +01:00
Heinrich Fenkart
6503cb0822 Revert "Follow-up to #13074: use spec syntax instead of deprecated mixins" 
This reverts commit b10b373c60.

Resolves #14937.
 2014-11-17 18:54:55 +01:00
Mark Otto
857aab0a1c Fixes #14939: Don't remove focus outline from buttons in button groups 2014-11-11 15:43:00 -08:00
Mark Otto
eb74a8cbf3 darken primary blue for accessibility contrast on link colors 2014-11-09 23:11:28 -08:00
Mark Otto
99148166c5 Merge pull request #15052 from twbs/badge-in-non-anchor-list-group-item 
Badges: fix active styles when in non-anchor `.list-group-item`
 2014-11-09 15:05:40 -08:00
Mark Otto
5670dd8930 comment and formatting 2014-11-09 15:04:32 -08:00
Mark Otto
46d1bf8eef Fixes #14234 again 
- Rather than override and hack for IE8-10 and then IE11, scope to just Safari.
- Drops the IE hacks for a media query Webkit hack
 2014-11-09 15:03:33 -08:00
Heinrich Fenkart
a05f07528a Badges: fix active styles when in non-anchor .list-group-item 2014-11-08 11:00:37 +01:00
Mark Otto
df28b7e25f Fixes #14965: Reset top border-radii on dropdown menus in fixed bottom navbars 2014-11-08 00:13:19 -08:00
Mark Otto
39f8c8183b Merge pull request #15018 from twbs/fix-theme-active-items 
Theme: Correctly override active dropdown items in collapsed navbars
 2014-11-08 00:07:39 -08:00
Mark Otto
8fbb2bbbd1 Fixes #14979: Override .jumbotron padding within .container-fluid to match .container 2014-11-07 23:01:20 -08:00
Mark Otto
2862c30320 Fixes #15046: Add full font overrides for popovers and tooltips 2014-11-07 22:17:39 -08:00
Heinrich Fenkart
0d851e8b8a Theme: Correctly override active dropdown items in collapsed navbars 2014-11-05 18:36:53 +01:00
Heinrich Fenkart
00fa64650a Merge pull request #14921 from bassjobsen/patch-3 
Update grid-framework.less
 2014-11-05 01:54:13 +01:00
Julian Thilo
0018723cce Merge pull request #15019 from twbs/whoomp_there_it_was 
Deprecate diagonal tooltip classes
 2014-11-05 00:33:04 +01:00
Heinrich Fenkart
e62a1264b9 Merge pull request #14927 from twbs/fix-modal-backdrop-above-scrollbar 
Fix modal backdrop overlaying the modal's scrollbar
 2014-11-05 00:15:52 +01:00
Julian Thilo
da3870feac Deprecate diagonal tooltip classes 2014-11-05 00:09:56 +01:00
Heinrich Fenkart
14e5fb04e9 Fix modal backdrop overlaying the modal's scrollbar 
Fixes #14916.
 2014-11-04 23:17:55 +01:00
Julian Thilo
87edaf295c Fix #14936: Use correct left/right and margin on tooltip arrows 2014-10-30 16:33:14 +01:00
Bass Jobsen
b8dbb545ac Update grid-framework.less 
The `when (@index = 1)` guards are not needed cause the mixins already only match on arity.
 2014-10-30 01:20:35 +01:00
Mark Otto
5429e71401 fixes #14913: badges in list group shouldn't have text shadow 2014-10-29 10:27:18 -07:00
Mark Otto
e528daf6d0 change back to not allowed cursor 2014-10-28 22:57:56 -07:00
Mark Otto
bf3be5a456 swap cursor not-allow for default, and use a variable for all disabled elements 2014-10-27 20:45:46 -07:00
Baraa
f0fd6df63a Removed unnecessary new lines that were inconsistent with current style. 2014-10-26 22:33:55 -07:00
Mark Otto
783eced7ab follow up fix for #14837 /cc @hnrch02 2014-10-25 20:20:24 -07:00
Mark Otto
2c2564faef Fixes #14736: Reverts the remaining progress bar min value overrides from #12848 2014-10-25 19:10:03 -07:00
Mark Otto
3fcd65af41 Fixes #14806: reset the text-shadow in the themed buttons 2014-10-25 18:57:27 -07:00
Mark Otto
41a26ced24 Fixes #14814: Use the link active bg variables for theme navbar gradients 2014-10-25 18:27:40 -07:00
Mark Otto
38217ee405 Merge branch 'pr/14801' 
Conflicts:
	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.css.map
	docs/dist/css/bootstrap.min.css
 2014-10-25 18:16:40 -07:00
Mark Otto
42c2918372 Fix up margins and unnest code 2014-10-25 18:13:35 -07:00
Panayiotis Lipiridis
49bcdcb0a8 Added alias for euro -> eur 2014-10-25 01:15:04 +02:00
Mark Otto
a92aea5127 Merge pull request #14786 from andy-saint/links 
Added link hover decoration variable
 2014-10-24 13:28:46 -07:00
Nicole Sullivan
919b4ccb15 Fixes #14799: Add vertical alignment of image in media component 
Signed-off-by: Jenn Dodd <jedodd@pivotal.io>
 2014-10-23 18:48:18 -04:00
Chris Rebert
15236f517f Add min-height: 0% to .table-responsive; Fixes #14837 2014-10-20 17:35:36 -07:00
Panayiotis Lipiridis
b43a7a932e Removed double parentheses from expressions 2014-10-20 21:43:03 +02:00
XhmikosR
9f82f27b9d Update less/print.less to the latest html5 bp version. 
Also, keep the html5 boilerplate link in the built CSS.
 2014-10-13 13:32:39 +03:00
Andrew Saint
86eac52cce Added link hover decoration variable 2014-10-12 10:40:10 +01:00
fat
4bbe80658a fixes #13816 Modal dialog closes when dragging and releasing mouse button outside dialog 2014-10-09 20:01:51 -07:00
XhmikosR
0ca71396b5 Update normalize.css to v3.0.2. 2014-10-07 11:29:59 +03:00
fat
582bb7dcdc fix #14254 Modal Sometimes Does Not Appear after Multiple Displays in Safari 2014-10-02 21:52:53 -07:00
Mark Otto
12091b9567 Fixes #14711: Account for list groups in collapsing panels 2014-10-02 21:19:20 -07:00
Mark Otto
36fdd29413 Fixes #14682: Remove quotes reset on blockquote elements as it causes rendering bugs 2014-09-26 13:47:26 -07:00
Mark Otto
8e25695d09 Fixes #14687: Include video element in responsive embed 2014-09-26 13:45:28 -07:00
Mark Otto
6cfd176ac3 Reverts 0ec05da0ee to bring back #14444 to fix #14348 (again) 2014-09-23 13:29:19 -07:00
Mark Otto
f540569e87 Fixes #14227, #14603: Drop translate3d for translate on navbars to avoid iOS rendering problems and ensure a more predictable base styling 2014-09-22 14:17:54 -07:00
Mark Otto
9ed65ab444 Fixes #14592: Add new variable for progress border radius 2014-09-18 19:09:51 -07:00
Heinrich Fenkart
285feb4dd7 Merge pull request #14559 from hnrch02/properly-hide-btngroup-checkbox-n-radio 
Properly hide checkbox and radio inputs in button groups
 2014-09-08 20:32:20 +02:00
Marat Abdullin
0d8f5fffa5 Variables for large and small input border radiuses 2014-09-08 11:04:12 -07:00
Mark Otto
c6d7d71549 Fixes #14557: Reset the bottom margin on .form-group:last-child in .navbar-form to prevent extra spacing 2014-09-08 10:57:50 -07:00
Mark Otto
f2783fbf83 Fixes #14319: Prevent jumbotron reflow by ensuring padding of .container isn't interferred with by .jumbotron side padding 2014-09-08 10:29:45 -07:00
Heinrich Fenkart
475152a9a1 Properly hide checkbox and radio inputs in button groups 
`pointer-events: none;` for modern browsers (including IE11+), `clip: rect(1px, 1px, 1px, 1px);` for everything else.

Fixes #14137
 2014-09-08 14:56:29 +02:00
Mark Otto
9f5660c3e3 Fixes #14545: Avoid strange formatting on vendor prefixing for placeholder 2014-09-06 21:25:33 -07:00
Mark Otto
5b7a5f84d4 Fixes #14437: Round the corners of table rows in panels as well as the cells 2014-09-04 19:06:01 -07:00
Mark Otto
e37e06d73e Fixes #14443: Only transition what needs transitioning for thumbnails to avoid Safari/Chrome render bug 2014-09-01 12:48:19 -07:00
Mark Otto
fe19211e4d Finish reverting #14444 2014-08-27 23:34:46 -07:00
Mark Otto
0ec05da0ee Undo the collapse visibility changes since it breaks our collapse plugin 2014-08-27 23:31:34 -07:00
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