0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-13 01:08:58 +01:00
Commit Graph

7896 Commits

Author SHA1 Message Date
Mark Otto
2f56922937 config url 2013-12-21 10:09:39 -08:00
Mark Otto
bb644eede6 Team members on About page 2013-12-21 10:08:04 -08:00
Mark Otto
86e6c869a3 remove some unintional code 2013-12-21 09:59:24 -08:00
Mark Otto
0c49f846e3 Merge branch 'master' into sass_docs 2013-12-21 09:45:47 -08:00
Mark Otto
5f9695ae7c readme typo from #11965 2013-12-21 09:36:51 -08:00
Mark Otto
b734a2a435 Merge pull request #11965 from tomByrer/md-tweaks
condenced README CONTRIB changes
2013-12-21 09:36:18 -08:00
tomByrer
c84688fc4f https://github.com/twbs/bootstrap/pull/11950#issuecomment-31033824 2013-12-21 09:39:34 -07:00
Mark Otto
033476ccc7 more Less 2013-12-20 21:19:45 -08:00
Mark Otto
66c280c855 Sass docs; LESS to Less because fuck caps 2013-12-20 21:02:25 -08:00
Mark Otto
810c7ec4f8 Merge pull request #11956 from tlindig/tl_pagination_customizing
add new variables for "pagination" to improve support of customizing
2013-12-20 12:29:49 -08:00
Mark Otto
e1bd300f2f Merge pull request #11960 from ZDroid/no-leading-commas-json
Drop remaining leading commas
2013-12-20 11:18:04 -08:00
Zlatan Vasović
b604c2fbac Drop remaining leading commas 2013-12-20 20:09:51 +01:00
Mark Otto
f1d4a3bb5c Merge pull request #11959 from ZDroid/update-grunt-csscomb
Update grunt-csscomb dependency
2013-12-20 11:08:39 -08:00
Zlatan Vasović
e95c396f44 Update grunt-csscomb dependency
Per David DM.
2013-12-20 19:59:18 +01:00
Tobias Lindig
7f599cedf3 add new variables for "pagination" to improve support of customizing 2013-12-20 17:06:53 +01:00
Mark Otto
2854c5c3fb Fixes #11952: Refactor blockquote styles
* Deprecate .pull-right class for .blockquote-reverse
* Move font-size change to the parent, blockquote, instead of setting on the p element to allow more flexible content
2013-12-19 19:40:08 -08:00
Mark Otto
81b1e6801f correct jsbin link 2013-12-19 19:28:22 -08:00
Chris Rebert
2c5e5b23e1 Merge pull request #11951 from bnewcomb/master
Fix sentence grammar
2013-12-19 19:10:16 -08:00
Ben Newcomb
2e0337a61b Minor grammar change
'as well' was used twice in sentence
2013-12-19 18:57:43 -08:00
Mark Otto
523eca14e8 Merge pull request #11930 from ssorallen/master
Write Glyphicons to _data, generate Glyphicons markup
2013-12-19 15:03:43 -08:00
Mark Otto
4a01acaf67 Merge pull request #11941 from ZDroid/left-plus
No leading pluses
2013-12-19 14:06:01 -08:00
Mark Otto
caadd72084 Merge pull request #11939 from ZDroid/weird-indents
2 instead of 4 spaces in .csscomb.json
2013-12-19 14:05:19 -08:00
Chris Rebert
2898e73ec4 "Thosing" [sic] => "Those" 2013-12-19 11:39:57 -08:00
Julian Thilo
fc03fac9e4 Fix sentence in css.html 2013-12-19 20:12:31 +01:00
Julian Thilo
b298d2f481 Merge pull request #11945 from robertgentel/patch-1
Update css.html
2013-12-19 10:56:36 -08:00
robertgentel
ded1e72202 Update css.html
Documentation (missing word)
2013-12-19 11:06:45 -06:00
Zlatan Vasović
1bf5abab31 No leading pluses 2013-12-19 15:32:37 +01:00
Zlatan Vasović
9201ccd08b 2 instead of 4 spaces in .csscomb.json 2013-12-19 13:11:05 +01:00
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