rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-03 15:24:19 +01:00
Code Issues Actions Packages Releases Activity
10,800 Commits 108 Branches 89 Tags 547 MiB
c213ff820a
Commit Graph

5010 Commits

Author SHA1 Message Date
Chris Rebert
5ba5200195 move carousel accessibility callout next to rest of callouts 2014-11-11 19:29:56 -08:00
Chris Rebert
3b2d1570fa move single-toggle button plugin callout before example for consistency 2014-11-11 19:26:10 -08:00
Heinrich Fenkart
56f4156126 Merge pull request #15087 from patrickhlauke/dropdown-accessibility-tweaks 
Wash-up of some stray dropdown examples
 2014-11-12 01:19:39 +01:00
Patrick H. Lauke
0681971c8a Wash-up of some stray dropdown examples 
adding explicit aria-expanded="false" initial state (so they're
correctly announced by AT as being collapsed), and - in the case of
old-school use of <a> - role="button"
 2014-11-11 23:52:52 +00:00
Mark Otto
2006a435d9 Merge pull request #15077 from jayanthkoushik/issue-15076-fix 
Fix Issue #15076.
 2014-11-11 15:47:01 -08:00
Patrick H. Lauke
9391ef207f aria-hidden added to some stray glyphicons 
plus minor tweak to customizer's generated alerts
 2014-11-11 22:41:21 +00:00
Patrick H. Lauke
eb580f739c Improved accessible glyphicon advice/use 
...to actually make it consistent with what I said in the glyphicon docs
section...
 2014-11-11 22:13:25 +00:00
Jayanth Koushik
917decab6c Fix Issue #15076. 
This commit adds documentation explaining the need to have an initial
.active element in carousels.
 2014-11-11 15:28:21 +05:30
Patrick H. Lauke
bb89657bcb Assorted accessibility (and some consistency) fixes for documentation 
Closes #14951 by merging it.
 2014-11-11 07:46:14 +01:00
Chris Rebert
c513f58c6a Remove X-UA-Compatible caveat from Validators docs 
Refs #15072
 2014-11-10 13:14:33 -08:00
XhmikosR
bf4a331f1a Run grunt. 2014-11-10 12:55:26 +02:00
XhmikosR
5339f7c8d5 Merge pull request #15009 from patrickhlauke/glyphicon-accessibility-tweaks 
Glyphicon accessibility tweaks
 2014-11-10 12:30:34 +02:00
