rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00
Code Issues Actions Packages Releases Activity
6,230 Commits 108 Branches 89 Tags 552 MiB
e3e408bb78
Commit Graph

6230 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Otto
d89b364260 Merge pull request #9120 from FLOKER/patch-2 
fix scrollSpy instructions for JS call
 2013-08-06 18:09:49 -07:00
Mark Otto
000f89829e Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-06 18:06:36 -07:00
Mark Otto
3f3dfc54e7 update use of mixins and add bg-colors where necessary 2013-08-06 18:05:37 -07:00
Mark Otto
076ec90d0b Merge branch '3.0.0-wip' of https://github.com/archanl/bootstrap into archanl-3.0.0-wip 
Conflicts:
	less/mixins.less
 2013-08-06 18:05:24 -07:00
Chris Rebert
fe5580e4fc Temporarily disable IE BrowserStack testing, to fix the build 
Per @mdo's request.
Can re-enable IE after @fat figures out wassup w/ the unittest failures.
 2013-08-06 17:56:20 -07:00
Mark Otto
acc9f5d88a Merge pull request #9175 from twbs/bs3_third_party_support_docs 
BS3: Add third party support docs
 2013-08-06 17:51:31 -07:00
Mark Otto
dbde90ec0d some copy editing 2013-08-06 17:46:40 -07:00
Mark Otto
ab79b4ac2d Merge branch '3.0.0-wip' into bs3_third_party_support_docs 2013-08-06 17:40:33 -07:00
Mark Otto
167753273a Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-06 17:29:52 -07:00
Mark Otto
443ff0cc32 Pull from GitHub downloads for latest v3-wip on homepage 
/cc @cv
 2013-08-06 17:29:41 -07:00
Mark Otto
c3ac95333d Fixes #8749: prevent navbar nav from overlapping navbar toggle 2013-08-06 17:28:02 -07:00
Mark Otto
85f0abf837 Merge pull request #9171 from twbs/bs3_winph8_ie10_bug_town_usa_omgwtfbbq 
Fixes #9162: add mention of Windows Phone 8 and IE10 bugs with responsive foo
 2013-08-06 16:45:16 -07:00
Mark Otto
223e032150 Fix #9174: pad bottom of navbar collapsed content and clear floated contents 2013-08-06 16:39:18 -07:00
Mark Otto
f3bf32ffc5 add third party support section to the docs 2013-08-06 16:30:28 -07:00
Mark Otto
6da346527b grunt dist on previous commit 2013-08-06 16:02:07 -07:00
Mark Otto
726bc02885 For @cvrebert 2013-08-06 15:52:06 -07:00
Mark Otto
7ae7aa6676 Merge pull request #8731 from nrw/patch-1 
Format multiple badges in list-group-item
 2013-08-06 15:41:50 -07:00
Mark Otto
287fdf8381 fixes #9162: add mention of Windows Phone 8 and IE10 bugs with responsive foo 2013-08-06 15:21:26 -07:00
Mark Otto
06949d6a18 grunt dist on spacing change 2013-08-06 14:57:14 -07:00
Chris Rebert
187e6641a8 Merge pull request #9169 from bwhitty/3.0.0-wip 
Fix spacing after '=' in popover.js
 2013-08-06 14:25:17 -07:00
Braden Whitten
f816a18f79 Fix spacing after '=' 
Just added a space after a function definition to tidy up the code.
 2013-08-06 17:02:57 -04:00
Chris Rebert
521f852744 update phantomjs link 2013-08-06 14:01:10 -07:00
Chris Rebert
8b8bf91825 Merge pull request #9165 from twbs/browserstack 
Browserstack testing integration (rebased, squashed, tweaked)
 2013-08-06 13:17:20 -07:00
Chris Rebert
cdc92e8139 only run browserstack tests in Travis 2013-08-06 12:25:26 -07:00
Rohan Jain
093cda244a Integrate testing with browserstack 2013-08-06 12:24:14 -07:00
Chris Rebert
b976956432 Fix #9132, but in the correct branch 
People, don't PR against `gh-pages` please!
 2013-08-06 12:09:44 -07:00
