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

6484 Commits

Author SHA1 Message Date
Mark Otto
ab3e1762d4 turn some buttons into <button> elements where possible 2013-08-24 11:46:24 -07:00
Mark Otto
a167a910d9 Merge pull request #10103 from hero-m/patch-1
Another case for Issue #10099
2013-08-24 01:33:04 -07:00
hero-m
54dcb4b699 Another case for Issue #10099
Another case for Issue #10099
2013-08-24 12:11:12 +04:30
Mark Otto
d9e991fefe Merge pull request #10059 from felixhirschfeld/patch-1
Add mixin for transition-property
2013-08-24 00:19:37 -07:00
Mark Otto
c7db8eadc2 Merge pull request #10022 from thomaswelton/proposal-glyphicon-block
Proposal - Fixed width for glypicons
2013-08-24 00:15:34 -07:00
Mark Otto
9733a998e2 fixes #9969: add support for output element 2013-08-24 00:14:09 -07:00
Mark Otto
802e5caf51 Merge branch 'master' of github.com:twbs/bootstrap 2013-08-23 23:59:11 -07:00
Mark Otto
700d7e7b2c Remove footnote links and inline them; link to contributing guidelines in readme 2013-08-23 23:58:38 -07:00
Mark Otto
a6a97e1b27 Merge pull request #9964 from thomaswelton/patch-1
Bower - Added fonts to "main" files
2013-08-23 23:52:24 -07:00
Mark Otto
fc0e7686fb Merge branch 'master' of https://github.com/charnog/bootstrap into charnog-master
Conflicts:
	dist/css/bootstrap.min.css
2013-08-23 23:40:12 -07:00
Mark Otto
705f7ba279 fixes #9876: avoid dropdowns in navbar examples to prevent overlap 2013-08-23 23:39:11 -07:00
Mark Otto
ddd594c6e2 follow up to #9963 and #10005: update docs to use .screen-*-min vars, update customizer as well; run grunt to adjust raw files 2013-08-23 23:33:16 -07:00
Mark Otto
adac269f95 grunt on previous ms scroll fix 2013-08-23 23:32:16 -07:00
Mark Otto
d82030f482 Merge pull request #10057 from sambowler/patch-1
Fix responsive table scrolling on Windows Phone 8.
2013-08-23 23:19:05 -07:00
Mark Otto
0a2ec5545b Merge branch 'master' of https://github.com/apexskier/bootstrap into apexskier-master
Conflicts:
	dist/css/bootstrap.min.css
2013-08-23 23:16:37 -07:00
Mark Otto
99afaba2bf Merge pull request #10005 from twbs/deprecate-screen-device-vars
deprecate @screen-{phone,tablet,desktop} vars
2013-08-23 23:14:13 -07:00
Mark Otto
b86cd3bc3d Merge branch 'master' into deprecate-screen-device-vars
Conflicts:
	less/variables.less
2013-08-23 22:56:23 -07:00
Mark Otto
d5a2785545 more specific deprecation comment 2013-08-23 22:51:39 -07:00
Mark Otto
8a96616726 Merge pull request #9963 from twbs/min-breakpoint-naming
rename @screen-XX to @screen-XX-min for clarity+unambiguity
2013-08-23 22:50:41 -07:00
Chris Rebert
a7e5bac2d7 Merge pull request #10100 from twbs/document_hide_text
Fixes #10076: Document hide text
2013-08-23 22:39:26 -07:00
Mark Otto
48d929d69e Use jekyll var for current version in docs; update banner in gruntfile to match .less banner 2013-08-23 22:38:51 -07:00
Mark Otto
a66ccbc562 split mixin and grunt dist to be sure 2013-08-23 22:19:58 -07:00
Mark Otto
6de67c0ab6 Deprecate .hide-text mixin for .text-hide as mixin and class 2013-08-23 22:11:41 -07:00
Mark Otto
e25ca1e7a9 Document .hide-text and .text-hide 2013-08-23 22:01:42 -07:00
Mark Otto
7a7149d2ee Rearrange helper classes docs section; add subnav list items to docs side nav 2013-08-23 22:00:54 -07:00
Mark Otto
7edd87dde9 Merge branch 'master' of github.com:twbs/bootstrap 2013-08-23 21:45:58 -07:00
Mark Otto
c4f1591e70 fixes #10095: note about backwards incompatibility 2013-08-23 21:45:46 -07:00
Mark Otto
c1ddb06de7 Merge pull request #10098 from wangsai/fix-form
fix form
2013-08-23 21:34:44 -07:00
Mark Otto
b67e49367a Merge pull request #10097 from wangsai/complete-td
complete missed </td>
2013-08-23 21:34:25 -07:00
wangsai
df56ecbdcb fix form 2013-08-24 11:39:34 +08:00
wangsai
e3f9719096 complete missed </td> 2013-08-24 11:09:33 +08:00
Chris Rebert
1a1394dc62 Merge pull request #9931 from realityking/toolbar
Add role="toolbar" to elements with .btn-toolbar.
2013-08-23 16:19:30 -07:00
Chris Rebert
9b2ff3713e fix #10054; mention .muted -> .text-muted in migration docs 2013-08-23 16:12:24 -07:00
Mark Otto
ae96cfd909 Merge pull request #9966 from twbs/header-font-size-vars
add variables for heading font sizes; fixes #9921
2013-08-23 14:26:40 -07:00
Mark Otto
fab039f29b run grunt 2013-08-23 14:26:16 -07:00
Mark Otto
12a70cec88 Run grunt dist on theme for some reason 2013-08-23 14:23:13 -07:00
Mark Otto
2b37d2b533 Update and document use of small in headings 2013-08-23 14:22:51 -07:00
Mark Otto
310642d5ac Merge branch 'master' into header-font-size-vars 2013-08-23 14:00:28 -07:00
Mark Otto
7b0d035dd4 Merge branch 'master' of github.com:twbs/bootstrap 2013-08-23 13:46:40 -07:00
Mark Otto
acb338766e fixes #10087: add version number to all docs pages in footer 2013-08-23 13:46:28 -07:00
Chris Rebert
ec7fa0a254 fix data-api portion of #10084 2013-08-23 11:14:54 -07:00
Chris Rebert
0f669b6dcb repeat #10081 caveat for popovers too 2013-08-23 11:09:01 -07:00
Chris Rebert
3d72942384 tweak #10081 phrasing 2013-08-23 11:08:37 -07:00
Chris Rebert
34db002875 Merge pull request #10081 from bcarrell/master
docs: add explanation for adding tooltips to disabled elements
2013-08-23 11:02:46 -07:00
Mark Otto
f8de960c38 Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	css.html
2013-08-23 10:47:36 -07:00
Mark Otto
a0d0864bd7 fixes #9877: improve active state on nav list items in theme 2013-08-23 10:44:13 -07:00
Mark Otto
5bbbdb399b fixes #9879: add hover state to theme buttons 2013-08-23 10:36:37 -07:00
Chris Rebert
4912f960f4 fix #10070 by resyncing fieldset disabled live example & example code 2013-08-23 10:18:39 -07:00
bcarrell
5d39794287 docs: add explanation for adding tooltips to disabled elements, closes #10049 2013-08-23 12:10:52 -04:00
Cameron Little
9bdc841acc Added -webkit-overflow-scrolling: touch to responsive tables 2013-08-23 08:55:02 -07:00