rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity
9,797 Commits 108 Branches 89 Tags 547 MiB
feed9aed5b
Commit Graph

2652 Commits

Author SHA1 Message Date
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
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
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