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
Mark Otto
07705673b6
Merge branch 'master' into docs_derp
...
Conflicts:
_layouts/default.html
2013-12-18 16:19:46 -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
