From 62a878ded3606801b3a86961281fa5cd2a97beca Mon Sep 17 00:00:00 2001 From: Ben Sturmfels Date: Tue, 17 Aug 2021 21:56:18 +1000 Subject: [PATCH] Update tests to match theme changes --- .../article_with_nonconformant_meta_tags.html | 1 + .../basic/a-markdown-powered-article.html | 1 + pelican/tests/output/basic/archives.html | 1 + pelican/tests/output/basic/article-1.html | 1 + pelican/tests/output/basic/article-2.html | 1 + pelican/tests/output/basic/article-3.html | 1 + .../output/basic/author/alexis-metaireau.html | 1 + pelican/tests/output/basic/authors.html | 1 + pelican/tests/output/basic/categories.html | 1 + pelican/tests/output/basic/category/bar.html | 1 + pelican/tests/output/basic/category/cat1.html | 1 + pelican/tests/output/basic/category/misc.html | 1 + pelican/tests/output/basic/category/yeah.html | 1 + .../drafts/a-draft-article-without-date.html | 1 + .../output/basic/drafts/a-draft-article.html | 1 + .../basic/filename_metadata-example.html | 1 + pelican/tests/output/basic/index.html | 1 + pelican/tests/output/basic/oh-yeah-fr.html | 1 + pelican/tests/output/basic/oh-yeah.html | 1 + .../tests/output/basic/override/index.html | 1 + .../pages/this-is-a-test-hidden-page.html | 1 + .../basic/pages/this-is-a-test-page.html | 1 + .../tests/output/basic/second-article-fr.html | 1 + .../tests/output/basic/second-article.html | 1 + pelican/tests/output/basic/tag/bar.html | 1 + pelican/tests/output/basic/tag/baz.html | 1 + pelican/tests/output/basic/tag/foo.html | 1 + pelican/tests/output/basic/tag/foobar.html | 1 + pelican/tests/output/basic/tag/oh.html | 1 + pelican/tests/output/basic/tag/yeah.html | 1 + pelican/tests/output/basic/tags.html | 1 + pelican/tests/output/basic/theme/css/main.css | 48 +++++++++++-------- .../output/basic/this-is-a-super-article.html | 1 + pelican/tests/output/basic/unbelievable.html | 1 + .../custom/a-markdown-powered-article.html | 1 + pelican/tests/output/custom/archives.html | 1 + pelican/tests/output/custom/article-1.html | 1 + pelican/tests/output/custom/article-2.html | 1 + pelican/tests/output/custom/article-3.html | 1 + .../custom/author/alexis-metaireau.html | 1 + .../custom/author/alexis-metaireau2.html | 1 + .../custom/author/alexis-metaireau3.html | 1 + pelican/tests/output/custom/authors.html | 1 + pelican/tests/output/custom/categories.html | 1 + pelican/tests/output/custom/category/bar.html | 1 + .../tests/output/custom/category/cat1.html | 1 + .../tests/output/custom/category/misc.html | 1 + .../tests/output/custom/category/yeah.html | 1 + .../drafts/a-draft-article-without-date.html | 1 + .../output/custom/drafts/a-draft-article.html | 1 + .../custom/filename_metadata-example.html | 1 + pelican/tests/output/custom/index.html | 1 + pelican/tests/output/custom/index2.html | 1 + pelican/tests/output/custom/index3.html | 1 + .../tests/output/custom/jinja2_template.html | 1 + pelican/tests/output/custom/oh-yeah-fr.html | 1 + pelican/tests/output/custom/oh-yeah.html | 1 + .../tests/output/custom/override/index.html | 1 + .../pages/this-is-a-test-hidden-page.html | 1 + .../custom/pages/this-is-a-test-page.html | 1 + .../output/custom/second-article-fr.html | 1 + .../tests/output/custom/second-article.html | 1 + pelican/tests/output/custom/tag/bar.html | 1 + pelican/tests/output/custom/tag/baz.html | 1 + pelican/tests/output/custom/tag/foo.html | 1 + pelican/tests/output/custom/tag/foobar.html | 1 + pelican/tests/output/custom/tag/oh.html | 1 + pelican/tests/output/custom/tag/yeah.html | 1 + pelican/tests/output/custom/tags.html | 1 + .../tests/output/custom/theme/css/main.css | 48 +++++++++++-------- .../custom/this-is-a-super-article.html | 1 + pelican/tests/output/custom/unbelievable.html | 1 + .../tests/output/custom_locale/archives.html | 1 + .../author/alexis-metaireau.html | 1 + .../author/alexis-metaireau2.html | 1 + .../author/alexis-metaireau3.html | 1 + .../tests/output/custom_locale/authors.html | 1 + .../output/custom_locale/categories.html | 1 + .../output/custom_locale/category/bar.html | 1 + .../output/custom_locale/category/cat1.html | 1 + .../output/custom_locale/category/misc.html | 1 + .../output/custom_locale/category/yeah.html | 1 + .../output/custom_locale/theme/css/main.css | 48 +++++++++++-------- 83 files changed, 161 insertions(+), 63 deletions(-) diff --git a/pelican/tests/content/article_with_nonconformant_meta_tags.html b/pelican/tests/content/article_with_nonconformant_meta_tags.html index 5ed44bbd..b8ef1723 100644 --- a/pelican/tests/content/article_with_nonconformant_meta_tags.html +++ b/pelican/tests/content/article_with_nonconformant_meta_tags.html @@ -1,6 +1,7 @@ + Article with Nonconformant HTML meta tags diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html index 894fb8c9..ca9b62eb 100644 --- a/pelican/tests/output/basic/a-markdown-powered-article.html +++ b/pelican/tests/output/basic/a-markdown-powered-article.html @@ -2,6 +2,7 @@ + A markdown powered article diff --git a/pelican/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html index 27cbb73e..93c1d5be 100644 --- a/pelican/tests/output/basic/archives.html +++ b/pelican/tests/output/basic/archives.html @@ -2,6 +2,7 @@ + A Pelican Blog diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html index 5e1196b7..4dee2eb6 100644 --- a/pelican/tests/output/basic/article-1.html +++ b/pelican/tests/output/basic/article-1.html @@ -2,6 +2,7 @@ + Article 1 diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html index 7dab6907..7e5995c0 100644 --- a/pelican/tests/output/basic/article-2.html +++ b/pelican/tests/output/basic/article-2.html @@ -2,6 +2,7 @@ + Article 2 diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html index ba934652..b0b8ed1b 100644 --- a/pelican/tests/output/basic/article-3.html +++ b/pelican/tests/output/basic/article-3.html @@ -2,6 +2,7 @@ + Article 3 diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html index a4d7a279..87eaa461 100644 --- a/pelican/tests/output/basic/author/alexis-metaireau.html +++ b/pelican/tests/output/basic/author/alexis-metaireau.html @@ -2,6 +2,7 @@ + A Pelican Blog - Alexis Métaireau diff --git a/pelican/tests/output/basic/authors.html b/pelican/tests/output/basic/authors.html index f062ccf6..937a3085 100644 --- a/pelican/tests/output/basic/authors.html +++ b/pelican/tests/output/basic/authors.html @@ -2,6 +2,7 @@ + A Pelican Blog - Authors diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html index e9d981c8..930503a8 100644 --- a/pelican/tests/output/basic/categories.html +++ b/pelican/tests/output/basic/categories.html @@ -2,6 +2,7 @@ + A Pelican Blog - Categories diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html index 7e272b78..65b7b04e 100644 --- a/pelican/tests/output/basic/category/bar.html +++ b/pelican/tests/output/basic/category/bar.html @@ -2,6 +2,7 @@ + A Pelican Blog - bar diff --git a/pelican/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html index eccf5587..62fb034c 100644 --- a/pelican/tests/output/basic/category/cat1.html +++ b/pelican/tests/output/basic/category/cat1.html @@ -2,6 +2,7 @@ + A Pelican Blog - cat1 diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html index 119f5931..c7e86f19 100644 --- a/pelican/tests/output/basic/category/misc.html +++ b/pelican/tests/output/basic/category/misc.html @@ -2,6 +2,7 @@ + A Pelican Blog - misc diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html index 31a95629..9d2f30a2 100644 --- a/pelican/tests/output/basic/category/yeah.html +++ b/pelican/tests/output/basic/category/yeah.html @@ -2,6 +2,7 @@ + A Pelican Blog - yeah diff --git a/pelican/tests/output/basic/drafts/a-draft-article-without-date.html b/pelican/tests/output/basic/drafts/a-draft-article-without-date.html index 039f2187..bc30dabd 100644 --- a/pelican/tests/output/basic/drafts/a-draft-article-without-date.html +++ b/pelican/tests/output/basic/drafts/a-draft-article-without-date.html @@ -2,6 +2,7 @@ + A draft article without date diff --git a/pelican/tests/output/basic/drafts/a-draft-article.html b/pelican/tests/output/basic/drafts/a-draft-article.html index 068b414a..4abd4946 100644 --- a/pelican/tests/output/basic/drafts/a-draft-article.html +++ b/pelican/tests/output/basic/drafts/a-draft-article.html @@ -2,6 +2,7 @@ + A draft article diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html index 6a6ee389..ae19ceb1 100644 --- a/pelican/tests/output/basic/filename_metadata-example.html +++ b/pelican/tests/output/basic/filename_metadata-example.html @@ -2,6 +2,7 @@ + FILENAME_METADATA example diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html index e10477db..d67b9826 100644 --- a/pelican/tests/output/basic/index.html +++ b/pelican/tests/output/basic/index.html @@ -2,6 +2,7 @@ + A Pelican Blog diff --git a/pelican/tests/output/basic/oh-yeah-fr.html b/pelican/tests/output/basic/oh-yeah-fr.html index 58b933aa..183754ff 100644 --- a/pelican/tests/output/basic/oh-yeah-fr.html +++ b/pelican/tests/output/basic/oh-yeah-fr.html @@ -2,6 +2,7 @@ + Trop bien ! diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html index 1b8077f8..f63302d2 100644 --- a/pelican/tests/output/basic/oh-yeah.html +++ b/pelican/tests/output/basic/oh-yeah.html @@ -2,6 +2,7 @@ + Oh yeah ! diff --git a/pelican/tests/output/basic/override/index.html b/pelican/tests/output/basic/override/index.html index c3613174..1d5531d7 100644 --- a/pelican/tests/output/basic/override/index.html +++ b/pelican/tests/output/basic/override/index.html @@ -2,6 +2,7 @@ + Override url/save_as diff --git a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html index 21fabf62..8c14e354 100644 --- a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html +++ b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html @@ -2,6 +2,7 @@ + This is a test hidden page diff --git a/pelican/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html index 3970e3ff..1fdb846f 100644 --- a/pelican/tests/output/basic/pages/this-is-a-test-page.html +++ b/pelican/tests/output/basic/pages/this-is-a-test-page.html @@ -2,6 +2,7 @@ + This is a test page diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html index 87b95cc4..b49c4517 100644 --- a/pelican/tests/output/basic/second-article-fr.html +++ b/pelican/tests/output/basic/second-article-fr.html @@ -2,6 +2,7 @@ + Deuxième article diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html index 3e0c5296..2b3bca88 100644 --- a/pelican/tests/output/basic/second-article.html +++ b/pelican/tests/output/basic/second-article.html @@ -2,6 +2,7 @@ + Second article diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html index ead02cd8..a78c08f9 100644 --- a/pelican/tests/output/basic/tag/bar.html +++ b/pelican/tests/output/basic/tag/bar.html @@ -2,6 +2,7 @@ + A Pelican Blog - bar diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html index c891121e..0b7d04ab 100644 --- a/pelican/tests/output/basic/tag/baz.html +++ b/pelican/tests/output/basic/tag/baz.html @@ -2,6 +2,7 @@ + The baz tag diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html index 3a00a6ab..6ec55bee 100644 --- a/pelican/tests/output/basic/tag/foo.html +++ b/pelican/tests/output/basic/tag/foo.html @@ -2,6 +2,7 @@ + A Pelican Blog - foo diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html index 5418f872..def1d0c6 100644 --- a/pelican/tests/output/basic/tag/foobar.html +++ b/pelican/tests/output/basic/tag/foobar.html @@ -2,6 +2,7 @@ + A Pelican Blog - foobar diff --git a/pelican/tests/output/basic/tag/oh.html b/pelican/tests/output/basic/tag/oh.html index c2de8b5b..11b06e61 100644 --- a/pelican/tests/output/basic/tag/oh.html +++ b/pelican/tests/output/basic/tag/oh.html @@ -2,6 +2,7 @@ + Oh Oh Oh diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html index 88660359..565a3a25 100644 --- a/pelican/tests/output/basic/tag/yeah.html +++ b/pelican/tests/output/basic/tag/yeah.html @@ -2,6 +2,7 @@ + A Pelican Blog - yeah diff --git a/pelican/tests/output/basic/tags.html b/pelican/tests/output/basic/tags.html index 3f88ce9e..6dce2632 100644 --- a/pelican/tests/output/basic/tags.html +++ b/pelican/tests/output/basic/tags.html @@ -2,6 +2,7 @@ + A Pelican Blog - Tags diff --git a/pelican/tests/output/basic/theme/css/main.css b/pelican/tests/output/basic/theme/css/main.css index aaea9b81..a4aa51a1 100644 --- a/pelican/tests/output/basic/theme/css/main.css +++ b/pelican/tests/output/basic/theme/css/main.css @@ -147,7 +147,8 @@ aside, nav, article, figure { } /***** Layout *****/ -.body {clear: both; margin: 0 auto; width: 800px;} +.body {clear: both; margin: 0 auto; max-width: 800px;} +img { max-width: 100%; } img.right, figure.right, div.figure.align-right { float: right; margin: 0 0 2em 2em; @@ -159,7 +160,7 @@ img.left, figure.left, div.figure.align-left { /* .rst support */ div.figure img, figure img { /* to fill figure exactly */ - width: 100%; + max-width: 100%; } div.figure p.caption, figure p.caption { /* margin provided by figure */ margin-top: 0; @@ -171,16 +172,21 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */ *****************/ #banner { margin: 0 auto; - padding: 2.5em 0 0 0; + padding: 0.8em 0 0 0; } /* Banner */ - #banner h1 {font-size: 3.571em; line-height: 0;} + #banner h1 { + font-size: 3.571em; + line-height: 1.0; + margin-bottom: .3em; + } + #banner h1 a:link, #banner h1 a:visited { color: #000305; display: block; font-weight: bold; - margin: 0 0 .6em .2em; + margin: 0 0 0 .2em; text-decoration: none; } #banner h1 a:hover, #banner h1 a:active { @@ -195,19 +201,19 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */ #banner nav { background: #000305; font-size: 1.143em; - height: 40px; + overflow: auto; line-height: 30px; margin: 0 auto 2em auto; padding: 0; text-align: center; - width: 800px; + max-width: 800px; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; } - #banner nav ul {list-style: none; margin: 0 auto; width: 800px;} + #banner nav ul {list-style: none; margin: 0 auto; max-width: 800px;} #banner nav li {float: left; display: inline; margin: 0;} #banner nav a:link, #banner nav a:visited { @@ -242,7 +248,7 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */ margin-bottom: 2em; overflow: hidden; padding: 20px; - width: 760px; + max-width: 760px; border-radius: 10px; -moz-border-radius: 10px; @@ -253,7 +259,7 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */ border: 2px solid #eee; float: right; margin: 0.786em 2em 0 5em; - width: 248px; + max-width: 248px; } #featured figure img {display: block; float: right;} @@ -271,7 +277,7 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */ margin-bottom: 2em; overflow: hidden; padding: 20px 20px; - width: 760px; + max-width: 760px; border-radius: 10px; -moz-border-radius: 10px; @@ -305,15 +311,15 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */ /* Blogroll */ #extras .blogroll { float: left; - width: 615px; + max-width: 615px; } - #extras .blogroll li {float: left; margin: 0 20px 0 0; width: 185px;} + #extras .blogroll li {float: left; margin: 0 20px 0 0; max-width: 185px;} /* Social */ #extras .social { float: right; - width: 175px; + max-width: 175px; } #extras div[class='social'] a { @@ -359,20 +365,20 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */ overflow: hidden; padding: 20px; text-align: left; - width: 760px; + max-width: 760px; border-radius: 10px; -moz-border-radius: 10px; -webkit-border-radius: 10px; } -#about .primary {float: left; width: 165px;} +#about .primary {float: left; max-width: 165px;} #about .primary strong {color: #C64350; display: block; font-size: 1.286em;} #about .photo {float: left; margin: 5px 20px;} #about .url:link, #about .url:visited {text-decoration: none;} -#about .bio {float: right; width: 500px;} +#about .bio {float: right; max-width: 500px;} /* Footer @@ -410,7 +416,7 @@ li:first-child .hentry, #content > .hentry {border: 0; margin: 0;} position: relative; float: left; top: 0.5em; - width: 190px; + max-width: 190px; } /* About the Author */ @@ -453,12 +459,12 @@ li:first-child .hentry, #content > .hentry {border: 0; margin: 0;} #comments-list li:nth-child(2n) blockquote {background: #F5f5f5;} /* Add a Comment */ - #add-comment label {clear: left; float: left; text-align: left; width: 150px;} + #add-comment label {clear: left; float: left; text-align: left; max-width: 150px;} #add-comment input[type='text'], #add-comment input[type='email'], - #add-comment input[type='url'] {float: left; width: 200px;} + #add-comment input[type='url'] {float: left; max-width: 200px;} - #add-comment textarea {float: left; height: 150px; width: 495px;} + #add-comment textarea {float: left; height: 150px; max-width: 495px;} #add-comment p.req {clear: both; margin: 0 .5em 1em 0; text-align: right;} diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html index bd1472e4..8681bb1b 100644 --- a/pelican/tests/output/basic/this-is-a-super-article.html +++ b/pelican/tests/output/basic/this-is-a-super-article.html @@ -2,6 +2,7 @@ + This is a super article ! diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html index 33e0ad53..d623eced 100644 --- a/pelican/tests/output/basic/unbelievable.html +++ b/pelican/tests/output/basic/unbelievable.html @@ -2,6 +2,7 @@ + Unbelievable ! diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html index 00aa18e8..36fb242f 100644 --- a/pelican/tests/output/custom/a-markdown-powered-article.html +++ b/pelican/tests/output/custom/a-markdown-powered-article.html @@ -2,6 +2,7 @@ + A markdown powered article diff --git a/pelican/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html index 1e9a8377..e1dad53d 100644 --- a/pelican/tests/output/custom/archives.html +++ b/pelican/tests/output/custom/archives.html @@ -2,6 +2,7 @@ + Alexis' log diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html index cc15ba5c..6f3e0cc1 100644 --- a/pelican/tests/output/custom/article-1.html +++ b/pelican/tests/output/custom/article-1.html @@ -2,6 +2,7 @@ + Article 1 diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html index cc331a4d..094471de 100644 --- a/pelican/tests/output/custom/article-2.html +++ b/pelican/tests/output/custom/article-2.html @@ -2,6 +2,7 @@ + Article 2 diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html index 8b180180..3d93d807 100644 --- a/pelican/tests/output/custom/article-3.html +++ b/pelican/tests/output/custom/article-3.html @@ -2,6 +2,7 @@ + Article 3 diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html index f768b15e..95653b66 100644 --- a/pelican/tests/output/custom/author/alexis-metaireau.html +++ b/pelican/tests/output/custom/author/alexis-metaireau.html @@ -2,6 +2,7 @@ + Alexis' log - Alexis Métaireau diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html index 96b34bff..281c7ad8 100644 --- a/pelican/tests/output/custom/author/alexis-metaireau2.html +++ b/pelican/tests/output/custom/author/alexis-metaireau2.html @@ -2,6 +2,7 @@ + Alexis' log - Alexis Métaireau diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html index 407c1a51..b5b86c42 100644 --- a/pelican/tests/output/custom/author/alexis-metaireau3.html +++ b/pelican/tests/output/custom/author/alexis-metaireau3.html @@ -2,6 +2,7 @@ + Alexis' log - Alexis Métaireau diff --git a/pelican/tests/output/custom/authors.html b/pelican/tests/output/custom/authors.html index 6374c4a4..303e79c4 100644 --- a/pelican/tests/output/custom/authors.html +++ b/pelican/tests/output/custom/authors.html @@ -2,6 +2,7 @@ + Alexis' log - Authors diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html index 393aef32..543eb1ee 100644 --- a/pelican/tests/output/custom/categories.html +++ b/pelican/tests/output/custom/categories.html @@ -2,6 +2,7 @@ + Alexis' log - Categories diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html index 4511bcb6..bd277a83 100644 --- a/pelican/tests/output/custom/category/bar.html +++ b/pelican/tests/output/custom/category/bar.html @@ -2,6 +2,7 @@ + Alexis' log - bar diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html index dc5c0579..73df4388 100644 --- a/pelican/tests/output/custom/category/cat1.html +++ b/pelican/tests/output/custom/category/cat1.html @@ -2,6 +2,7 @@ + Alexis' log - cat1 diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html index 053599ed..dda4c75f 100644 --- a/pelican/tests/output/custom/category/misc.html +++ b/pelican/tests/output/custom/category/misc.html @@ -2,6 +2,7 @@ + Alexis' log - misc diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html index 17e8103e..8bfc1f48 100644 --- a/pelican/tests/output/custom/category/yeah.html +++ b/pelican/tests/output/custom/category/yeah.html @@ -2,6 +2,7 @@ + Alexis' log - yeah diff --git a/pelican/tests/output/custom/drafts/a-draft-article-without-date.html b/pelican/tests/output/custom/drafts/a-draft-article-without-date.html index 03aecc56..12ddfbeb 100644 --- a/pelican/tests/output/custom/drafts/a-draft-article-without-date.html +++ b/pelican/tests/output/custom/drafts/a-draft-article-without-date.html @@ -2,6 +2,7 @@ + A draft article without date diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html index 87be8bec..77b12cf3 100644 --- a/pelican/tests/output/custom/drafts/a-draft-article.html +++ b/pelican/tests/output/custom/drafts/a-draft-article.html @@ -2,6 +2,7 @@ + A draft article diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html index 2fcbe562..2c5e8178 100644 --- a/pelican/tests/output/custom/filename_metadata-example.html +++ b/pelican/tests/output/custom/filename_metadata-example.html @@ -2,6 +2,7 @@ + FILENAME_METADATA example diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html index ff675f85..076cf519 100644 --- a/pelican/tests/output/custom/index.html +++ b/pelican/tests/output/custom/index.html @@ -2,6 +2,7 @@ + Alexis' log diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html index 941c176e..13a857a8 100644 --- a/pelican/tests/output/custom/index2.html +++ b/pelican/tests/output/custom/index2.html @@ -2,6 +2,7 @@ + Alexis' log diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html index de32dbe3..147f2ee2 100644 --- a/pelican/tests/output/custom/index3.html +++ b/pelican/tests/output/custom/index3.html @@ -2,6 +2,7 @@ + Alexis' log diff --git a/pelican/tests/output/custom/jinja2_template.html b/pelican/tests/output/custom/jinja2_template.html index 1ba06323..cefce74f 100644 --- a/pelican/tests/output/custom/jinja2_template.html +++ b/pelican/tests/output/custom/jinja2_template.html @@ -2,6 +2,7 @@ + Alexis' log diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html index bb7eb44e..ec75b731 100644 --- a/pelican/tests/output/custom/oh-yeah-fr.html +++ b/pelican/tests/output/custom/oh-yeah-fr.html @@ -2,6 +2,7 @@ + Trop bien ! diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html index f7afb399..109525a5 100644 --- a/pelican/tests/output/custom/oh-yeah.html +++ b/pelican/tests/output/custom/oh-yeah.html @@ -2,6 +2,7 @@ + Oh yeah ! diff --git a/pelican/tests/output/custom/override/index.html b/pelican/tests/output/custom/override/index.html index ebf07d8d..004c38fd 100644 --- a/pelican/tests/output/custom/override/index.html +++ b/pelican/tests/output/custom/override/index.html @@ -2,6 +2,7 @@ + Override url/save_as diff --git a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html index e5fa1aaf..652fc7d0 100644 --- a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html +++ b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html @@ -2,6 +2,7 @@ + This is a test hidden page diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html index 26c6c0e9..2bcefd3d 100644 --- a/pelican/tests/output/custom/pages/this-is-a-test-page.html +++ b/pelican/tests/output/custom/pages/this-is-a-test-page.html @@ -2,6 +2,7 @@ + This is a test page diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html index 8e360e9c..09f43888 100644 --- a/pelican/tests/output/custom/second-article-fr.html +++ b/pelican/tests/output/custom/second-article-fr.html @@ -2,6 +2,7 @@ + Deuxième article diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html index 5001f0d0..f21a5495 100644 --- a/pelican/tests/output/custom/second-article.html +++ b/pelican/tests/output/custom/second-article.html @@ -2,6 +2,7 @@ + Second article diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html index b2b22714..1efa16e7 100644 --- a/pelican/tests/output/custom/tag/bar.html +++ b/pelican/tests/output/custom/tag/bar.html @@ -2,6 +2,7 @@ + Alexis' log - bar diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html index ef53c34c..c524db13 100644 --- a/pelican/tests/output/custom/tag/baz.html +++ b/pelican/tests/output/custom/tag/baz.html @@ -2,6 +2,7 @@ + The baz tag diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html index 7684fbc5..ca3f40f2 100644 --- a/pelican/tests/output/custom/tag/foo.html +++ b/pelican/tests/output/custom/tag/foo.html @@ -2,6 +2,7 @@ + Alexis' log - foo diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html index 5816e395..ccca5477 100644 --- a/pelican/tests/output/custom/tag/foobar.html +++ b/pelican/tests/output/custom/tag/foobar.html @@ -2,6 +2,7 @@ + Alexis' log - foobar diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html index 16ea9d0d..f3c70495 100644 --- a/pelican/tests/output/custom/tag/oh.html +++ b/pelican/tests/output/custom/tag/oh.html @@ -2,6 +2,7 @@ + Oh Oh Oh diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html index 929a48e0..96767503 100644 --- a/pelican/tests/output/custom/tag/yeah.html +++ b/pelican/tests/output/custom/tag/yeah.html @@ -2,6 +2,7 @@ + Alexis' log - yeah diff --git a/pelican/tests/output/custom/tags.html b/pelican/tests/output/custom/tags.html index 244c21e3..b23f468f 100644 --- a/pelican/tests/output/custom/tags.html +++ b/pelican/tests/output/custom/tags.html @@ -2,6 +2,7 @@ + Alexis' log - Tags diff --git a/pelican/tests/output/custom/theme/css/main.css b/pelican/tests/output/custom/theme/css/main.css index aaea9b81..a4aa51a1 100644 --- a/pelican/tests/output/custom/theme/css/main.css +++ b/pelican/tests/output/custom/theme/css/main.css @@ -147,7 +147,8 @@ aside, nav, article, figure { } /***** Layout *****/ -.body {clear: both; margin: 0 auto; width: 800px;} +.body {clear: both; margin: 0 auto; max-width: 800px;} +img { max-width: 100%; } img.right, figure.right, div.figure.align-right { float: right; margin: 0 0 2em 2em; @@ -159,7 +160,7 @@ img.left, figure.left, div.figure.align-left { /* .rst support */ div.figure img, figure img { /* to fill figure exactly */ - width: 100%; + max-width: 100%; } div.figure p.caption, figure p.caption { /* margin provided by figure */ margin-top: 0; @@ -171,16 +172,21 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */ *****************/ #banner { margin: 0 auto; - padding: 2.5em 0 0 0; + padding: 0.8em 0 0 0; } /* Banner */ - #banner h1 {font-size: 3.571em; line-height: 0;} + #banner h1 { + font-size: 3.571em; + line-height: 1.0; + margin-bottom: .3em; + } + #banner h1 a:link, #banner h1 a:visited { color: #000305; display: block; font-weight: bold; - margin: 0 0 .6em .2em; + margin: 0 0 0 .2em; text-decoration: none; } #banner h1 a:hover, #banner h1 a:active { @@ -195,19 +201,19 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */ #banner nav { background: #000305; font-size: 1.143em; - height: 40px; + overflow: auto; line-height: 30px; margin: 0 auto 2em auto; padding: 0; text-align: center; - width: 800px; + max-width: 800px; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; } - #banner nav ul {list-style: none; margin: 0 auto; width: 800px;} + #banner nav ul {list-style: none; margin: 0 auto; max-width: 800px;} #banner nav li {float: left; display: inline; margin: 0;} #banner nav a:link, #banner nav a:visited { @@ -242,7 +248,7 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */ margin-bottom: 2em; overflow: hidden; padding: 20px; - width: 760px; + max-width: 760px; border-radius: 10px; -moz-border-radius: 10px; @@ -253,7 +259,7 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */ border: 2px solid #eee; float: right; margin: 0.786em 2em 0 5em; - width: 248px; + max-width: 248px; } #featured figure img {display: block; float: right;} @@ -271,7 +277,7 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */ margin-bottom: 2em; overflow: hidden; padding: 20px 20px; - width: 760px; + max-width: 760px; border-radius: 10px; -moz-border-radius: 10px; @@ -305,15 +311,15 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */ /* Blogroll */ #extras .blogroll { float: left; - width: 615px; + max-width: 615px; } - #extras .blogroll li {float: left; margin: 0 20px 0 0; width: 185px;} + #extras .blogroll li {float: left; margin: 0 20px 0 0; max-width: 185px;} /* Social */ #extras .social { float: right; - width: 175px; + max-width: 175px; } #extras div[class='social'] a { @@ -359,20 +365,20 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */ overflow: hidden; padding: 20px; text-align: left; - width: 760px; + max-width: 760px; border-radius: 10px; -moz-border-radius: 10px; -webkit-border-radius: 10px; } -#about .primary {float: left; width: 165px;} +#about .primary {float: left; max-width: 165px;} #about .primary strong {color: #C64350; display: block; font-size: 1.286em;} #about .photo {float: left; margin: 5px 20px;} #about .url:link, #about .url:visited {text-decoration: none;} -#about .bio {float: right; width: 500px;} +#about .bio {float: right; max-width: 500px;} /* Footer @@ -410,7 +416,7 @@ li:first-child .hentry, #content > .hentry {border: 0; margin: 0;} position: relative; float: left; top: 0.5em; - width: 190px; + max-width: 190px; } /* About the Author */ @@ -453,12 +459,12 @@ li:first-child .hentry, #content > .hentry {border: 0; margin: 0;} #comments-list li:nth-child(2n) blockquote {background: #F5f5f5;} /* Add a Comment */ - #add-comment label {clear: left; float: left; text-align: left; width: 150px;} + #add-comment label {clear: left; float: left; text-align: left; max-width: 150px;} #add-comment input[type='text'], #add-comment input[type='email'], - #add-comment input[type='url'] {float: left; width: 200px;} + #add-comment input[type='url'] {float: left; max-width: 200px;} - #add-comment textarea {float: left; height: 150px; width: 495px;} + #add-comment textarea {float: left; height: 150px; max-width: 495px;} #add-comment p.req {clear: both; margin: 0 .5em 1em 0; text-align: right;} diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html index 55053cb2..eb31a851 100644 --- a/pelican/tests/output/custom/this-is-a-super-article.html +++ b/pelican/tests/output/custom/this-is-a-super-article.html @@ -2,6 +2,7 @@ + This is a super article ! diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html index a103868e..3117dc28 100644 --- a/pelican/tests/output/custom/unbelievable.html +++ b/pelican/tests/output/custom/unbelievable.html @@ -2,6 +2,7 @@ + Unbelievable ! diff --git a/pelican/tests/output/custom_locale/archives.html b/pelican/tests/output/custom_locale/archives.html index 66dbe94a..df9dd241 100644 --- a/pelican/tests/output/custom_locale/archives.html +++ b/pelican/tests/output/custom_locale/archives.html @@ -2,6 +2,7 @@ + Alexis' log diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau.html b/pelican/tests/output/custom_locale/author/alexis-metaireau.html index 68054d97..6650fb9f 100644 --- a/pelican/tests/output/custom_locale/author/alexis-metaireau.html +++ b/pelican/tests/output/custom_locale/author/alexis-metaireau.html @@ -2,6 +2,7 @@ + Alexis' log - Alexis Métaireau diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html index 16431fb9..5fef108c 100644 --- a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html +++ b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html @@ -2,6 +2,7 @@ + Alexis' log - Alexis Métaireau diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html index ab91c56a..557676d4 100644 --- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html +++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html @@ -2,6 +2,7 @@ + Alexis' log - Alexis Métaireau diff --git a/pelican/tests/output/custom_locale/authors.html b/pelican/tests/output/custom_locale/authors.html index 84bd502e..aed3bd79 100644 --- a/pelican/tests/output/custom_locale/authors.html +++ b/pelican/tests/output/custom_locale/authors.html @@ -2,6 +2,7 @@ + Alexis' log - Authors diff --git a/pelican/tests/output/custom_locale/categories.html b/pelican/tests/output/custom_locale/categories.html index 24e83abf..0d46b9a0 100644 --- a/pelican/tests/output/custom_locale/categories.html +++ b/pelican/tests/output/custom_locale/categories.html @@ -2,6 +2,7 @@ + Alexis' log - Categories diff --git a/pelican/tests/output/custom_locale/category/bar.html b/pelican/tests/output/custom_locale/category/bar.html index f9d47948..7d9abf0d 100644 --- a/pelican/tests/output/custom_locale/category/bar.html +++ b/pelican/tests/output/custom_locale/category/bar.html @@ -2,6 +2,7 @@ + Alexis' log - bar diff --git a/pelican/tests/output/custom_locale/category/cat1.html b/pelican/tests/output/custom_locale/category/cat1.html index 2bc756e6..f8b315ee 100644 --- a/pelican/tests/output/custom_locale/category/cat1.html +++ b/pelican/tests/output/custom_locale/category/cat1.html @@ -2,6 +2,7 @@ + Alexis' log - cat1 diff --git a/pelican/tests/output/custom_locale/category/misc.html b/pelican/tests/output/custom_locale/category/misc.html index eb98db2a..54e3f784 100644 --- a/pelican/tests/output/custom_locale/category/misc.html +++ b/pelican/tests/output/custom_locale/category/misc.html @@ -2,6 +2,7 @@ + Alexis' log - misc diff --git a/pelican/tests/output/custom_locale/category/yeah.html b/pelican/tests/output/custom_locale/category/yeah.html index 660c593c..1fd346ff 100644 --- a/pelican/tests/output/custom_locale/category/yeah.html +++ b/pelican/tests/output/custom_locale/category/yeah.html @@ -2,6 +2,7 @@ + Alexis' log - yeah diff --git a/pelican/tests/output/custom_locale/theme/css/main.css b/pelican/tests/output/custom_locale/theme/css/main.css index aaea9b81..a4aa51a1 100644 --- a/pelican/tests/output/custom_locale/theme/css/main.css +++ b/pelican/tests/output/custom_locale/theme/css/main.css @@ -147,7 +147,8 @@ aside, nav, article, figure { } /***** Layout *****/ -.body {clear: both; margin: 0 auto; width: 800px;} +.body {clear: both; margin: 0 auto; max-width: 800px;} +img { max-width: 100%; } img.right, figure.right, div.figure.align-right { float: right; margin: 0 0 2em 2em; @@ -159,7 +160,7 @@ img.left, figure.left, div.figure.align-left { /* .rst support */ div.figure img, figure img { /* to fill figure exactly */ - width: 100%; + max-width: 100%; } div.figure p.caption, figure p.caption { /* margin provided by figure */ margin-top: 0; @@ -171,16 +172,21 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */ *****************/ #banner { margin: 0 auto; - padding: 2.5em 0 0 0; + padding: 0.8em 0 0 0; } /* Banner */ - #banner h1 {font-size: 3.571em; line-height: 0;} + #banner h1 { + font-size: 3.571em; + line-height: 1.0; + margin-bottom: .3em; + } + #banner h1 a:link, #banner h1 a:visited { color: #000305; display: block; font-weight: bold; - margin: 0 0 .6em .2em; + margin: 0 0 0 .2em; text-decoration: none; } #banner h1 a:hover, #banner h1 a:active { @@ -195,19 +201,19 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */ #banner nav { background: #000305; font-size: 1.143em; - height: 40px; + overflow: auto; line-height: 30px; margin: 0 auto 2em auto; padding: 0; text-align: center; - width: 800px; + max-width: 800px; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; } - #banner nav ul {list-style: none; margin: 0 auto; width: 800px;} + #banner nav ul {list-style: none; margin: 0 auto; max-width: 800px;} #banner nav li {float: left; display: inline; margin: 0;} #banner nav a:link, #banner nav a:visited { @@ -242,7 +248,7 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */ margin-bottom: 2em; overflow: hidden; padding: 20px; - width: 760px; + max-width: 760px; border-radius: 10px; -moz-border-radius: 10px; @@ -253,7 +259,7 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */ border: 2px solid #eee; float: right; margin: 0.786em 2em 0 5em; - width: 248px; + max-width: 248px; } #featured figure img {display: block; float: right;} @@ -271,7 +277,7 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */ margin-bottom: 2em; overflow: hidden; padding: 20px 20px; - width: 760px; + max-width: 760px; border-radius: 10px; -moz-border-radius: 10px; @@ -305,15 +311,15 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */ /* Blogroll */ #extras .blogroll { float: left; - width: 615px; + max-width: 615px; } - #extras .blogroll li {float: left; margin: 0 20px 0 0; width: 185px;} + #extras .blogroll li {float: left; margin: 0 20px 0 0; max-width: 185px;} /* Social */ #extras .social { float: right; - width: 175px; + max-width: 175px; } #extras div[class='social'] a { @@ -359,20 +365,20 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */ overflow: hidden; padding: 20px; text-align: left; - width: 760px; + max-width: 760px; border-radius: 10px; -moz-border-radius: 10px; -webkit-border-radius: 10px; } -#about .primary {float: left; width: 165px;} +#about .primary {float: left; max-width: 165px;} #about .primary strong {color: #C64350; display: block; font-size: 1.286em;} #about .photo {float: left; margin: 5px 20px;} #about .url:link, #about .url:visited {text-decoration: none;} -#about .bio {float: right; width: 500px;} +#about .bio {float: right; max-width: 500px;} /* Footer @@ -410,7 +416,7 @@ li:first-child .hentry, #content > .hentry {border: 0; margin: 0;} position: relative; float: left; top: 0.5em; - width: 190px; + max-width: 190px; } /* About the Author */ @@ -453,12 +459,12 @@ li:first-child .hentry, #content > .hentry {border: 0; margin: 0;} #comments-list li:nth-child(2n) blockquote {background: #F5f5f5;} /* Add a Comment */ - #add-comment label {clear: left; float: left; text-align: left; width: 150px;} + #add-comment label {clear: left; float: left; text-align: left; max-width: 150px;} #add-comment input[type='text'], #add-comment input[type='email'], - #add-comment input[type='url'] {float: left; width: 200px;} + #add-comment input[type='url'] {float: left; max-width: 200px;} - #add-comment textarea {float: left; height: 150px; width: 495px;} + #add-comment textarea {float: left; height: 150px; max-width: 495px;} #add-comment p.req {clear: both; margin: 0 .5em 1em 0; text-align: right;}