Chris Rebert
8f7170abd0
disable BrowserStack tests due to flakiness
...
Running "browserstack_runner" task
Using config: /home/travis/build/twbs/bootstrap/browserstack.json
Launching server on port: 8888
Downloading tunnel jar to `/home/travis/build/twbs/bootstrap/node_modules/browserstack-runner/lib/BrowserStackTunnel.jar`
Launching tunnel
Error: Invalid or corrupt jarfile /home/travis/build/twbs/bootstrap/node_modules/browserstack-runner/lib/BrowserStackTunnel.jar
[Runner alert] Tunnel launch timeout
Exiting
Non existent tunnel
2014-02-07 18:51:32 -08:00
Mark Otto
c3f8456414
Merge pull request #12633 from twbs/panels_and_tables
...
Properly reset borders on table cells in panels
2014-02-07 18:50:41 -08: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
Julian Thilo
b61d12ff17
Fix wrong id
2014-02-07 23:21:32 +01:00
Chris Rebert
f07423511d
Merge pull request #12648 from ZDroid/index.html-only
...
Replace wildcard with file name
2014-02-07 12:44:51 -08:00
Zlatan Vasović
54aece3458
Replace wildcard with file name
2014-02-07 20:48:12 +01:00
Zlatan Vasović
bdf9ce4c45
Omit semicolons consistently in docs
2014-02-07 19:31:08 +01:00
Chris Rebert
532f1d9097
Merge pull request #12636 from ZDroid/grunt-jshintrc
...
Avoid setting `jshint node: true` in every Grunt JS file
2014-02-07 09:36:39 -08:00
Chris Rebert
442043e775
Merge pull request #12637 from ZDroid/text-truncate-typo
...
Fix .text-truncate() typo
2014-02-07 09:28:08 -08:00
Bas Bosman
a0052b5a37
Drop -o-user-select
2014-02-07 14:14:32 +01:00
Zlatan Vasović
6db1a3f909
Fix .text-truncate() typo
2014-02-07 13:40:32 +01:00
Zlatan Vasović
aead10fafa
Avoid setting jshint node: true
in every Grunt JS file
2014-02-07 13:34:17 +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
cae76171d0
Follow up to 1bdd59b18c2d1b2409d0422a60e8c007053202df, to better position the sidebar so the potential scrollbar doesn't get hidden by the navbar
2014-02-07 02:44:04 -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
3ccc16cad0
grunt for days
2014-02-07 02:24:37 -08:00
Mark Otto
6814393c9a
Merge pull request #12629 from twbs/search_inputs_ios
...
Override iOS search input's extra round corners
2014-02-07 02:13:39 -08:00
Mark Otto
da43f97be1
Override iOS search input's extra round corners
2014-02-07 02:08:32 -08:00
Mark Otto
c399bfb015
Fixes #12477 : Clarify IE support in docs
2014-02-07 01:49:12 -08:00
Mark Otto
a9b964b9c3
Merge branch 'master' of github.com:twbs/bootstrap
2014-02-07 01:41:46 -08:00
Mark Otto
2865fde67f
Fixes #12590 : Add Korean translation link
2014-02-07 01:41:04 -08:00
Mark Otto
b4aaf04b3f
Merge pull request #12319 from twbs/address-12007
...
Clarify target of dropdown events
2014-02-07 01:39:00 -08:00
Mark Otto
16bbcd7aff
clarify comment
2014-02-07 01:33:27 -08:00
Mark Otto
4f9cdefab7
consistency
2014-02-07 01:31:42 -08:00
Mark Otto
f83b201007
Fixes #12526 : Add scrollbars when necessary to the Dashboard example's sidebar
2014-02-07 01:27:07 -08:00
Mark Otto
228d4e59fc
Fixes #12555 : Rearrange variables to place grids and containers closer
2014-02-07 01:22:30 -08:00
Mark Otto
3b4b9a7fe5
Fixes #12614 : Add progress bar example with visible label
2014-02-07 01:16:34 -08:00
Mark Otto
ebd132ce68
Fixes #12611 : Mention limitation of one plugin's data attributes per element
2014-02-07 01:10:21 -08:00
Mark Otto
77d160151f
Merge pull request #12497 from twbs/container-fluid-is-now-a-thing
...
rm DIY full-width callout now that there's .container-fluid
2014-02-07 00:48:25 -08:00
Mark Otto
91595d38f3
property order because @zdroid <3
2014-02-06 19:34:46 -08:00
Mark Otto
b124c4a6a4
Merge pull request #12620 from twbs/thumbnail-extend
...
use :extend in thumbnail Less
2014-02-06 19:32:31 -08:00
Mark Otto
42d7479dbf
Merge pull request #12502 from ZDroid/moz
...
Remove redundant :-moz-placeholder styles
2014-02-06 19:31:29 -08:00
Mark Otto
ace0abfdb6
Merge branch 'master' into thumbnail-extend
...
Conflicts:
dist/css/bootstrap.css
2014-02-06 18:52:03 -08:00
Mark Otto
596495c89b
Merge pull request #12621 from twbs/carousel-img-responsive-extend
...
use :extend(.img-responsive) in Carousel's Less
2014-02-06 18:49:21 -08:00
Chris Rebert
7c1511502e
use :extend(.img-responsive) in Carousel's Less
2014-02-06 15:52:26 -08:00
Chris Rebert
fda8d91c86
use :extend in thumbnail Less
2014-02-06 15:42:54 -08:00
Chris Rebert
651b289e26
Merge pull request #12613 from twbs/sized-btn-group-extend
...
use Less' extend feature in btn-group-lg etc.
2014-02-06 15:12:14 -08:00
XhmikosR
ef25676f6f
Merge pull request #12616 from twbs/jszip
...
Update jzip to v2.1.0.
2014-02-06 23:35:15 +02:00
XhmikosR
5769b776e5
bs-raw-files-generator.js: use the global directive to define the btoa
variable.
2014-02-06 23:34:02 +02:00
XhmikosR
aae64a9eba
Update jzip to v2.1.0.
2014-02-06 23:10:37 +02:00
XhmikosR
119ed54bd1
Merge pull request #12605 from ZDroid/license-object
...
Use license object instead of licenses array
2014-02-06 21:04:36 +02:00
Chris Rebert
37c21a3ac7
use Less' extend feature in btn-group-lg etc.
2014-02-06 10:59:04 -08:00
Chris Rebert
87219cfeca
Merge pull request #12612 from ZDroid/grunt-path
...
Update grunt paths
2014-02-06 10:42:01 -08:00
Zlatan Vasović
9bb5c319b8
Update grunt paths
2014-02-06 19:39:45 +01:00
Zlatan Vasović
96fd2dca02
Use license object instead of licenses array
2014-02-06 11:37:39 +01:00
Supergibbs
08ff305ed7
Added border radiuses to table when in a panel. Fixes #12461
2014-02-05 14:29:23 -08:00
Mark Otto
7eb532262f
Merge pull request #12465 from XhmikosR/docs-img
...
Docs: losslessly compress images.
2014-02-05 14:11:46 -08:00
Mark Otto
81d9a46dcd
Merge pull request #12534 from Techwraith/patch-1
...
Allow the bootstrap package in npm to expose css and less
2014-02-05 13:54:53 -08:00
Mark Otto
f16a2376c1
add basic back to top link to docs sidenavs, fixes #12589
2014-02-05 13:46:24 -08:00