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
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
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
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
Mark Otto
33160d5043
Fixes #9927 : Update non-responsive example to prevent .navbar-collapse border from increasing height and increase specificity of nav selectors to keep dropdowns looking the same
2013-12-01 18:06:57 -08:00
Mark Otto
948da5ce9a
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-01 17:25:37 -08:00
Mark Otto
dd05c0e0a7
fixes #11508 : mention in docs that inline forms only work at 768px and up
2013-12-01 13:51:17 -08:00
Mark Otto
17dee30892
Merge pull request #11662 from ZDroid/deprecation-fix
...
Use mixin instead of whole code
2013-12-01 11:16:17 -08:00
Mark Otto
556d6cef3e
Fixes #10941 : Fix Glyphicons path for those importing bootstrap.less from another directory
2013-12-01 00:20:47 -08:00
Zlatan Vasović
ed29a99df4
Use mixin instead of whole code
2013-12-01 09:18:27 +01:00
Mark Otto
8dfe93d0b9
Add docs example to go with #11536
2013-11-30 23:38:39 -08:00
Mark Otto
53047fa587
Merge branch 'master' into pr/11536
...
Conflicts:
dist/css/bootstrap.min.css
2013-11-30 23:35:56 -08:00
Mark Otto
57070dcf45
grunt
2013-11-30 23:35:08 -08:00
Mark Otto
48269dcd28
Fixes #11658 : Increase min-height of .radio and .checkbox for horizontal forms to ensure alignment of content below
2013-11-30 23:17:43 -08:00
Mark Otto
841da88f3f
Remove browser default top margin from dl elements
2013-11-30 23:08:41 -08:00
Mark Otto
cf40b5db60
Fixes #11623 : Reset position to static for grid columns within tables to unfuck borders in IE9/10 and Firefox
2013-11-30 23:04:55 -08:00
Mark Otto
c6244a94d0
Shorten sticky footer examples footer content to prevent wrapping
2013-11-30 22:41:43 -08:00
Mark Otto
22da6fcfb2
grunt
2013-11-30 21:17:53 -08:00
Mark Otto
a127f3921e
Fixes #10716 : Update what's included docs to add info on both download options
2013-11-30 21:05:39 -08:00
Mark Otto
ed98ac7560
Merge branch 'master' of github.com:twbs/bootstrap
2013-11-30 16:37:49 -08:00
Mark Otto
6bc09dd949
Fixes #11268 : Account for badges within buttons by matching background to text color and text color to background
2013-11-30 16:29:52 -08:00
Mark Otto
5283e518cc
Merge pull request #11217 from ZDroid/nest
...
Add quick fix to labels and badges in buttons
2013-11-30 16:26:38 -08:00
Mark Otto
359ac8f66a
grunt
2013-11-30 16:21:19 -08:00
Mark Otto
67d4e3323d
Fixes #11277 : Drop the abbr element from the .initialism selector
2013-11-30 16:18:07 -08:00
Mark Otto
9bbdb87150
Fixes #11420 : Update migration guide on split of .visible-/.hidden-desktop into .visible-/.hidden-md and .visible-/.hidden-lg
2013-11-30 16:16:24 -08:00
