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

7662 Commits

Author SHA1 Message Date
Mark Otto
07705673b6 Merge branch 'master' into docs_derp
Conflicts:
	_layouts/default.html
2013-12-18 16:19:46 -08:00
Mark Otto
3315d4d9f4 license in customizer 2013-12-18 15:35:24 -08:00
Chris Rebert
df3716647d update licensing header in JS files & run grunt 2013-12-18 15:29:19 -08:00
Mark Otto
766bf50b88 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-18 15:26:17 -08:00
Mark Otto
ccc894361f update license faqs for apache 2013-12-18 15:26:07 -08:00
Chris Rebert
5428523a37 cleanup licensing section more 2013-12-18 15:16:29 -08:00
Mark Otto
922cd046ef grunt after that carousel merge 2013-12-18 15:13:50 -08:00
Mark Otto
1bb0001189 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-18 15:12:51 -08:00
Mark Otto
27697ef7e3 another apache mention 2013-12-18 15:12:30 -08:00
Mark Otto
629a4743f0 remove license readme mention 2013-12-18 15:08:38 -08:00
Mark Otto
40651cf1ea more license mentions 2013-12-18 15:08:16 -08:00
Mark Otto
b9ca65ebe7 Merge pull request #11416 from danielboendergaard/carousel-duration
Carousel: Use the transition duration from CSS
2013-12-18 15:01:47 -08:00
Mark Otto
e8e60ae4bc version bump 2013-12-18 14:56:08 -08:00
Mark Otto
cb40a2ee8c Punt Apache license information and stick with MIT 2013-12-18 14:54:24 -08:00
Mark Otto
f29132350c grunt 2013-12-18 14:52:50 -08:00
Mark Otto
af2c6de6d5 Merge pull request #11928 from twbs/we_have_to_go_back_kate
Follow up to reverted commits
2013-12-18 14:49:05 -08:00
Mark Otto
56c36346c1 drop the the, it's cleaner 2013-12-18 14:38:10 -08:00
Mark Otto
79e97fef40 derp 2013-12-18 14:37:30 -08:00
Mark Otto
324f6ca562 buttons should be more mixin friendly 2013-12-18 14:29:33 -08:00
Mark Otto
ab740f0f0f navbars need to use prefixed nav class or they won't work as expected 2013-12-18 14:28:03 -08:00
Mark Otto
3416e87a97 restore inline block on breadcrumbs and ensure proper code formatting for readibility 2013-12-18 14:27:21 -08:00
Mark Otto
961687e4db run grunt dist 2013-12-18 14:26:37 -08:00
Mark Otto
0a955844ab rewrite readme to restore lost information, only with a bit more formatting consistency 2013-12-18 14:24:59 -08:00
Mark Otto
8598c700f5 Merge pull request #11927 from twbs/revert_commits
Revert commits
2013-12-18 14:21:35 -08:00
Julian Thilo
2b312bf3c1 Revert commits
Bootstrap is being relicensed from Apache 2.0 to MIT so that more of our community can use the free and open source software we lovely create together. As commits are copyright their original authors, the commits of any individual not agreeing to relicense their contributions are being removed to be later rewritten by the @twbs/team.

This undoes the changes introduced by the following commits:
7ea34ae0ef , 7376eef378 , 303ba1326b , 7d1c8c2a0c , 11319f6da9 , 110fc88601 , ced08f6935
2013-12-18 22:58:13 +01:00
Mark Otto
bc265ac647 callout colors 2013-12-18 13:52:39 -08:00
Mark Otto
1d0aa6e45c more docs 2013-12-18 13:40:29 -08:00
Mark Otto
d87e70fd49 footer alignment 2013-12-18 13:13:27 -08:00
Mark Otto
5bba874467 Merge branch 'master' into docs_derp 2013-12-18 13:06:47 -08:00
Mark Otto
3f577ab86c Merge pull request #11881 from ZDroid/patch-1
Require comma on left side
2013-12-18 13:01:43 -08:00
Mark Otto
ee709db679 Merge pull request #11804 from twbs/css-source-maps
enable CSS source maps in grunt-contrib-less
2013-12-18 12:57:38 -08:00
Chris Rebert
c4b0684e65 fix typo 2013-12-18 11:45:30 -08:00
Mark Otto
6315043b1c Merge branch 'master' into docs_derp 2013-12-18 11:41:48 -08:00
Mark Otto
c262e5b47c add source maps 2013-12-18 10:23:46 -08:00
Mark Otto
1bc8607bdf Merge branch 'master' into css-source-maps
Conflicts:
	Gruntfile.js
2013-12-18 10:22:18 -08:00
Mark Otto
d15218a09c Fixes #11899: Ensure proper margins and .small/small usage for heading tags (e.g., .h1-.h6) 2013-12-18 09:49:05 -08:00
Mark Otto
0d0b5c7ddb add inline note about navbar sizing 2013-12-18 09:48:04 -08:00
Mark Otto
c1f68dd4d4 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-18 09:42:45 -08:00
Mark Otto
8142493b42 fixes #11925: cover template for firefox 2013-12-18 09:42:37 -08:00
Mark Otto
b93d6dfbdf tweaks 2013-12-18 09:42:13 -08:00
Chris Rebert
671fb7020b Merge pull request #11923 from wangsai/fix-id
fix href of "Browser and device support"
2013-12-18 01:05:48 -08:00
wangsai
98ef4284f0 fix href of "Browser and device support" 2013-12-18 16:57:55 +08:00
Mark Otto
91fdd89100 Merge pull request #11910 from InWayOpenSource/btn-group-inside-input-group-btn
Fix handling of .btn-group placed inside .input-group-btn
2013-12-17 22:49:55 -08:00
Chris Rebert
36e3311b3e Merge pull request #11916 from ZDroid/fix-iversions
Downgrade Safari and OS X
2013-12-17 11:46:54 -08:00
Zlatan Vasović
575f29cee1 Downgrade Safari and OS X 2013-12-17 20:39:32 +01:00
Chris Rebert
dcfe710fa4 enable failHard grunt-html-validation option; fixes #11876 2013-12-17 01:35:16 -08:00
Chris Rebert
af1afb10bd upgrade to grunt-html-validation v0.1.11 2013-12-17 01:29:19 -08:00
Sebastian Podjasek
ae640d4f1c Fix handling of btn-group placed inside input-group-btn (used for mixing dropdowns with normal buttons) 2013-12-16 22:56:28 +01:00
Zlatan Vasović
ba3639b202 Require comma on left side 2013-12-16 18:06:31 +01:00
Chris Rebert
94635eb972 Merge pull request #11893 from twbs/separate-browsers-file
move Sauce test browsers list out of Gruntfile into separate file
2013-12-16 00:43:21 -08:00