Patrick H. Lauke
19520d4620 Add aria-hidden to icons in about page 2014-11-10 08:55:59 +00:00
Patrick H. Lauke
1786942d33 Meaningful icons in about page 2014-11-10 08:55:58 +00:00
Patrick H. Lauke
eb74d8c863 Accessibility tweaks and explanation for glyphicons 
- add aria-hidden="true" to avoid SRs unintentionally reading out the
Unicode character (see
http://www.filamentgroup.com/lab/bulletproof_icon_fonts.html)
- callout with advice on accessible icon usage
- replaced sr-only text in examples with (in the case of button) cleaner
aria-label
- additional example of icon used to convey meaning (in a
non-interactive control)
 2014-11-10 08:55:58 +00:00
Mark Otto
8c954fd13d run cssmin on docs css for dist-css task 2014-11-10 00:20:41 -08:00
Mark Otto
2cc66cbb58 Merge branch 'master' into derp 
Conflicts:
	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/customizer-variables.html
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	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
	less/_variables.less
 2014-11-09 23:48:56 -08:00
Mark Otto
eb74a8cbf3 darken primary blue for accessibility contrast on link colors 2014-11-09 23:11:28 -08:00
Mark Otto
f17b636bce color contrast for links, gets us to 4.63:1 2014-11-09 23:01:50 -08:00
Mark Otto
e020d50838 fix variable, run grunt 2014-11-09 22:05:09 -08:00
Mark Otto
86af1f39ab Merge branch 'master' into derp 
Conflicts:
	Gruntfile.js
	_config.yml
	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/button-groups.html
	docs/_includes/components/jumbotron.html
	docs/_includes/components/media.html
	docs/_includes/components/navs.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/js/carousel.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/getting-started.html
	docs/_includes/nav/javascript.html
	docs/_layouts/default.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/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/justified-nav/index.html
	less/_forms.less
	less/_tooltip.less
	less/navs.less
	less/theme.less
 2014-11-09 22:02:53 -08:00
Mark Otto
d1278efcc5 grunt 2014-11-09 18:04:00 -08:00
Mark Otto
46d1bf8eef Fixes #14234 again 
- Rather than override and hack for IE8-10 and then IE11, scope to just Safari.
- Drops the IE hacks for a media query Webkit hack
 2014-11-09 15:03:33 -08:00
Mark Otto
df28b7e25f Fixes #14965: Reset top border-radii on dropdown menus in fixed bottom navbars 2014-11-08 00:13:19 -08:00
Mark Otto
852eef9689 grunt 2014-11-08 00:10:53 -08:00
Mark Otto
8fbb2bbbd1 Fixes #14979: Override .jumbotron padding within .container-fluid to match .container 2014-11-07 23:01:20 -08:00
Mark Otto
2862c30320 Fixes #15046: Add full font overrides for popovers and tooltips 2014-11-07 22:17:39 -08:00
Chris Rebert
d904429e05 Merge pull request #14986 from twbs/safari-broken-printing-doc 
Add #14868 to the compatibility docs
 2014-11-05 14:59:24 -08:00
Heinrich Fenkart
f85c5921dd grunt 2014-11-05 20:11:46 +01:00
Heinrich Fenkart
d77546963b Customizer: Remove file type check from config import 
Fixes #14978.
 2014-11-05 19:14:52 +01:00
Heinrich Fenkart
30df201abc Use a Jekyll plugin instead of the copy:configBridge grunt task 2014-11-05 18:35:13 +01:00
Heinrich Fenkart
e27dc5d71e grunt 2014-11-05 01:56:18 +01:00
Heinrich Fenkart
db90ff6df7 grunt 2014-11-05 01:45:16 +01:00
Heinrich Fenkart
6020bb06f2 grunt 2014-11-05 00:36:52 +01:00
Jayanth Koushik
e55feacf5b Add initialization examples to tooltip and popover "Opt-in functionality" callouts 
Fixes #14950.
Closes #15015 by merging it.
 2014-11-04 20:00:08 +01:00
Heinrich Fenkart
0d291e8623 HTTPS for Apple Safari Radar in bugify filter 2014-11-04 19:40:39 +01:00
Heinrich Fenkart
1a833e75d5 Merge pull request #14987 from twbs/overengineer-wall-of-browser-bugs 
Use Jekyll data for Wall of Browser Bugs
 2014-11-04 19:38:04 +01:00
Heinrich Fenkart
1582039193 Use autoprefixer for Customizer builds 2014-11-04 19:34:29 +01:00
Heinrich Fenkart
d107004278 Remove duplicate code from Customizer/Gruntfile by sharing it 2014-11-04 12:35:38 +01:00
Heinrich Fenkart
069488dea3 Use Jekyll data for Wall of Browser Bugs 2014-11-04 07:25:52 +01:00
Chris Rebert
594831f4f3 Add event.relatedTarget + data-* example to Modal docs 
Fixes #14245
 2014-11-03 13:37:27 -08:00
Chris Rebert
f0d8894d54 Add #14868 to the compatibility docs 2014-11-03 10:56:30 -08:00
Heinrich Fenkart
17a6b5e843 Add Wall of Browser Bugs entry for #14972 2014-11-03 18:17:35 +01:00
Aaron Cordovez
f412979287 Fix typo 
Corrected spelling of the word "elements"
 2014-11-01 17:46:33 -07:00
Manuel Meurer
1f64aac6b9 fix whitespace in js dropdown docs 2014-11-01 11:51:11 +01:00
XhmikosR
15faedd834 Merge pull request #14917 from twbs/examples-footer 
Examples: Make use of the `footer` tag instead of a class.
 2014-11-01 08:55:03 +02:00
Chris Rebert
08b0c373b5 Add Wall of Browser Bugs entry for #14409 
Closes #14409.
[skip sauce]
 2014-10-31 17:08:28 -07:00
Heinrich Fenkart
a2c0bb49b1 grunt 2014-10-31 11:09:01 +01:00
Heinrich Fenkart
12b3ba7278 Customizer: listen to the right event for manual file selection in import 2014-10-31 10:58:03 +01:00
Heinrich Fenkart
b91474e538 grunt 2014-10-31 10:31:56 +01:00
Chris Rebert
88dfd954fa Replace deprecated uses of .pull-left & .pull-right in .media docs 
Refs https://github.com/twbs/bootlint/pull/153
[skip sauce]
 2014-10-30 11:36:24 -07:00
hillai
1339ab7a13 Replace v3.2.1 reference with v3.3.0 since there wasn't a v3.2.1 
Closes #14941
 2014-10-30 10:20:54 -07:00
XhmikosR
6b7d6565de Examples: Make use of the footer tag instead of a div. 2014-10-30 08:08:06 +02:00
Heinrich Fenkart
b8c3c5c19b grunt 2014-10-30 04:45:04 +01:00
Chris Rebert
be7402f0d0 Add Wall of Browser Bugs entry for #14708 
Closes #14708
 2014-10-29 18:00:52 -07:00
Chris Rebert
850a9a0250 Add Wall of Browser Bugs entry for #14868 
Closes #14868
 2014-10-29 16:11:42 -07:00
Mark Otto
16dbdbd7a2 Merge branch 'master' into v3.3.0 
Conflicts:
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
 2014-10-29 11:56:48 -07:00
Mark Otto
15d668dd15 grunt 2014-10-29 11:13:25 -07:00
Mark Otto
5429e71401 fixes #14913: badges in list group shouldn't have text shadow 2014-10-29 10:27:18 -07:00
Mark Otto
aa85e762ea new homepage images 2014-10-29 10:02:51 -07:00
Mark Otto
e07d741088 grunt 2014-10-29 09:54:43 -07:00
Mark Otto
34c2f46c8b Merge branch 'master' into v3.3.0 2014-10-29 09:45:09 -07:00
Mark Otto
22baa8153b fixes #14911: bump dependencies to fix customizer text from being cut shor 2014-10-29 09:42:00 -07:00
Mark Otto
22f9c8fc0a grunt 2014-10-29 08:58:51 -07:00
Mark Otto
94b59b57d6 version bump 2014-10-29 08:56:20 -07:00
Mark Otto
a369a0a729 grunt 2014-10-29 08:51:05 -07:00
Chris Rebert
3fe6a04b90 Add WebKit bug for #9774 to Wall of Browser Bugs 
[skip sauce]
 2014-10-28 23:20:51 -07:00
Mark Otto
a75c6d84e1 grunt 2014-10-28 23:08:42 -07:00
Mark Otto
aad0f00887 indentation and comment 2014-10-28 23:04:25 -07:00
Mark Otto
c0c1588402 Merge pull request #14904 from twbs/customize-min-files 
Customizer: include the minified files only on GitHub pages.
 2014-10-28 23:02:48 -07:00
Mark Otto
45b59f4307 Reverts #14848, the overflow scrolling in the docs sidebar /cc @hnrch02 2014-10-28 22:57:16 -07:00
XhmikosR
a515191afd Customizer: include the minified files only on GitHub pages. 2014-10-29 07:30:57 +02:00
Heinrich Fenkart
cf88a65f30 Fix customizer download with Firefox. 2014-10-29 06:48:00 +02:00
Chris Rebert
c897f9d5f0 Safari v8.0 still suffers from Justified Nav rendering bug 2014-10-28 21:24:45 -07:00
Heinrich Fenkart
bf2ad00ee0 grunt 2014-10-29 04:56:02 +01:00
Heinrich Fenkart
94b544c229 grunt 2014-10-29 04:44:52 +01:00
Heinrich Fenkart
a7f58a8356 grunt 2014-10-29 04:30:31 +01:00
Chris Rebert
a7fd40950b Add transform: translate3d(0, 0, 0) iOS Safari bug to the Wall 
Closes #14603 (again)
[skip sauce]
 2014-10-28 17:54:59 -07:00
Mark Otto
2758cfecd8 Merge pull request #14885 from twbs/remove-baseurl 
Remove `baseurl` as it doesn't serve any real purpose.
 2014-10-28 17:21:04 -07:00
Chris Rebert
d87a636ff9 add missing href="#" to .btn-group-justified example 
[skip sauce]
 2014-10-28 16:10:43 -07:00
Chris Rebert
3eec86e2e5 add missing hrefs to <a>s in docs+examples 2014-10-28 16:05:32 -07:00
Chris Rebert
780c9b05fe reads more smoothly 
For @XhmikosR
 2014-10-28 13:11:35 -07:00
Chris Rebert
223d9b4b6b Merge branch 'master' into jonschlinkert/master 2014-10-28 11:10:51 -07:00
Mark Otto
a5497da5be grunt 2014-10-27 20:37:17 -07:00
Mark Otto
892f6e35b8 Merge branch 'master' of github.com:twbs/bootstrap 2014-10-27 20:30:02 -07:00
Mark Otto
0723060b89 Merge branch 'master' of github.com:twbs/bootstrap 2014-10-27 15:36:26 -07:00
Chris Rebert
a43d4767ba .bs-customizer-input => .col-xs-4 2014-10-27 15:02:21 -07:00
Chris Rebert
032a5ab72f add clearfix divs to customizer input rows 2014-10-27 15:00:30 -07:00
Chris Rebert
af70ac8ae1 Tweak parser to ignore empty Less section docstrings; fixes #14878 2014-10-27 13:50:45 -07:00
XhmikosR
3908235e0f Remove baseurl as it doesn't serve any real purpose. 2014-10-27 19:35:59 +02:00
Mark Otto
9796f56fa1 title change 2014-10-27 04:52:48 -07:00
Mark Otto
b091dd5e86 rename new navbar to just navbar 2014-10-27 04:52:22 -07:00
Mark Otto
77250e1451 drop the old navbar 2014-10-27 04:52:07 -07:00
Mark Otto
674c2ff224 fix up the new navbar docs 2014-10-27 04:49:24 -07:00
Mark Otto
e3d2146350 fix rounded corners on copy buttons 2014-10-27 03:23:44 -07:00
Mark Otto
c15aa36798 switch to max-width on containers 2014-10-27 03:07:34 -07:00
Mark Otto
125c3859a0 add height to new navbar examples to show behavior 2014-10-27 03:07:25 -07:00
Mark Otto
37f10fe92f scrollspy maybe? 2014-10-27 01:35:10 -07:00
Mark Otto
d896faa1b9 grunt 2014-10-27 01:35:02 -07:00
Mark Otto
ff5146dce6 nav list update 2014-10-27 01:34:55 -07:00
Mark Otto
482863005e fix home nav 2014-10-27 01:34:43 -07:00
Mark Otto
252583b661 grunt 2014-10-26 23:07:20 -07:00
Mark Otto
f07477d290 Merge branch 'master' into derp 
Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map
	less/progress-bars.less
	less/theme.less
 2014-10-26 22:59:02 -07:00
Mark Otto
dcee894a8c grunt 2014-10-26 22:57:38 -07:00
Mark Otto
f26821a83a fix progress bar animated biznas 2014-10-26 22:48:12 -07:00
Baraa
f0fd6df63a Removed unnecessary new lines that were inconsistent with current style. 2014-10-26 22:33:55 -07:00
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
jonschlinkert
3e9b461766 Replaces markdown.js with [remarkable](https://github.com/jonschlinkert/remarkable). 
- remarkable has 100% support for [commonmark](http://jgm.github.io/CommonMark/spec.html)
  - [faster](https://github.com/jonschlinkert/remarkable/tree/master/benchmark)
  - easier to monkeypatch. this is a goal of ours, might be useful to you at some point given the custom tokenizing/parsing you're doing for documentation.
 2014-10-26 06:38:10 -04: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:
1c4fcf3214
345925f043

[ci skip]
 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