77eaa808db
tweak phrasing for hopefully greater clarity
2014-02-10 10:12:28 -08:00
dc79fecacd
add copyright header to shrinkwrap.js; fixes #12643
2014-02-10 10:06:33 -08:00
535cd57537
Merge pull request #12671 from Quy/master
...
Update docs prefixing
2014-02-09 22:04:01 +01:00
477cf1396d
Update docs prefixing
2014-02-09 12:41:47 -08:00
d5f0ccba2b
Merge pull request #12668 from Quy/master
...
Reorder links
2014-02-09 19:50:54 +01:00
8dab75d408
Reorder links
2014-02-09 09:18:11 -08:00
0d49920e0d
Fixes #12610 : Better and more consistent prefixing of docs CSS with .bs-docs-
2014-02-08 23:24:38 -08:00
769339ed18
grunt dist
2014-02-08 17:30:40 -08:00
41841c99c4
Merge branch 'master' of github.com:twbs/bootstrap
2014-02-08 17:29:25 -08:00
44bb7b20c7
Fixes #12625 : Only remove first list group item's top and last list group item's bottom borders when the list group is first or last
2014-02-08 17:29:10 -08:00
13b4e7a1a8
Mention limitation of form validation feedback icons with input groups
2014-02-08 17:19:45 -08:00
2365717a3d
Merge pull request #12433 from tagliala/list-inline-first-element-fix
...
Fix first element padding of list-inline
2014-02-08 16:59:59 -08:00
65b10706b3
brace position
2014-02-08 16:56:59 -08:00
e9199718d6
Merge branch 'master' into fix-12154
...
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:52:22 -08:00
7f88009394
grunt
2014-02-08 16:43:58 -08:00
26e2d7cdc9
grunt
2014-02-08 16:13:30 -08:00
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
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
842af44fcc
Merge branch 'pr/12579'
2014-02-08 15:53:18 -08:00
866c52b928
grunt
2014-02-08 15:51:38 -08:00
5d8491ac9f
Merge pull request #12655 from twbs/holder.js
...
Update holder.js to v2.3.1.
2014-02-09 01:48:13 +02:00
06e6affa4a
Merge pull request #12645 from ZDroid/docs-js-semicolons
...
Omit semicolons consistently in docs
2014-02-08 15:46:51 -08:00
b683433f67
grunt
2014-02-08 15:44:13 -08:00
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
91b76e5247
Merge pull request #12659 from ZDroid/blockquote-font-size
...
Fix #12656 : add @blockquote-font-size
2014-02-08 15:24:43 -08:00
7ef1bebb55
Merge pull request #12632 from ZDroid/exclude-jade
...
Exclude jade files from docs
2014-02-08 13:34:36 -08:00
938779ca93
Move jade files to docs/jade/
2014-02-08 22:29:06 +01:00
4c16360036
Fix #12656 : add @blockquote-font-size
2014-02-08 22:12:18 +01:00
c3cb63b69f
Update holder.js to v2.3.1.
...
Fix #12653 .
2014-02-08 18:19:39 +02:00
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
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
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
a2f08158d0
Nuke shit I added in 4d7b2ddba9 that shouldn't come until v4
2014-02-07 15:44:50 -08:00
b61d12ff17
Fix wrong id
2014-02-07 23:21:32 +01:00
f07423511d
Merge pull request #12648 from ZDroid/index.html-only
...
Replace wildcard with file name
2014-02-07 12:44:51 -08:00
54aece3458
Replace wildcard with file name
2014-02-07 20:48:12 +01:00
bdf9ce4c45
Omit semicolons consistently in docs
2014-02-07 19:31:08 +01:00
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
442043e775
Merge pull request #12637 from ZDroid/text-truncate-typo
...
Fix .text-truncate() typo
2014-02-07 09:28:08 -08:00
a0052b5a37
Drop -o-user-select
2014-02-07 14:14:32 +01:00
6db1a3f909
Fix .text-truncate() typo
2014-02-07 13:40:32 +01:00
aead10fafa
Avoid setting jshint node: true in every Grunt JS file
2014-02-07 13:34:17 +01:00
4d7b2ddba9
Fixes #12486 : Restore full width inputs for input groups in inline forms and navbars
2014-02-07 02:58:10 -08:00
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
d91d9b0ade
Fixes #12447 : Properly reset borders on table cells in panels
2014-02-07 02:38:01 -08:00
3ccc16cad0
grunt for days
2014-02-07 02:24:37 -08:00
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
da43f97be1
Override iOS search input's extra round corners
2014-02-07 02:08:32 -08:00
c399bfb015
Fixes #12477 : Clarify IE support in docs
2014-02-07 01:49:12 -08:00
a9b964b9c3
Merge branch 'master' of github.com:twbs/bootstrap
2014-02-07 01:41:46 -08:00
Chris Rebert