Mark Otto
dc34c8a206
Merge pull request #11738 from XhmikosR/min-assets
...
Minify docs-assets too.
2013-12-06 11:27:19 -08:00
Chris Rebert
e90e602b53
Merge pull request #11742 from vincentchan/master
...
Added link to Bootstrap in French (in about.html)
2013-12-06 09:44:15 -08:00
Chris Rebert
5e8db4ad11
Merge pull request #11740 from XhmikosR/trailing-spaces
...
Remove trailing spaces
2013-12-06 09:42:39 -08:00
Luke Noel-Storr
b92bee99ef
reverted changes in commit 96109d3
which seemed to break conditional classes in striped tables (ignoring the comment above that the previous rules were needed for just this purpose)
...
fixes issue twbs/bootstrap#11728
2013-12-06 14:11:58 +00:00
Bohdan Ganicky
9ce7e5620c
Updated .scale() mixin so that it accepts optional vertical scale factor parameter.
2013-12-06 14:09:55 +01:00
XhmikosR
5e2ef69e1c
Use a space before functions' bracket consistently.
2013-12-06 12:43:48 +02:00
XhmikosR
4aad52797c
Use a space after function consistently.
2013-12-06 12:43:48 +02:00
Vincent Chan
b9ae594ca4
Adding Bootstrap in French
2013-12-06 18:33:20 +08:00
XhmikosR
68a6e57b15
bower.json: remove trailing spaces.
2013-12-06 11:32:57 +02:00
XhmikosR
3de4f23ea2
Minify docs-assets too.
2013-12-06 11:25:29 +02:00
Chris Rebert
7b06538c91
Merge pull request #11723 from stof/patch-1
...
Added the removal of tab-content and tab-pane in the migration guide
2013-12-05 16:53:15 -08:00
Chris Rebert
3b75d64767
Merge pull request #11733 from KostyaTretyak/edit
...
Fixed some errors in the documentation
2013-12-05 16:50:03 -08:00
kostyatretyak
dde53a56e0
This is error?
2013-12-06 02:28:42 +02:00
Derek Kent
b8b250a5d2
Don't exclude fonts from bower installs
...
Excluding fonts/ from bower installs causes glyphicons to be
unavailable to projects using development Bootstrap LESS files.
2013-12-05 19:05:32 -05:00
kostyatretyak
4ec13704d2
Fixed another small error
2013-12-06 02:03:35 +02:00
kostyatretyak
3ae7e0afe9
Merge branch 'master' of https://github.com/twbs/bootstrap into edit
2013-12-06 01:36:53 +02:00
Christophe Coevoet
813a4fafb6
Added the removal of tab-content and tab-pane in the migration guide
2013-12-05 17:45:22 +01:00
Mark Otto
6d03173a1a
Merge pull request #11718 from KostyaTretyak/once
...
Added link to Ukrainian translation website (in about.html)
2013-12-05 08:09:10 -08:00
Lukáš Doležal
6e9efb2024
Use document scroll height instead of offset height to support body with absolute height
2013-12-05 16:28:31 +01:00
kostyatretyak
c7e45fa4a7
Added links to Ukrainian translation website
2013-12-05 12:33:55 +02:00
Mark Otto
aac4f0189e
one last grunt
2013-12-04 22:54:03 -08:00
Mark Otto
0a5aa8e0a3
Merge pull request #11714 from ZDroid/redundant-comment
...
Remove redundant, duplicate comment
2013-12-04 22:52:12 -08:00
Zlatan Vasović
01afe84b31
Remove redundant, duplicate comment
2013-12-05 07:43:50 +01:00
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