Mark Otto
bcc2c8b09e
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-14 20:04:52 -08:00
Mark Otto
432b9f9cde
Fixes #11561 : Add float: left; to .form-control within input groups to prevent IE9 from screwing up placeholder text and select menu arrows
2013-12-14 20:04:12 -08:00
Chris Rebert
c243e2417e
Merge pull request #11864 from twbs/parallelize-build
...
parallelize Travis using build matrix & test subsuites
2013-12-14 19:40:28 -08:00
Mark Otto
4da03c83c5
correct bookmark prefix
2013-12-14 19:31:20 -08:00
Mark Otto
88a8669656
document #11326
2013-12-14 19:31:03 -08:00
Chris Rebert
39a2dab722
parallelize Travis using build matrix & test subsuites
2013-12-14 19:11:04 -08:00
Mark Otto
e98c2dc3ad
Merge pull request #11326 from ZDroid/animations
...
Add `.animation-*()` mixins
2013-12-14 18:58:41 -08:00
Mark Otto
35dd6b9fd7
Merge pull request #10704 from XhmikosR/various
...
rm unused vars
2013-12-14 18:55:25 -08:00
Mark Otto
46c3d27468
Merge branch 'master' into pr/11435
...
Conflicts:
dist/css/bootstrap.css
dist/css/bootstrap.min.css
2013-12-14 16:56:56 -08:00
Mark Otto
4c64c1eecd
Merge branch 'master' into pr/11302
...
Conflicts:
dist/css/bootstrap.css
dist/css/bootstrap.min.css
2013-12-14 16:46:40 -08:00
Mark Otto
d79431ca02
Document new modal sizes
2013-12-14 16:29:55 -08:00
Mark Otto
323a40cc53
Merge branch 'master' into pr/11162
...
Conflicts:
less/modals.less
2013-12-14 16:29:47 -08:00
Mark Otto
83c60ef3ee
Merge branch 'master' into pr/11107
...
Conflicts:
docs-assets/js/raw-files.js
2013-12-14 16:20:19 -08:00
Mark Otto
4afcebe0e7
Merge pull request #11286 from BBosman/well-border
...
Add well-border variable
2013-12-14 16:17:41 -08:00
Mark Otto
544b8ecab7
Fixes #10921 : Add support for input groups within button toolbars
...
* Floats any `.input-group` within a toolbar
* Simplifies the CSS to remove sibling selectors and instead use a
negative amrgin on the parent with only `margin-left`
See it in action: http://jsbin.com/aGEcUqAT/1/ .
2013-12-14 16:03:21 -08:00
Mark Otto
fd4130534f
mention lack of support for split button dropdowns in vertical button groups
2013-12-14 15:56:01 -08:00
Mark Otto
a54dbfdf2a
Merge branch 'master' into pr/10951
...
Conflicts:
dist/css/bootstrap.min.css
less/modals.less
2013-12-14 15:38:21 -08:00
Mark Otto
f1869771bc
Fixes #10505 : Document more of LESS vars and mixins
2013-12-14 14:18:43 -08:00
Mark Otto
85316c8a0c
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-14 13:23:25 -08:00
Mark Otto
11c6ab767c
Fixes #10370 : Improved and deprecated dropdown menu alignment options
...
* Removes an old pair of selectors that didn’t properly target the
right-aligned navbar alignment of dropdown menus.
* Deprecates the `.pull-right` alignment in favor of a more specific
and unique class name.
* Adds `.dropdown-menu-right` as the new alignment class. This is then
mixin-ed into the `.navbar-right.navbar-nav` dropdown menus for
auto-alignment.
* To override that auto-alignment, use `.dropdown-menu-left` as needed.
2013-12-14 13:22:56 -08:00
Chris Rebert
9e50078321
Merge pull request #11878 from ZDroid/patch-1
...
Add `try` and `catch` to keywords
2013-12-14 13:13:24 -08:00
Zlatan Vasović
7f6cf5e50c
Add try and catch to keywords
2013-12-14 21:57:59 +01:00
Mark Otto
914f5e6a1d
Fixes #11867 : Add @panel-body-padding variable
2013-12-14 11:44:54 -08:00
Mark Otto
ecc6f4e6bc
Merge branch 'master' into pr/11868
...
Conflicts:
dist/css/bootstrap.min.css
2013-12-14 11:36:54 -08:00
Mark Otto
22820d7151
Fixes #10495 : Float Glyphicon and set margins in .navbar-brand to ensure there is no added height because wtf even is CSS
2013-12-13 23:06:04 -08:00
Chris Rebert
ce07ff84cd
Merge pull request #11869 from twbs/cache-node_modules
...
use S3-based node_modules caching
2013-12-13 17:35:39 -08:00
Chris Rebert
6b6b059ac3
time all the things
2013-12-13 17:22:46 -08:00
Chris Rebert
42697a4ecb
use S3-based node_modules caching
2013-12-13 17:20:32 -08:00
Chris Rebert
de6b9e9df1
Merge pull request #11874 from ZDroid/hotfix
...
';' isn't needed
2013-12-13 14:31:15 -08:00
Zlatan Vasović
e3d799fca3
';' isn't needed
2013-12-13 23:15:02 +01:00
Tobias Lindig
37b2c8a812
add dist files.
2013-12-13 12:27:56 +01:00
Tobias Lindig
b7bf212995
use @zindex-modal for .modal and @zindex-modal-background for .modal-backdrop.
...
removed z-index for .modal-dialog, it was not necessary because the parent element (.modal) already has a z-index.
2013-12-13 12:24:20 +01:00
Mark Otto
5f9ecc7351
-ms-transform is for IE9 only, IE10+ don't require it
2013-12-12 23:01:11 -08:00
Mark Otto
0e6d34f24f
Merge pull request #11819 from janpanschab/ms-transform-origin
...
Transform-origin mixin for IE
2013-12-12 22:59:08 -08:00
Chris Rebert
2d693def43
Merge pull request #11863 from twbs/update-osx
...
Sauce tests: update to later browsers supported by OS X 10.9
2013-12-12 22:16:31 -08:00
Chris Rebert
56d89ed7ae
Sauce tests: update to later browsers supported by OS X 10.9
2013-12-12 21:58:44 -08:00
mrasscha
ce39cbe6fa
Issue #11852 : create a new variable for the list group active item link text.
2013-12-12 20:48:08 +01:00
Chris Rebert
730ccd2a20
Merge pull request #11859 from dzwillia/add_dropdown_caret_color
...
Add @dropdown-caret-color variable back to variables.less
2013-12-12 10:02:53 -08:00
dzwillia
4b47c60835
Added @dropdown-caret-color variable back to variables.less (deprecated)
2013-12-12 12:53:59 -05:00
Mark Otto
fbf31f965e
Add new template, Cover
2013-12-11 16:45:41 -08:00
Mark Otto
9966d035cd
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-11 10:52:55 -08:00
Mark Otto
a3a2525124
Fixes #11837 : grid containers are fixed width now, no longer max-width
2013-12-11 10:52:47 -08:00
Mark Otto
bdd0890c0f
Merge pull request #11841 from ZDroid/breadcrumbs
...
Use variables for breadcrumb padding
2013-12-11 10:48:51 -08:00
Mark Otto
5ec2b4b255
Merge pull request #11839 from XhmikosR/readme
...
Clarify Windows workarounds.
2013-12-11 10:47:54 -08:00
Zlatan Vasović
2547f1e20f
Use variables for breadcrumb padding
2013-12-11 14:36:26 +01:00
Zlatan Vasović
27859f6b8f
Improve pager customization
2013-12-11 14:25:21 +01:00
Chris Rebert
f3077ee424
Merge pull request #11838 from XhmikosR/customizer
...
customizer.js: Remove a workaround for older less.js.
2013-12-11 03:53:44 -08:00
XhmikosR
caa3d53dcb
customizer.js: remove a workaround for older less.js.
2013-12-11 13:27:23 +02:00
XhmikosR
6355832e90
Clarify Windows workarounds.
2013-12-11 12:57:18 +02:00
Mark Otto
2bc08190ec
Combine updates to Windows Jekyll stuff
2013-12-10 19:43:52 -08:00
