0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-04 16:24:22 +01:00
Commit Graph

6651 Commits

Author SHA1 Message Date
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
Felix Hirschfeld
c52e1b85ab Add mixin for transition-property
It's quite handy if a transition needs the same duration, timing-function or delay and only specific properties to animate.
2013-08-23 09:22:54 +02:00
Sam Bowler
343fd1bb1e Fix responsive table scrolling on Windows Phone 8. 2013-08-23 07:53:09 +01:00
Mark Otto
c4c87fede5 fixes #9880: use correct grid classes on jumbotron example 2013-08-22 23:25:26 -07:00
Mark Otto
495768bbf5 Merge branch 'master' of github.com:twbs/bootstrap 2013-08-22 23:19:49 -07:00
Mark Otto
3318a98229 add blog link to homepage 2013-08-22 23:18:45 -07:00
Mark Otto
24f57bdf41 Merge pull request #10012 from twbs/david-badge
add David (david-dm.org) badge to monitor currentness of dependencies
2013-08-22 19:26:18 -07:00
Mark Otto
615ca89b1b Merge pull request #10040 from twbs/pull-navbar-docs
add cross-reference to .navbar-left/right in .pull-left/right docs
2013-08-22 19:23:21 -07:00
Chris Rebert
99b35150ee update outdated JSFiddle example 2013-08-22 16:51:57 -07:00
Chris Rebert
f7d6b488e6 fix #10029 2013-08-22 12:30:32 -07:00
Chris Rebert
354e2ee4f9 add cross-reference to .navbar-left/right in .pull-left/right docs 2013-08-22 12:28:00 -07:00
Chris Rebert
0c0400633a Merge pull request #10034 from nschonni/use-published-version-for-grunt-html-validation
Use NPM version of grunt-html-validation
2013-08-22 10:10:13 -07:00
Nick Schonning
ca63686fda Use NPM version of grunt-html-validation
The package is now published, so the direct git url is no longer
required
2013-08-22 12:20:56 -04:00
Barry vd. Heuvel
c5cfc690dd Add missing methods (rotateX/Y, perspective(-origin) and transform-origin)
Added missing mixins:
rotateX
rotateY
perspective
perspective-origin
transform-origin
2013-08-22 13:05:06 +02:00
Thomas Welton
31ab249809 Removed glyphicon-block instead target :empty .glyphicons 2013-08-22 10:30:18 +01:00
Thomas Welton
8663b75c4d Added glyphicon-block class
Prevents elements moving around the page after the font file has loaded by setting a defined width on elements using the icon font.
2013-08-22 02:54:54 +01:00
Jason Nutter
a40568a1e0 Fixing carousel control positioning
The left control should be positioned from the left, while the right
control should be positioning from the right. Positioning both from the
left results in the right carousel control being incorrectly positioned
(most noticeable with a larger than normal font size).
2013-08-21 15:51:24 -07:00
Chris Rebert
1bcf9f126d Merge pull request #10011 from nschonni/patch-1
Update Grunt instruction links and wording
2013-08-21 15:42:58 -07:00
Mark Otto
bc2e97756f Always wrap form examples in .bs-example; add some missing role='form' 2013-08-21 15:12:55 -07:00
Chris Rebert
31641d3d6d add David (david-dm.org) badge to monitor currentness of dependencies 2013-08-21 15:11:56 -07:00
Nick Schonning
b32cfa2cf2 Update Grunt instruction links and wording 2013-08-21 18:11:33 -04:00
Mark Otto
6fc988613a Merge branch 'master' of github.com:twbs/bootstrap 2013-08-21 14:30:27 -07:00
Mark Otto
aea1d8839f Merge pull request #10006 from jodytate/master
remove .btn-group
2013-08-21 14:25:49 -07:00
jody tate
e4bf27b223 remove .btn-group
Removing this class--it's not used in the example and using it causes "bad things to happen." 

http://jsfiddle.net/josephtate/Jn6H4/
2013-08-21 13:31:17 -07:00
jody tate
cb2e11ece4 remove .btn-group
The example doesn't use .btn-group and adding the class causes "bad things to happen," as the saying goes.

http://jsfiddle.net/josephtate/g6AWF
2013-08-21 13:06:46 -07:00
Chris Rebert
22ce649910 deprecate @screen-{phone,tablet,desktop} vars 2013-08-21 12:26:20 -07:00
Chris Rebert
c429fd1a3c Merge pull request #9999 from sqrt4/fix-9974
Fixes #9974
2013-08-21 11:36:02 -07:00
James Lawrence
2cb1626907 Fixes #9974
Added th selector in .table-row-variant mixin
2013-08-21 17:56:36 +01:00
Chris Rebert
fee05d1f3e Merge pull request #9987 from wangsai/fix-typo
change `else if` to `else`
2013-08-21 09:23:31 -07:00
jody tate
68b7998c05 removed extraneous space 2013-08-21 08:46:13 -07:00
jody tate
3d366038d7 removed reference to button color and gradient
Changed the wording to reflect the default button's new look since it's no longer grey and doesn't have a gradient. I'd say this new wording isn't ideal and needs something a bit more, well, descriptive.
2013-08-21 08:44:54 -07:00
wangsai
004f2a2b2f change else if to else 2013-08-21 19:36:33 +08:00
Denis Gonchar
4284fc0a5e fix #9941 2013-08-21 15:57:48 +06:00
Chris Rebert
e143c35472 Merge pull request #9973 from coliff/patch-6
Update justified-nav.css (Removed unnecessary ms-linear-gradient prefix)
2013-08-21 00:35:15 -07:00
Christian
c76b7a53a4 Update justified-nav.css
Removed unnecessary ms-linear-gradient prefix. There was never a stable release of IE that supported -ms- prefixed gradients, those were only in preview versions (stable IE10 supports both prefixed and unprefixed gradients). (source: http://lea.verou.me/2013/04/can-we-get-rid-of-gradient-prefixes/)
2013-08-21 16:30:12 +09:00
Thomas Welton
56f1ff6ca7 Added fonts to "main" files
When using bower the "main" property is used to specify the files that should be consumed by applications including the package as a dependency.
Without including the fonts in this array the glyphicons do not work correctly as the relative font paths do not work after the "main" files are copied into my projects public dir using tools like https://github.com/yatskevich/grunt-bower-task

For now I have manually copied the fonts dir in the location needed for my project. But by accepting this pull request this will not be necessary for me or for other people that use bower.
2013-08-21 08:08:56 +01:00
Chris Rebert
a3a02f9e6e rename @screen-XX to @screen-XX-min for clarity+unambiguity 2013-08-20 23:25:13 -07:00
Luke McDonald
c8402e6e2a Remove progress bar striped @color parameters; use default transparent white.
* If the @color parameter is not removed, the stripes are the same color as the element background color. In this case, the stripes do not appear.
2013-08-20 22:46:01 -05:00