rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-14 02:24:00 +01:00
Code Issues Actions Packages Releases Activity
8,369 Commits 108 Branches 89 Tags 553 MiB
1f8c19fe3c
Commit Graph

8369 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Otto
70459c1454 Merge branch 'master' into docs_derp 
Conflicts:
	docs/_includes/footer.html
	docs/assets/css/docs.css
 2014-01-01 12:27:09 -08:00
Mark Otto
c583b79655 Merge pull request #12055 from wangsai/fix-assets-links-of-examples 
fix assets links in all examples
 2014-01-01 12:02:28 -08:00
Julian Thilo
8113717363 Merge pull request #12056 from ZDroid/ny 
New Year
 2014-01-01 09:45:50 -08:00
Zlatan Vasović
0f060e7bc4 'use strict' on new line 2014-01-01 15:42:41 +01:00
Zlatan Vasović
1c83d68ca4 New Year 2014-01-01 15:37:08 +01:00
wangsai
e4508bb37c fix assets links in all examples 2014-01-01 22:29:13 +08:00
Mark Otto
50cf0b1a9d Update Gruntfile.js to copy 'dist/' files to 'docs/dist/' with 'grunt dist' task; Fixes #12030: navbar toggle focus state 2013-12-31 18:23:10 -08:00
Mark Otto
83d26de6d5 Fix broken JS 2013-12-31 17:47:16 -08:00
Mark Otto
bab240252a Merge branch 'master' into docs_derp 2013-12-31 13:57:43 -08:00
Mark Otto
e3aa358696 derp 2013-12-31 13:57:35 -08:00
Mark Otto
905adb5b83 fix homepage images 2013-12-31 13:56:20 -08:00
Mark Otto
b253cb2c1e Merge branch 'master' into docs_derp 
Conflicts:
	_config.yml
	docs/_includes/footer.html
	docs/_includes/nav-main.html
	docs/_includes/old-bs-docs.html
	docs/_layouts/default.html
	docs/_layouts/home.html
	docs/getting-started.html
	docs/index.html
 2013-12-31 13:53:33 -08:00
Mark Otto
8812856de1 Merge pull request #12037 from twbs/docs_dir 
Bring back the `/docs` directory
 2013-12-31 13:43:32 -08:00
Mark Otto
05cc208333 Merge branch 'master' into docs_dir 2013-12-31 13:43:11 -08:00
Mark Otto
ac3f48bb19 Fixes #12046: move .csscomb.json and .csslintrc to less/ folder 2013-12-31 13:16:28 -08:00
Mark Otto
295736aff2 Merge pull request #12049 from ZDroid/update-de 
Update dependencies (again)
 2013-12-31 12:57:55 -08:00
Mark Otto
78e1af58d6 typo 2013-12-31 11:57:44 -08:00
Mark Otto
b43371cd0a @nschonni's feedback <3 2013-12-31 11:38:32 -08:00
Mark Otto
1e4540f11b @cvrebert's feedback 2013-12-31 10:51:39 -08:00
Mark Otto
0df96d8c32 Merge branch 'master' into docs_dir 2013-12-31 10:38:31 -08:00
Zlatan Vasović
17fb7aee2d Update dependencies (again) 2013-12-31 19:20:57 +01:00
Chris Rebert
a1b5458073 Merge pull request #12043 from supergibbs/fixed_typo_in_customize.html 
Fixed typo
 2013-12-29 23:26:57 -08:00
Supergibbs
df16f9f123 Fixed typo 2013-12-29 23:16:41 -08:00
Chris Rebert
6ecdb31009 Sauce now supports latest Firefox on OS X Mavericks 2013-12-29 21:15:29 -08:00
Chris Rebert
0fe777b271 default to latest Firefox version on OS X 2013-12-29 21:13:56 -08:00
Chris Rebert
0e412dc1a3 fix capitalization of iOS 2013-12-29 20:45:36 -08:00
Chris Rebert
7f20eff44d Merge pull request #12041 from twbs/mv-sauce-into-infra 
mv sauce_browsers.yml out of the project root
 2013-12-29 20:29:44 -08:00
Chris Rebert
990c2392e5 mv sauce_browsers.yml out of the project root 2013-12-29 20:25:40 -08:00
fat
d18ba50837 add note about ios dropdown compat 2013-12-29 19:40:31 -08:00
fat
1fea9656b6 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-29 19:25:24 -08:00
Chris Rebert
3d3e2f2553 Merge pull request #12036 from ZDroid/grunt-fs-minify 
Merge two fs variable declarations into one
 2013-12-29 19:23:57 -08:00
fat
2a0b99104c Merge branch 'dropdown-aria-roles' of git://github.com/plumlee/bootstrap into plumlee-dropdown-aria-roles 
Conflicts:
	js/dropdown.js
 2013-12-29 19:23:15 -08:00
fat
8a62f21113 fixes #11379 - Fix carousel this.sliding not getting reset if $next.hasClass('active') 2013-12-29 19:01:32 -08:00
fat
76f0d0ff32 fixes #11373 - adds related target to dropdown events 2013-12-29 18:57:22 -08:00
fat
162d9e1776 Merge branch 'scrollspy-speedy-scroll-top' of git://github.com/ziogaschr/bootstrap into ziogaschr-scrollspy-speedy-scroll-top 
Conflicts:
	dist/js/bootstrap.min.js
 2013-12-29 18:04:43 -08:00
fat
9d73d9c38c Merge branch 'master' of github.com:twbs/bootstrap 2013-12-29 17:54:40 -08:00
fat
ce4a2e4352 fixes #11288 - Vertical scroll position of modal saves between openings 2013-12-29 17:53:59 -08:00
Mark Otto
70b8b330f0 no more page.base_url 2013-12-28 23:08:46 -08:00
Mark Otto
f10cf21a8f Streamline copy process by not bringing over full files into docs/dist/, only take minified ones 2013-12-28 23:05:02 -08:00
Mark Otto
a9c829bc0c Rearrange repository contents because muahahahahahaha 2013-12-28 22:47:03 -08:00
Jacob
ea40e7999d Merge pull request #11203 from jasny/patch-1 
Scrollspy acting up when targets are hidden
 2013-12-28 22:06:26 -08:00
fat
5bf13914e4 fixes #10658 jQuery Popover content loses bound events on second setContent call. 2013-12-28 20:59:45 -08:00
Mark Otto
6405442e66 drop the title 2013-12-28 18:47:32 -08:00
Mark Otto
068010409b Merge pull request #12035 from tomByrer/master 
fixed .clearfix example, + doc link
 2013-12-28 18:46:36 -08:00
Zlatan Vasović
0016b508cb Merge two fs variable declarations into one 
One is enough.
 2013-12-28 23:33:32 +01:00
tomByrer
120dce43e8 fixed .clearfix example, + doc link 2013-12-28 12:01:32 -07:00
Mark Otto
9e1153d049 spacing 2013-12-27 16:44:00 -08:00
Mark Otto
adab81ddcd Merge branch 'master' into docs_derp 2013-12-27 16:41:33 -08:00
Mark Otto
a2aaf80c7e grunt on last merge 2013-12-27 16:41:25 -08:00
Mark Otto
84326a3e59 big brand update 2013-12-27 14:04:44 -08:00