Mark Otto
d6b0f45fb7
Merge branch 'master' into derp
...
Conflicts:
Gruntfile.js
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.css.map
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_includes/components/dropdowns.html
docs/_includes/components/media.html
docs/_includes/components/navs.html
docs/_includes/components/progress-bars.html
docs/_includes/components/responsive-embed.html
docs/_includes/css/buttons.html
docs/_includes/css/forms.html
docs/_includes/css/less.html
docs/_includes/css/overview.html
docs/_includes/css/responsive-utilities.html
docs/_includes/customizer-variables.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/getting-started/grunt.html
docs/_includes/getting-started/template.html
docs/_includes/header.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/dropdowns.html
docs/_includes/js/modal.html
docs/_includes/js/popovers.html
docs/_includes/js/scrollspy.html
docs/_includes/js/tabs.html
docs/_includes/js/tooltips.html
docs/_includes/nav/components.html
docs/_includes/nav/getting-started.html
docs/_layouts/default.html
docs/about.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
docs/assets/js/raw-files.min.js
docs/browser-bugs.html
docs/components.html
docs/components/navbar.md
docs/css.html
docs/dist/css/bootstrap-theme.css
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap-theme.min.css
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/examples/blog/index.html
docs/examples/carousel/index.html
docs/examples/cover/index.html
docs/examples/dashboard/index.html
docs/examples/grid/index.html
docs/examples/jumbotron-narrow/index.html
docs/examples/jumbotron/index.html
docs/examples/justified-nav/index.html
docs/examples/navbar-fixed-top/index.html
docs/examples/navbar-static-top/index.html
docs/examples/navbar/index.html
docs/examples/non-responsive/index.html
docs/examples/offcanvas/index.html
docs/examples/signin/index.html
docs/examples/starter-template/index.html
docs/examples/sticky-footer-navbar/index.html
docs/examples/sticky-footer/index.html
docs/examples/theme/index.html
docs/examples/tooltip-viewport/index.html
docs/getting-started.html
docs/javascript.html
docs/migration.html
less/_animation.less
less/_modal.less
less/_navbar.less
less/_variables.less
less/glyphicons.less
less/navs.less
less/panels.less
less/progress-bars.less
2014-10-26 22:31:59 -07:00
Mark Otto
66bb0b4fc9
Merge branch 'master' into need-to-activate-animated-progressbar
2014-10-26 14:43:32 -07:00
Mark Otto
05c785bfae
grunt
2014-10-26 14:42:06 -07:00
Heinrich Fenkart
66e140db82
Docs: progress bars' animation now needs to be manually toggled
...
Refs #14409
2014-10-26 20:43:41 +01:00
Daniel Juhl
b171451d77
Added link to danish translation of docs
2014-10-26 15:04:37 +01:00
XhmikosR
bab3679d10
Losslessly compress apple-touch-icon.png.
...
6314 -> 6140 bytes
[ci skip]
2014-10-26 08:08:33 +02:00
Mark Otto
743aaf6100
fix clipboard button and examples
2014-10-25 22:39:01 -07:00
Mark Otto
5eb08f5d8d
Merge pull request #14748 from twbs/apple-touch-icon
...
Docs: Use a 180x180 apple-touch-icon-precomposed.png.
2014-10-25 21:02:08 -07:00
Mark Otto
af2fe1d76b
new icon
2014-10-25 20:49:10 -07:00
Heinrich Fenkart
2cbb1d9374
grunt
2014-10-26 04:39:49 +01:00
Mark Otto
783eced7ab
follow up fix for #14837 /cc @hnrch02
2014-10-25 20:20:24 -07:00
Heinrich Fenkart
5f2e6fa58b
grunt
2014-10-26 03:53:10 +01:00
Heinrich Fenkart
44cc763229
grunt
2014-10-26 03:17:19 +01:00
Mark Otto
2c2564faef
Fixes #14736 : Reverts the remaining progress bar min value overrides from #12848
2014-10-25 19:10:03 -07:00
Mark Otto
3fcd65af41
Fixes #14806 : reset the text-shadow in the themed buttons
2014-10-25 18:57:27 -07:00
Mark Otto
dbef67f198
fix validation
2014-10-25 18:53:43 -07:00
Mark Otto
e795ea1084
Fixes #14791 : document dropdown dividers
2014-10-25 18:44:55 -07:00
Mark Otto
9bf9aab132
grunt
2014-10-25 18:29:15 -07:00
Mark Otto
75620dadcc
Merge branch 'master' of github.com:twbs/bootstrap
2014-10-25 18:28:07 -07:00
Mark Otto
41a26ced24
Fixes #14814 : Use the link active bg variables for theme navbar gradients
2014-10-25 18:27:40 -07:00
Cameron Little
0755d529c6
Tabs plugin accessibility
...
Added support for `aria-expanded` toggling via JavaScript. Added
`aria-controls`, `aria-expanded`, `aria-labelledby` to tabs docs.
Added `aria-expanded` unit test for the tabs plugin.
See also #13554 .
Closes #14154 by merging it.
2014-10-26 02:25:47 +01:00
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
Mark Otto
dbd45f2f6c
Merge pull request #14857 from twbs/fix-14856
...
Fix #14856
2014-10-24 12:09:44 -07:00
Jenn Dodd
e8643ed8b3
Remove .media-object from docs.
...
Signed-off-by: Geoff Pleiss <gpleiss@pivotal.io>
2014-10-23 18:48:50 -04:00
Nicole Sullivan
919b4ccb15
Fixes #14799 : Add vertical alignment of image in media component
...
Signed-off-by: Jenn Dodd <jedodd@pivotal.io>
2014-10-23 18:48:18 -04:00
XhmikosR
f33ed634fc
Docs: Use a 180x180 apple-touch-icon.png.
...
Refs:
1c4fcf3214345925f043
2014-10-23 09:17:27 +03:00
XhmikosR
41dbc53b9b
Fix a small typo in comment.
...
[ci skip]
2014-10-23 09:11:12 +03: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
Chris Rebert
57e4b58782
Merge pull request #14859 from twbs/fix-14853
...
Clarify order of tabs events
2014-10-22 18:57:43 -07:00
Chris Rebert
b421dc9490
Clarify order of tabs events; fixes #14853
...
[skip sauce]
2014-10-22 18:38:18 -07:00
Chris Rebert
8d806b0ae5
Document .alert-dismissible .close restrictions; fixes #14802
...
[skip sauce]
2014-10-22 18:05:42 -07:00
Chris Rebert
58143b128b
Fix #14856
...
[skip sauce]
2014-10-22 17:53:59 -07:00
Phil Hughes
ab8dbc214e
Implement hide and hidden events for tabs
...
Closes #14772 .
2014-10-22 21:42:35 +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
Patrick H. Lauke
e1d40f7633
Add aria-pressed to single toggle buttons
...
also includes tiny fix/clarification to two existing unit tests for the
.active class, adding data-toggle=“button” explicitly to the tested
buttons
Closes #14819 .
2014-10-22 21:02:19 +02:00
