mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-18 12:39:41 +03:00
Code Activity
10,911 Commits 83 Branches 79 Tags
16479e9051614696df3d21acd9d482018da17045
Commit Graph

10911 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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:
https://github.com/twbs/bootstrap/commit/7ea34ae0ef79c793e9a9d393b4eef825b71e84b5 , https://github.com/twbs/bootstrap/commit/7376eef378fe7d5e69b8b8cce93c7c64b751d55a , https://github.com/twbs/bootstrap/commit/303ba1326bbe367598ab4cc063b4607507208e56 , https://github.com/twbs/bootstrap/commit/7d1c8c2a0ce16331583a965821690f7715e62908 , https://github.com/twbs/bootstrap/commit/11319f6da9f9a19ec40743cdfe868ac732698149 , https://github.com/twbs/bootstrap/commit/110fc8860117d8675345806219ba313b18086db2 , https://github.com/twbs/bootstrap/commit/ced08f69359f3a70771804a98fa3c499f388cc74
 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
Chris Rebert 0f72123c43 move Sauce test browsers list out of Gruntfile into separate file 2013-12-16 00:42:45 -08:00
Mark Otto b6b2c90a7d Merge branch 'master' into docs_derp 2013-12-16 00:39:50 -08:00
Chris Rebert 2ae39d7166 Merge pull request #11891 from twbs/cache-jekyll-bundle 
use S3-cached Jekyll install to further speed up the Travis build
 2013-12-16 00:02:42 -08:00
Chris Rebert 498f00a244 use S3-cached Jekyll install 2013-12-15 23:52:44 -08:00
Mark Otto ec261a83a5 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-15 22:10:05 -08:00
Mark Otto ca14b9652c inform the people that fixed positioning ain't all it's cracked up to be /cc #11888 2013-12-15 22:09:45 -08:00
Mark Otto 05b0a74d9a Merge pull request #11887 from twbs/minor-panels-refactor 
minor refactoring of 4ee93c9f85
 2013-12-15 22:04:57 -08:00
Chris Rebert 6bb73df50e Merge pull request #11890 from twbs/generic-caching 
make S3 caching significantly more generic
 2013-12-15 21:26:52 -08:00
Chris Rebert 95c72b573e make S3 caching significantly more generic 2013-12-15 21:12:33 -08:00
Chris Rebert 637b20f6d5 minor refactoring of 4ee93c9f85 2013-12-15 20:56:23 -08:00
Chris Rebert 75db355073 Merge pull request #11886 from twbs/html-validator-config 
explicitly set more HTML5 validator options
 2013-12-15 19:45:34 -08:00
Chris Rebert 43c3d785ef explicitly set more HTML5 validator options 2013-12-15 19:42:47 -08:00
Chris Rebert 94bdea0054 use unique IDs for input feedback examples so HTML validates 2013-12-15 19:15:26 -08:00
Chris Rebert f8cee54f4b use unique IDs for modal labels in doc examples so HTML validates 2013-12-15 19:07:26 -08:00