Mark Otto
38217ee405
Merge branch 'pr/14801'
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
2014-10-25 18:16:40 -07:00
Mark Otto
6e3c55a115
grunt
2014-10-25 18:13:50 -07:00
Mark Otto
a0e6bd96de
grunt
2014-10-25 17:54:06 -07:00
Mark Otto
018c1c0b6e
Merge pull request #14871 from twbs/fix-#14810
...
Move "Copy" button in `code`.
2014-10-25 17:49:13 -07:00
Heinrich Fenkart
e9d6f256c2
grunt
2014-10-26 01:59:25 +02:00
XhmikosR
db550a9235
Run grunt
.
2014-10-25 14:12:21 +03:00
XhmikosR
0ba39d45b4
Move "Copy" button in code.
2014-10-25 01:48:02 +03:00
Mark Otto
80aca8c17e
grunt
2014-10-24 13:27:28 -07:00
Mark Otto
79b38361ab
20px from bottom because the final frontier
2014-10-24 13:26:05 -07:00
Mark Otto
1979a311d4
Merge branch 'master' of github.com:twbs/bootstrap
2014-10-24 13:24:34 -07:00
Mark Otto
23e3995cec
guhrunt
2014-10-24 13:24:28 -07:00
Mark Otto
e631b721ec
Merge pull request #14848 from knownasilya/patch-1
...
Make the docs' nav sidebar scrollable
2014-10-24 13:24:14 -07:00
Heinrich Fenkart
51f1f58be8
grunt
2014-10-23 06:39:51 +02:00
Heinrich Fenkart
9814256736
Merge pull request #14852 from twbs/jquery-version-check
...
Add jQuery version check to existing jQuery presence check
2014-10-23 06:15:36 +02:00
Heinrich Fenkart
1604af041b
Add jQuery version check to existing jQuery presence check
...
Fixes #14809 .
Closes #14825 .
2014-10-23 05:57:15 +02:00
Heinrich Fenkart
e0cea19cbc
grunt
2014-10-23 05:23:29 +02:00
Heinrich Fenkart
40c309b39a
grunt
2014-10-22 21:39:37 +02:00
Heinrich Fenkart
2bc5277b44
grunt
2014-10-22 21:04:18 +02:00
Ilya Radchenko
fb70b13dc3
Allow to scroll the nav
...
Basically it's impossible to use the navigation if it's expanded. This will allow it to be scrollable so that the menus are accessable.
2014-10-22 11:56:12 -04:00
XhmikosR
27478b966b
Run grunt
.
...
[ci skip]
2014-10-22 14:18:18 +03:00
XhmikosR
961ed36f01
Update Holder.js to v2.4.1.
...
[ci skip]
2014-10-22 14:18:13 +03:00
XhmikosR
40ce5670e7
Update JSZip to v2.4.0.
...
[ci skip]
2014-10-22 14:17:48 +03:00
Heinrich Fenkart
930c422f22
grunt
2014-10-22 04:28:16 +02:00
XhmikosR
9f82f27b9d
Update less/print.less to the latest html5 bp version.
...
Also, keep the html5 boilerplate link in the built CSS.
2014-10-13 13:32:39 +03:00
Heinrich Fenkart
4a89fd02b7
grunt
2014-10-10 08:35:56 +02:00
XhmikosR
9299f5dfa2
Run grunt
.
...
[ci skip]
2014-10-09 08:17:56 +03:00
XhmikosR
a1a2dfebb5
Update less.js to v1.7.5.
2014-10-09 08:16:32 +03:00
XhmikosR
924c68f8bb
Update FileSaver.js v2014-08-29.
2014-10-09 08:16:32 +03:00
XhmikosR
7ded2d185d
Update Blob.js to v2014-07-24.
2014-10-09 08:16:31 +03:00
XhmikosR
07f1d89dd2
Run grunt
.
2014-10-07 19:57:01 +03:00
Heinrich Fenkart
5bb08c50fa
grunt
2014-10-03 08:17:49 +02:00
Mark Otto
f75fc32462
grunt
2014-10-02 22:21:02 -07:00
Mark Otto
76268c4b96
more grunt
2014-10-02 21:21:49 -07:00
Mark Otto
f579b66b80
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
docs/assets/js/raw-files.min.js
2014-10-02 21:19:43 -07:00
Mark Otto
12091b9567
Fixes #14711 : Account for list groups in collapsing panels
2014-10-02 21:19:20 -07:00
Heinrich Fenkart
68b80836cf
grunt
2014-10-03 05:20:23 +02:00
Heinrich Fenkart
32162b16cb
grunt
2014-10-01 21:10:33 +02:00
Mark Otto
121b204b14
grunt
2014-09-26 13:48:31 -07:00
Mark Otto
8e25695d09
Fixes #14687 : Include video element in responsive embed
2014-09-26 13:45:28 -07:00
Heinrich Fenkart
0d04dcaebd
grunt
2014-09-26 00:10:41 +02:00
Heinrich Fenkart
7ce6824748
grunt
2014-09-25 02:23:48 +02:00
Mark Otto
4969c2055d
grunt
2014-09-22 14:27:13 -07:00
Heinrich Fenkart
36ebec5e76
grunt
2014-09-22 21:47:24 +02:00
Mark Otto
e33922eb06
grunt
2014-09-18 19:11:47 -07:00
Mark Otto
98b745a06b
grunt
2014-09-18 19:00:30 -07:00
Mark Otto
75204aeafa
grunt
2014-09-18 18:33:52 -07:00
Heinrich Fenkart
5a5cf224e1
grunt
2014-09-16 05:59:09 +02:00
Heinrich Fenkart
16f9529ed1
grunt
2014-09-16 05:40:03 +02:00
Heinrich Fenkart
d0f76e416c
grunt
2014-09-13 04:46:31 +02:00
Heinrich Fenkart
0a4c39dc40
Teh grunt
...
https://www.youtube.com/watch?v=L-4VxEtWyRo
2014-09-13 03:15:04 +02:00
Heinrich Fenkart
0cf94b82ee
grunt
2014-09-13 02:42:18 +02:00
Heinrich Fenkart
cabace78da
G R U N T
2014-09-11 23:43:27 +02:00
Heinrich Fenkart
9b9e2f5d13
grunt and missing new line
2014-09-09 01:23:48 +02:00
Heinrich Fenkart
9702579aeb
run grunt
2014-09-09 00:12:33 +02:00
Heinrich Fenkart
c9602c29c3
grunt
2014-09-08 22:41:45 +02:00
Mark Otto
6cec0399d0
grunt
2014-09-08 11:40:23 -07:00
Mark Otto
f2783fbf83
Fixes #14319 : Prevent jumbotron reflow by ensuring padding of .container isn't interferred with by .jumbotron side padding
2014-09-08 10:29:45 -07:00
Mark Otto
48a1308e5d
grunt
2014-09-08 10:23:25 -07:00
XhmikosR
5b9fcea9f2
Run grunt
.
2014-09-08 09:04:33 +03:00
Mark Otto
551306fe9d
grunt
2014-08-28 17:22:08 -07:00
Mark Otto
783e001786
grunt
2014-08-27 23:35:54 -07:00
Mark Otto
72ddad6fc8
Fixes #14439 : Add static tooltip example to docs
2014-08-27 23:33:03 -07:00
Mark Otto
f4eefd28d1
Merge branch 'master' into sr_friendly_hidden_content
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
2014-08-27 22:38:46 -07:00
Mark Otto
1ebc7e62a8
grunt
2014-08-27 22:37:10 -07:00
Mark Otto
f5890adb17
grunt
2014-08-27 22:25:24 -07:00
XhmikosR
b1bb57360c
Specify cursor: pointer
for #import-manual-trigger
.
2014-08-26 13:12:54 +03:00
Mark Otto
0140198699
grunt
2014-08-23 13:46:28 -07:00
Mark Otto
32a6d9b404
Full grunt
2014-08-23 13:43:41 -07:00
Mark Otto
3c0e2e28f8
fixes #14425 : remove invalid css property
2014-08-23 13:37:29 -07:00
Mark Otto
4fc96e8029
grunt
2014-08-23 13:35:22 -07:00
Mark Otto
6a0eb4e6bd
grunt
2014-08-23 12:19:36 -07:00
Chris Rebert
e7d5905f38
grunt
2014-08-17 15:44:25 -07:00
Chris Rebert
71c2c372f6
Fix #14411 by setting JSON Content-Type for Gist API request
2014-08-17 15:41:53 -07:00
Mark Otto
9096c20021
grunt
2014-08-04 14:05:12 -07:00
XhmikosR
de1d8c36ad
Run grunt
.
2014-08-01 19:49:54 +03:00
Thomas Welton
9739271c04
Add drag and drop config import; closes #11004
...
Closes #13790 by merging a rebased version of it.
2014-07-31 11:45:21 -07:00
Mark Otto
078aafe7fd
Fixes #14221 : Make .form-control-static work in inline forms as well
2014-07-23 20:54:07 -07:00
Mark Otto
463fe476d8
Merge pull request #14166 from hnrch02/docs-cleanup
...
Docs cleanup
2014-07-23 20:39:40 -07:00
XhmikosR
97cb2803d7
Run grunt
.
2014-07-22 08:31:36 +03:00
XhmikosR
caed585033
Update Filesaver.js to v2014-07-21.
2014-07-22 08:29:06 +03:00
XhmikosR
5c569dc4d4
Update Blob.js to the latest version.
2014-07-22 08:29:06 +03:00
XhmikosR
8d435cbb3c
Run grunt
.
2014-07-22 08:25:41 +03:00
Heinrich Fenkart
38335b2a3d
Merge alert examples and add .bs-example-standalone
class
2014-07-17 05:16:48 +02:00
Chris Rebert
b3d068f2d3
regenerate docs/assets/js/docs.min.js
2014-07-15 17:21:39 -07:00
Chris Rebert
11db482371
popover dismiss-on-next-click example: instead of <button>, use <a> w/ tabindex
...
Fixes #14038 .
Research supporting this choice of approach:
https://gist.github.com/cvrebert/68659d0333a578d75372
Why not <button>?
Even with a `tabindex` attribute, they don't gain focus when clicked upon in:
* Mac OS X Firefox 30.0
* Mac OS X Safari 7.0.5
2014-07-15 16:57:54 -07:00
Mark Otto
7a8d9dbdbf
grunt
2014-07-12 18:06:26 -07:00
Mark Otto
fe0ef38898
Fixes #14095 : Add basic styling for captions, which we've for some reason been missing all this time.
2014-07-12 15:55:15 -07:00
Mark Otto
2962f845a5
grunt
2014-07-12 15:47:42 -07:00
Mark Otto
717a50ce19
grunt
2014-07-12 15:37:13 -07:00
Mark Otto
bd292ca3b8
Fixes #14107 : Lighten placeholder text
2014-07-12 15:13:18 -07:00
XhmikosR
94472ee74a
Run grunt
.
2014-07-10 10:03:24 +03:00
XhmikosR
e598247bcc
Update uglify-js to v2.4.15.
2014-07-10 10:02:41 +03:00
XhmikosR
643effe382
Run grunt
.
2014-07-09 10:24:39 +03:00
XhmikosR
d88a837fea
Update uglify-js to v2.4.14.
2014-07-09 10:22:43 +03:00
Mark Otto
2ccbc38685
Cut down on homepage file size; reorg some docs CSS
2014-07-07 19:40:15 -07:00
Chris Rebert
5d1abf8b38
Merge pull request #14036 from twbs/fix-13575
...
Jekyll: Use non-minified assets when not running from GitHub Pages
2014-07-07 19:36:32 -07:00
Mark Otto
9be2bbb5ef
Fixes #14053 : Don't show radio/checkbox in justified button groups
2014-07-06 16:48:41 -07:00
Mark Otto
b44d4ef724
grunt
2014-07-06 15:35:24 -07:00
Mark Otto
e2029e122c
Fixes #13997 : Move min-height for radio/checkbox to their inner label
2014-07-06 15:09:20 -07:00
Mark Otto
354d423668
grunt
2014-07-06 15:08:37 -07:00
Mark Otto
043b40636c
grunt
2014-07-05 20:17:57 -07:00
Mark Otto
d55462fae8
grunt
2014-07-05 20:10:44 -07:00
Mark Otto
3c99de9764
grunt
2014-07-05 19:57:15 -07:00
Chris Rebert
1dc54dc160
use non-minified Bootstrap JS when on non-gh-pages
2014-07-03 13:40:47 -07:00
Chris Rebert
92fd25a2a2
use non-minified docs JS on non-gh-pages
2014-07-03 13:18:44 -07:00
Chris Rebert
b793fbb13a
use non-minified docs CSS on non-gh-pages
2014-07-03 13:12:58 -07:00
Mark Otto
23dd323da1
grunt
2014-07-03 00:57:37 -07:00
Mark Otto
3537481c97
Fixes #12738 again: use max-device-width instead of max-width for .navbar-collapse height in landscape devices
2014-07-03 00:55:32 -07:00
Mark Otto
4f8697cbbb
grunt
2014-07-02 23:44:56 -07:00
XhmikosR
225351431e
Update dependencies.
2014-06-30 18:35:50 +03:00
Mark Otto
018114fc09
Merge pull request #13954 from hnrch02/persist-preview-theme
...
Save "Preview theme" state; resolves #13940
2014-06-28 21:43:04 -07:00
XhmikosR
fec94e1695
Update "grunt-autoprefixer".
2014-06-27 07:38:46 +03:00
Heinrich Fenkart
92ca842830
Save "Preview theme" state; resolves #13940
2014-06-27 02:08:58 +02:00
Chris Rebert
b9527acc45
JSCS hotfix
...
[skip sauce] [skip validator]
2014-06-26 13:01:21 -07:00
Chris Rebert
fde088751a
regenerate docs.min.js
...
[skip sauce]
2014-06-26 12:21:45 -07:00
Chris Rebert
0bc2edd191
add docs JS to activate popover demos; fixes #13937
2014-06-26 12:21:33 -07:00
Chris Rebert
c0b3f18c0c
rm apparent dead code from docs JS
...
.bs-docs-navbar class doesn't seem to be used anywhere at all
2014-06-26 10:53:58 -07:00
Chris Rebert
43ecc8726b
add comment explaining which demos this JS is for
2014-06-26 10:52:12 -07:00
Mark Otto
ff6b279b3c
bump to v3.2.0
2014-06-26 09:13:24 -07:00
Mark Otto
719ebd8239
grunt
2014-06-26 02:49:21 -07:00
Mark Otto
4dcdc08d89
grunt
2014-06-25 23:03:40 -07:00
Mark Otto
4045740c54
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
2014-06-25 16:57:22 -07:00
XhmikosR
4abb095783
Run grunt
.
...
Revert a991cd572c
.
2014-06-25 02:07:17 +03:00
Chris Rebert
a991cd572c
grunt dist; closes #13914
2014-06-24 15:06:47 -07:00
XhmikosR
15c63fa137
Run grunt
.
2014-06-24 19:01:40 +03:00
Chris Rebert
c2c19a4d2d
Revert UMD ( #13772 & friends) for now, due to #13812 .
...
Will hopefully revert this reversion and land a fully-working version of UMD in v3.3.0.
Revert "some changes from #13801 - add strict mode back and =="
This reverts commit 2b302f69ee
.
Revert "Fix regression of #10038 introduced by #13772 "
This reverts commit e9d6756a1a
.
Revert "MD/CommonJS/Globals #12909 "
This reverts commit 1c6fa9010d
.
Revert "address #13811 "
This reverts commit f347d7d955
.
Conflicts:
js/carousel.js
js/collapse.js
js/dropdown.js
js/modal.js
js/tab.js
js/tooltip.js
2014-06-23 11:11:59 -07:00
Mark Otto
8bd4163ad4
fixes #13881 : restore existing striped progress bar behavior with theme styles
2014-06-19 18:14:56 -07:00
Mark Otto
1482947405
grunt
2014-06-19 15:25:50 -07:00
Mark Otto
a4fa8d07c8
grunt dist
2014-06-19 15:24:24 -07:00
Heinrich Fenkart
587451ad9a
Update a few source files to comply to new JSCS rules
2014-06-19 21:08:05 +02:00
XhmikosR
abe7afd87a
Run grunt
.
2014-06-19 12:58:34 +03:00
XhmikosR
0418c7678d
Update JSZip to v2.3.0.
2014-06-19 12:03:10 +03:00
Mark Otto
162a27f67a
grunt
2014-06-18 23:50:16 -07:00
Mark Otto
99f176e7ec
rewrite striped and active to deprecate the parent selectors, change the docs
2014-06-18 22:35:05 -07:00
Mark Otto
d222c21f84
grunt
2014-06-18 22:24:56 -07:00
Mark Otto
74982cf101
grunt
2014-06-18 22:23:31 -07:00
Mark Otto
11cf54f9df
grunt
2014-06-18 18:22:11 -07:00
Mark Otto
fdf174e498
grunt dist
2014-06-18 15:46:38 -07:00
Ross Allen
8c403dc1dc
Darken @gray-light to meet accessibility guidelines
...
`@gray-light` darkens from #999 to #777 , which puts `.text-muted` at the
threshold for the 4.5:1 WCAG minimum contrast[1]. #777:#fff is 4.48:1.
The “Example” headers in docs become #959595 , which is contrast ratio
3:1, the minimum for larger text. Since the headers are less important
than the surrounding text, 3:1 is fine and an improvement on the
previous #bbb:#fff (1.92:1).
Fixes issue #13847 .
[1] http://www.w3.org/TR/UNDERSTANDING-WCAG20/visual-audio-contrast-contrast.html
2014-06-18 14:47:14 -07:00
XhmikosR
6d45f733e5
Run grunt
.
2014-06-18 13:16:32 +03:00
Chris Rebert
f347d7d955
address #13811
2014-06-17 18:53:52 -07:00
Mark Otto
82bd8b6dfd
twerk copy
2014-06-09 23:29:44 -07:00
XhmikosR
1b8935ee95
Run grunt dist
.
2014-06-10 08:30:17 +03:00
XhmikosR
89c0e4d2ab
Update ZeroClipboard to v1.3.5.
...
Also use the official filenames.
2014-06-10 08:30:17 +03:00
XhmikosR
5057e7c7b8
Remove unused variables and make tests pass.
2014-06-10 08:30:17 +03:00
Mark Otto
7d1365ce1c
Refactor and restyle.
2014-06-10 08:30:16 +03:00
soundarapandian
250e021ff1
Integrate ZeroClipboard to easily copy code snippets
2014-06-10 08:30:16 +03:00
Mark Otto
b35840e48d
simpler and updated docs copy for icon font file paths
2014-06-09 21:00:27 -07:00
XhmikosR
41b92b967a
Run grunt
.
...
[ci skip]
2014-06-09 11:10:09 +03:00
XhmikosR
8cdc34f6e3
Update filesaver.js to v2014-05-27.
...
[ci skip]
2014-06-09 11:10:08 +03:00