rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Code Issues Actions Packages Releases Activity
7,918 Commits 108 Branches 89 Tags 552 MiB
6645e5daad
Commit Graph

7918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Rebert
fb8310fbc6 Merge pull request #11936 from KostyaTretyak/patch-1 
Deleted curly brackets (in css.html)
 2013-12-19 01:23:10 -08:00
kostyatretyak
09c7870971 Deleted curly brackets (in css.html) 2013-12-19 11:07:56 +02:00
Chris Rebert
85ba12932f Merge pull request #11935 from tlindig/tl_fix_typo_modal-open 
Docu: typo fix: replaced 'model-open' with 'modal-open'
 2013-12-19 00:30:04 -08:00
Tobias Lindig
50f1bc47ec typo fix: replaced 'model-open' with 'modal-open' 2013-12-19 09:09:04 +01:00
Chris Rebert
091146ee73 Merge pull request #11934 from twbs/auto-latest-browsers 
omit versions in Sauce browser config; no explicit version implies latest
 2013-12-18 23:39:03 -08:00
Chris Rebert
fbb0e8b146 omit versions in Sauce browser config; no explicit version implies latest version 2013-12-18 23:29:52 -08:00
Mark Otto
edbd1a81e0 Merge pull request #11932 from dzwillia/th-td-position-static 
Added position: static to table th and td when using grid classes for sizing
 2013-12-18 21:41:19 -08:00
fat
22f9767714 check that href id's are followed by valid char – fixes #10044 2013-12-18 21:14:01 -08:00
dzwillia
d9586e2863 Added position: static to table th and td. 2013-12-19 00:10:58 -05:00
Ross Allen
b048ea545f Write Glyphicons to _data, generate Glyphicons markup 
This generates a glyphicons.yml file from the glyphicons.less source,
and then components.html uses that data to generate the Glyphicons docs
by iterating through the data. The _data directory was introduced in
Jekyll 1.3.0, and GitHub Pages is already on [version 1.4.2][1].

Fixes #11862.

[1] https://github.com/github/pages-gem/blob/master/github-pages.gemspec#L16
 2013-12-18 20:15:51 -08:00
Mark Otto
87727370e0 Merge pull request #11929 from twbs/maintainers 
mention core team maintenance & community contributors
 2013-12-18 19:04:18 -08:00
Chris Rebert
07da1d731a mention core team maintenance & community contributors 2013-12-18 18:54:07 -08:00
Mark Otto
4eaa297e68 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-18 17:34:40 -08:00
Mark Otto
b59b37bc2c Fixes #11918: Fork the @h5bp contributing guidelines and combine with our coding guidelines 2013-12-18 17:34:30 -08:00
Mark Otto
b8810fb75d Fixes 2013-12-18 17:32:52 -08:00
Mark Otto
171c4b7fc4 fixes #11447: add docs warning about loading once for remote modal option 2013-12-18 16:56:41 -08:00
Chris Rebert
08854cf8a6 using templating doesn't seem to work there; hardcode license URL instead 
Tested the customizer, the generated zip had:
    css/bootstrap.css:line 6: * Licensed under MIT (<%= _.pluck(pkg.licenses, "url").join(", ") %>)
Revised customizer generates:
    css/bootstrap.css:line 4: * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 2013-12-18 16:25:23 -08:00
Chris Rebert
fe7c7ccf29 rebuild minified customizer JS so it reflects the licensing change 2013-12-18 15:50:59 -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
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
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