Mark Otto
b18d3fb80f
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-04 22:34:25 -08:00
Mark Otto
45930acdf7
Fixes #11610 : Add @grid-float-breakpoint-max to better link navbar behavior across viewports and improve customization.
...
Also addresses #10371 , #10395 , and #10465 .
2013-12-04 22:32:56 -08:00
Mark Otto
42bee1ddd5
Merge pull request #11671 from XhmikosR/updates
...
Update 3rd party asset libraries
2013-12-04 21:58:00 -08:00
Mark Otto
cf81cb60ef
Merge branch 'master' into gradient-prefix-cleanup
...
Conflicts:
dist/css/bootstrap.min.css
docs-assets/js/raw-files.js
2013-12-04 21:23:09 -08:00
Mark Otto
8c5dc542a5
grunt
2013-12-04 21:22:24 -08:00
Mark Otto
a45d839874
Fixes #11712 : Better support for .table-responsive within .panel's
2013-12-04 21:13:33 -08:00
Mark Otto
66f9c7d6d5
Fixes #11436 : mention in docs that .container isn't nestable; update docs to mention width, not max-width
2013-12-04 21:10:13 -08:00
Mark Otto
dd28ecd0d5
Merge pull request #11710 from JoahG/bootstrap-thumb
...
Updates Jumbotron thumbnail
2013-12-04 20:45:57 -08:00
Chris Rebert
02df15db56
Merge pull request #11709 from mdxs/patch-1
...
Dropping unused variable in dropdown.js
2013-12-04 10:50:50 -08:00
Cyrus Stoller
4031f5ee82
Add a migration tip for .label-important to .label-danger
2013-12-04 10:42:58 -08:00
Joah Gerstenberg
89061b0517
Updates Bootstrap thumbnail
2013-12-04 06:26:12 -06:00
mdxs
f7d21d6919
Dropping unused variable in dropdown.js
...
Dropping an unused variable in the Dropdown function inside the `dropdown.js` code.
There are no new/changed unit tests, as there are no feature/bug changes requiring new test cases.
For the record: I agree to dual-license this contribution under the Apache 2 and MIT licenses.
2013-12-04 11:15:48 +01:00
Chris Rebert
7b945ad296
Merge pull request #11705 from cyrusstoller/migration-guide
...
Add a migration tip for .label to .label-default
2013-12-04 00:51:13 -08:00
Cyrus Stoller
149e7efb51
Add a migration tip for .label to .label-default
2013-12-04 00:41:05 -08:00
Mark Otto
a42e9163cb
Merge branch 'master' into responsive-visibility-table
...
Conflicts:
dist/css/bootstrap.min.css
2013-12-03 22:58:25 -08:00
Mark Otto
ed0d556847
Merge pull request #11697 from twbs/btn-xs-10979
...
fix .btn-group-xs portion of #10979
2013-12-03 22:55:11 -08:00
Chris Rebert
f8e0f16663
fix broken link in CONTRIBUTING.md
2013-12-03 22:08:26 -08:00
Chris Rebert
ed2360d05e
Merge pull request #11701 from twbs/sauce-labs
...
switch to Sauce Labs for our cross-browser JS unit testing needs
2013-12-03 21:58:43 -08:00
Chris Rebert
bd9332a58a
switch to Sauce Labs for our cross-browser JS unit testing needs
...
Fixes #11087
2013-12-03 21:57:22 -08:00
kostyatretyak
7472c01ce2
Corrected a small error in the documentation
2013-12-04 06:21:54 +02:00
Chris Rebert
1d20611d54
fix invalid HTML in components.html
...
type="button" doesn't make sense for an <a>
2013-12-03 20:10:55 -08:00
Chris Rebert
4a45650026
fix .btn-group-xs portion of #10979
2013-12-03 18:03:04 -08:00
awebdeveloper
3f1e4b92ee
-moz and old webkit syntax removed for gradients based on
...
http://caniuse.com/#search=grad
2013-12-03 14:13:55 -08:00
Chris Rebert
303f8a33c3
add <table> case to responsive-visibility mixin; see #10056
2013-12-03 13:57:28 -08:00
Chris Rebert
bac153127c
grunt
2013-12-03 13:54:56 -08:00
Chris Rebert
2d4ee18162
add comment regarding #11598
2013-12-03 13:31:47 -08:00
Chris Rebert
018a1d535b
Merge pull request #11691 from twbs/xs-grid-docs-fix
...
document that XS grid supports offsets and push/pull
2013-12-03 11:28:57 -08:00
Chris Rebert
7a9d9f7dc4
account for #11050 in the docs
2013-12-03 11:22:56 -08:00
Chris Rebert
199872418c
reference root issue in explanatory comment
2013-12-03 11:14:13 -08:00
Chris Rebert
f2dab82d30
add .gitattributes file to enforce Unix newlines within the repo
2013-12-03 11:06:31 -08:00
Tobias Lindig
5a826a65b2
Gruntfile.js: Set line feed char to '\n' to get same result on all platforms.
2013-12-03 10:49:37 -08:00
Chris Rebert
a7ceefc41b
Merge pull request #11690 from lipis/patch-2
...
Get rid of empty line before the last closing bracket
2013-12-03 10:44:15 -08:00
Lipis
92a624a31c
Get rid of empty line before the last closing bracket
2013-12-03 15:03:07 +01:00
Haley
3a65b2c11f
Added text-justify class to type.less
2013-12-02 13:29:54 -06:00
XhmikosR
b8928340f4
Update filesaver.js to the latest git.
2013-12-02 14:15:57 +02:00
XhmikosR
c56e63e967
Update jszip.js to the latest git.
2013-12-02 14:13:10 +02:00
XhmikosR
4392d43d7c
Update holder.js to v2.2.
2013-12-02 14:12:57 +02:00
Zlatan Vasović
2b56ff0461
Reduce size of the visibility styles
2013-12-02 07:50:17 +01:00
Mark Otto
cc6951fa15
Merge pull request #10662 from kevinlisota/thumbnail-images
...
add responsive CSS to hyperlinked images when thumbnail caption markup used
2013-12-01 21:18:41 -08:00
Mark Otto
b636756e53
Merge pull request #11667 from neilhem/master
...
replace double quotation marks with single in code examples
2013-12-01 20:48:43 -08:00
Rakhat Jabagin
ab73ff1828
replace double quotation marks with single in code examples
2013-12-02 10:39:53 +06:00
Mark Otto
4876cbeef8
Merge branch 'master' into pr/11412
...
Conflicts:
dist/js/bootstrap.min.js
2013-12-01 20:27:30 -08:00
Mark Otto
1444a3ca63
grunt dist
2013-12-01 20:27:14 -08:00
Mark Otto
37e46ec2b8
add comment
2013-12-01 20:27:09 -08:00
Mark Otto
561aff7942
Merge pull request #11499 from bassjobsen/patch-3
...
fix navbar dropdown window resize bug
2013-12-01 20:18:40 -08:00
Mark Otto
8a74264344
bump version numbers to 3.0.3
2013-12-01 19:31:52 -08:00
Mark Otto
118e901eb1
grunt
2013-12-01 19:30:10 -08:00
Mark Otto
5a0365524d
Rework navbar padding and margins for right aligned last-child elements
...
This slight reworking of the navbar spacing was brought about by a
problem noted in #11530 : use of `.navbar-form.navbar-right` leaves an
extra 15px of space on the right.
Here’s what’s new:
* Removed the `padding` on `.navbar-collapse` within static top, fixed
top, and fixed bottom navbars. Meaning, it’s still there for the
default navbar. This was the root cause of the extra 15px padding for
navbar forms.
* As part of this, I also replaced the existing negative margin
overrides for last-child elements with more contextual ones within
their sub-components.
Overall not too different, but should be more effective now and easier
to work with now.
For example of new changes, see http://jsbin.com/odeSiSo/1/ .
2013-12-01 19:27:33 -08:00
Mark Otto
25bc5322aa
grunt
2013-12-01 18:35:58 -08:00
Mark Otto
d417fcecea
Fixes #11357 : Vertically center sm and xs buttons in the navbar
2013-12-01 18:13:27 -08:00