Mark Otto
c731961f9d fixes #9140: use correct var in tables 2013-08-06 11:40:02 -07:00
Mark Otto
2f1fcca6c5 Fixes #9145: Fix tooltip opacity 
Update tooltips to not use RGBa colors so IE8 can have tooltips, too
(means we're now using `opacity`).
 2013-08-06 11:18:53 -07:00
Mark Otto
f266595092 Fixes #9150: Hide popover titles in IE8 
Properly hides popover titles in IE8 because apparently it doesn't
accept the `:empty` selector. /cc @fat @cvrebert
 2013-08-06 11:18:12 -07:00
Mark Otto
440d8f5318 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-06 09:46:58 -07:00
Chris Rebert
4350c66253 Merge pull request #9157 from alienlebarge/3.0.0-wip 
Add links to Recess, Uglify-js & PhantomJS in README
 2013-08-06 09:28:04 -07:00
Cédric Aellen
4599eb69a4 Link to phantomjs 2013-08-06 15:06:25 +02:00
Cédric Aellen
3fb41d2400 link to Uglify-js repo 2013-08-06 15:04:52 +02:00
Cédric Aellen
3e3e6f13aa links to Recess repo 2013-08-06 14:57:34 +02:00
Florian Weber
e70d146b20 Update javascript.html 2013-08-06 11:44:55 +02:00
Jesse Hu
a24319eb44 Added url paths to navbar navbar-static-top and navbar-fixed-top 2013-08-06 03:00:40 -04:00
Jesse Hu
da249b55c4 Changed nav-header to dropdown-header in navbar navbar-fixed-top and navbar-static-top as mentioned in Docs 2013-08-06 02:47:58 -04:00
Jesse Hu
6739522d6c Added jquery.js and bootstrap.js tags to navbar and navbar-fixed top 2013-08-06 02:46:08 -04:00
Jesse Hu
97a5c3613c Added glyphicons to index.html 2013-08-06 02:34:36 -04:00
Mark Otto
db45a60cc8 Scope tablet classes to tablets range only 
Fixes #9128
 2013-08-05 20:55:30 -07:00
Chris Rebert
5db9a10138 Merge pull request #9134 from neilhem/3.0.0-wip 
remove repeated 'pagination' class in code example
 2013-08-05 20:32:07 -07:00
Rakhat Jabagin
b29b8acd28 remove repeated 'pagination' class in code example 2013-08-06 09:19:07 +06:00
Mark Otto
1d1e21aff6 Merge pull request #9123 from twbs/bs3_alerts_default_class 
Update labels to include a base class (fixes #8752)
 2013-08-05 20:01:45 -07:00
Mark Otto
219f0fe7c5 Merge branch '3.0.0-wip' into bs3_alerts_default_class 
Conflicts:
	dist/css/bootstrap.min.css
 2013-08-05 20:00:23 -07:00
Mark Otto
ac3cb6974a Merge pull request #9130 from twbs/straight-up-wrong 
Fix pixel values in Responsive Utilities docs to match the actual code
 2013-08-05 19:36:19 -07:00
Chris Rebert
668bc5f458 Fix pixel values in Responsive Utilities docs to match the actual code 2013-08-05 17:43:29 -07:00
Mark Otto
f3bd6dbf03 fixes #8647: remove focus outline on :focus of buttons in button groups 2013-08-05 16:16:58 -07:00
Mark Otto
ab090a29fb Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-05 16:15:43 -07:00
Mark Otto
98df9495cc remove dupe border-box 2013-08-05 16:15:36 -07:00
Mark Otto
2354cd1ae8 Merge pull request #9124 from geedmo/3.0.0-wip 
Fix Issue #8175 - .input-group-addon broken in Firefox
 2013-08-05 16:14:48 -07:00