2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-21 13:24:08 +03:00
Commit Graph

13631 Commits

Author SHA1 Message Date
Chris Rebert 463343af63 more nesting in table.less 2013-11-06 18:38:27 -08:00
Chris Rebert 798e64cebf use nesting to make .table-striped & .table-hover mixin-able again; fixes #11387 2013-11-06 18:33:07 -08:00
Chris Rebert ceefbce100 add warning about WebKit bug to the justified nav example itself 2013-11-06 15:21:07 -08:00
Mark Otto 6df6723c15 Merge branch 'master' into docs_derp
Conflicts:
	dist/css/bootstrap.min.css
2013-11-06 14:04:54 -08:00
Chris Rebert 3887f540b9 update remaining version numbers v3.0.2 2013-11-06 13:19:18 -08:00
Mark Otto eaff6bc49a grunt 2013-11-06 13:10:51 -08:00
Mark Otto 98acdaeb00 bump links to 3.0.2; change readme download to release URL format 2013-11-06 13:09:35 -08:00
Mark Otto 88a06640dd Fixes #11295: Restore offset, push, and pull zero classes (e.g., .col-md-offset-0) 2013-11-06 13:03:08 -08:00
Mark Otto d1048a7837 run grunt after version bumps 2013-11-06 13:02:15 -08:00
Mark Otto 6a42305565 bump versions to v3.0.2 2013-11-06 12:57:28 -08:00
Mark Otto b593df1830 docs derp 2013-11-06 11:00:39 -08:00
Chris Rebert c84d96ac1f fix #11378 2013-11-06 10:30:39 -08:00
Chris Rebert 375b9edb41 Merge pull request #11273 from benji07/patch-1
Add a branch alias
2013-11-05 23:36:48 -08:00
Benjamin Lévêque 7df3e142ac Add a branch alias
Add a branch alias to be able to require 3.0.* version (use the branch master if minimum-stability is dev or use a tag if it's defined to stable)
2013-11-06 08:25:40 +01:00
Chris Rebert 89d489dfc7 re-grunt 2013-11-05 16:58:18 -08:00
Chris Rebert f1b0cd491c Merge pull request #10039 from daguej/js-refs
Don't explicitly reference global jQuery
2013-11-05 16:55:55 -08:00
Chris Rebert d2e710a2df fix 1 remaining instance of #11349 2013-11-05 16:37:54 -08:00
Chris Rebert a063e1f736 Merge pull request #11349 from alefteris/examples-navbar-sr-only
Add toogle nav for screen readers in examples
2013-11-05 16:35:14 -08:00
Chris Rebert b6a083e77f Merge pull request #11327 from ZDroid/nestnail
Use nesting for thumbnail styles
2013-11-05 16:20:53 -08:00
Ross Allen 18318b81b0 Add async attribute to Twitter widget script 2013-11-05 07:39:50 -10:00
Ross Allen 68fc2f2515 Add protocol for jQuery to work when accessed as file
URLs without protocols get "file:" prepended when their document is
loaded as a file. Make sure the docs can always be opened by
specifying a protocol.
2013-11-05 07:23:58 -10:00
Ross Allen 4f5a865684 Load Twitter widget async, prevent SPOF
Twitter's widget library[1] provides an async snippet to inject the
script tag later. Since widgets.js came before the local JS, if
twitter.com took long to respond it would prevent subsequent
synchronous script tags.

[1] https://dev.twitter.com/docs/tfw-javascript
2013-11-04 22:17:05 -10:00
Ross Allen 38d6894910 Serve jQuery from cookie-free Google APIs
jQuery.com uses Google Analytics and so sets a cookie when you visit
the site. When you request jquery.js from its CDN, code.jquery.com,
you take a hit from sending your previous GA cookie in the request.

Google Hosted Libraries[1] and googleapis.com never set cookies.

[1] https://developers.google.com/speed/libraries/devguide
2013-11-04 22:11:57 -10:00
Chris Rebert 13b96677ba Merge pull request #11335 from twbs/version-number-updater
add Grunt task to change version numbers
2013-11-04 11:24:32 -08:00
Chris Rebert 0bb122a377 add Grunt task to change version numbers; fixes #11332 2013-11-04 11:22:30 -08:00
Chris Rebert aeee718247 update node.js to v0.10.x (current stable) 2013-11-04 10:41:10 -08:00
Chris Rebert de271bf612 Merge pull request #11354 from Ore4444/patch-1
Fixed links
2013-11-04 08:54:37 -08:00
Ore Landau eae1af1d27 Fixed links
Links to same-page anchors were treated as external links.
2013-11-04 12:33:43 +02:00
Thanos Lefteris 70db224073 Add toogle nav for screen readers in examples 2013-11-03 21:08:24 +02:00
Chris Rebert df3b44f27a Merge pull request #11345 from pborreli/patch-3
Removed duplicated class change from migration instructions
2013-11-02 20:11:08 -07:00
Pascal Borreli 05c826d67d Removed duplicated class change from migration instructions 2013-11-03 03:08:11 +00:00
Chris Rebert fcb906ce09 Merge pull request #11336 from twbs/fix-11317
don't use nonstandard window.location.origin in customizer JS
2013-11-02 15:06:16 -07:00
Julian Thilo 88b651012d Fix #7398 in Basic template
See https://github.com/twbs/bootstrap/issues/7398#issuecomment-27617890 for details.
Thanks @martinburger
2013-11-02 13:34:31 +01:00
Julian Thilo be60ee1377 Merge pull request #11338 from ZDroid/nestform
Use nesting for .placeholder()
2013-11-02 05:27:30 -07:00
Zlatan Vasović f1bc840d43 Use nesting for .placeholder() 2013-11-02 09:35:51 +01:00
Chris Rebert db314528eb don't use nonstandard window.location.origin in customizer JS; fixes #11317 2013-11-01 18:56:27 -07:00
Chris Rebert ea3c89189a Merge pull request #11334 from glebm/patch-2
& > == >
2013-11-01 18:29:45 -07:00
Gleb Mazovetskiy b75d5f5fc4 & > == > 2013-11-02 02:19:11 +01:00
Chris Rebert 4e0d022de5 update version numbers in JS file comment headers to v3.0.1 & regrunt 2013-11-01 17:15:34 -07:00
Julian Thilo 41fa8ead77 Merge pull request #11331 from xt0rted/patch-1
Update customizer.js
2013-11-01 16:38:08 -07:00
Brian Surowiec 8ff7b48b7b Update customizer.js 2013-11-01 19:27:08 -04:00
maxwellium 56aa2af6e1 otherwise content scrolls on chrome
without change, body scrolls on chrome Version 30.0.1599.101 (OSX 10.9)
2013-11-01 22:51:11 +01:00
Zlatan Vasović 3dc0ed35d1 Use nesting for thumbnail styles 2013-11-01 22:09:01 +01:00
Julian Thilo 99ffa28278 Merge pull request #11324 from boki-/patch-1
Update README.md
2013-11-01 11:36:30 -07:00
Bogdan bb54ce0db6 Update README.md
Row 13 link update to tag v3.0.1
2013-11-01 19:30:27 +01:00
Chris Rebert 19fdd707ef Merge pull request #11315 from AJAlabs/master
Added navigation role to example navbars
2013-10-31 13:36:52 -07:00
AJ Acevedo 0d4b9ef72e Added navigation role to example navbars
As per the docs:
http://getbootstrap.com/components/#navbar-default

  modified:   examples/carousel/index.html
  modified:   examples/jumbotron/index.html
  modified:   examples/navbar-fixed-top/index.html
  modified:   examples/navbar-static-top/index.html
  modified:   examples/navbar/index.html
  modified:   examples/non-responsive/index.html
  modified:   examples/starter-template/index.html
  modified:   examples/sticky-footer-navbar/index.html
  modified:   examples/theme/index.html
2013-10-31 16:09:41 -04:00
Kevin Locke 441f9d6717 Support .h1 in place of h1 inside .jumbotron
As in #7284, it can often be useful to style text like a heading in
places where using the heading tag would be either semantically
incorrect, less accessible, or otherwise invalid.

Support this in .jumbotron as in the rest of the document by allowing
elements with class .h1 to stand in for the h1 element.

Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
2013-10-31 10:48:55 -06:00
Mark Otto 867e2bef8d 3.0.1 v3.0.1 2013-10-30 10:03:56 -07:00
Mark Otto 147837efaa more grunt 2013-10-30 08:00:32 -07:00