0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-13 01:08:58 +01:00
Commit Graph

9078 Commits

Author SHA1 Message Date
Mark Otto
26e2d7cdc9 grunt 2014-02-08 16:13:30 -08:00
Mark Otto
b6444c6472 Merge pull request #12552 from stoudenmire/carousel-icon-classname-fix
Fixes two typos in carousel.less
2014-02-08 16:03:25 -08:00
Mark Otto
e3cfd5821d Merge branch 'master' into pr/12462
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-08 16:01:56 -08:00
Mark Otto
842af44fcc Merge branch 'pr/12579' 2014-02-08 15:53:18 -08:00
Mark Otto
866c52b928 grunt 2014-02-08 15:51:38 -08:00
XhmikosR
5d8491ac9f Merge pull request #12655 from twbs/holder.js
Update holder.js to v2.3.1.
2014-02-09 01:48:13 +02:00
Mark Otto
06e6affa4a Merge pull request #12645 from ZDroid/docs-js-semicolons
Omit semicolons consistently in docs
2014-02-08 15:46:51 -08:00
Mark Otto
b683433f67 grunt 2014-02-08 15:44:13 -08:00
Mark Otto
c8315edd73 Merge branch 'master' into pr/12639
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-08 15:37:35 -08:00
Mark Otto
91b76e5247 Merge pull request #12659 from ZDroid/blockquote-font-size
Fix #12656: add @blockquote-font-size
2014-02-08 15:24:43 -08:00
Chris Rebert
7ef1bebb55 Merge pull request #12632 from ZDroid/exclude-jade
Exclude jade files from docs
2014-02-08 13:34:36 -08:00
Zlatan Vasović
938779ca93 Move jade files to docs/jade/ 2014-02-08 22:29:06 +01:00
Zlatan Vasović
4c16360036 Fix #12656: add @blockquote-font-size 2014-02-08 22:12:18 +01:00
XhmikosR
c3cb63b69f Update holder.js to v2.3.1.
Fix #12653.
2014-02-08 18:19:39 +02:00
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