From 91fa7e533670e8d406a45e395a66786edfa353d3 Mon Sep 17 00:00:00 2001 From: Gnieark Date: Wed, 29 Aug 2018 16:43:57 +0200 Subject: [PATCH] simplify --- README.md | 5 +- _define.php | 2 +- style-2018-08-29b.css | 279 ++++++++++++++++++++++-------------------- tpl/_top.html | 3 +- 4 files changed, 148 insertions(+), 141 deletions(-) diff --git a/README.md b/README.md index 3c86aad..22dcb35 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,5 @@ On a mis un petit point d'honneur à l'optimisation. On a donc éliminé les scr De la même façon, dans les fichiers de template, les morceaux qui s'affichent à certaines conditions tpl:EntryIf . Que dans notre utilisation de Dotclear, je me suis dit qu'on ne les utiliserait jamais, j'ai parfois pris la facilité de supprimer le bloc. -C'est pour ces raisons que je vous invite à n'utiliser ce thème que si vous vous sentez de mettre les mains dans le camboui +C'est pour ces raisons que je vous invite à n'utiliser ce thème que si vous vous sentez de mettre les mains dans le cambouis. -## Reste à faire: - -Un nettoyage dans le CSS diff --git a/_define.php b/_define.php index 6f2df42..4bafec9 100644 --- a/_define.php +++ b/_define.php @@ -3,5 +3,5 @@ $this->registerModule( /* Name */ "Ventres mous", /* Description*/ "Thème Ventres mous", /* Author */ "Zigazou & Gnieark", - /* Version */ '1.2.2' + /* Version */ '1.2.3' ); diff --git a/style-2018-08-29b.css b/style-2018-08-29b.css index e072d06..cb9bf08 100644 --- a/style-2018-08-29b.css +++ b/style-2018-08-29b.css @@ -9,60 +9,41 @@ @font-face { font-family: 'komika'; src: url('font/komika.eot'); - src: url('font/komika.eot?#iefix') format('embedded-opentype'), - url('font/komika.woff') format('woff'), - url('font/komika.ttf') format('truetype'), - url('font/komika.svg#komika') format('svg'); + src: url('font/komika.eot?#iefix') format('embedded-opentype'), url('font/komika.woff') format('woff'), url('font/komika.ttf') format('truetype'), url('font/komika.svg#komika') format('svg'); font-weight: normal; font-style: normal; } @font-face { - font-family: 'lato'; - src: url('font/lato-regular.eot'); - src: url('font/lato-regular.eot?#iefix') format('embedded-opentype'), - url('font/lato-regular.woff2') format('woff2'), - url('font/lato-regular.woff') format('woff'), - url('font/lato-regular.ttf') format('truetype'), - url('font/lato-regular.svg#latoregular') format('svg'); - font-weight: normal; - font-style: normal; + font-family: 'lato'; + src: url('font/lato-regular.eot'); + src: url('font/lato-regular.eot?#iefix') format('embedded-opentype'), url('font/lato-regular.woff2') format('woff2'), url('font/lato-regular.woff') format('woff'), url('font/lato-regular.ttf') format('truetype'), url('font/lato-regular.svg#latoregular') format('svg'); + font-weight: normal; + font-style: normal; } @font-face { - font-family: 'lato'; - src: url('font/lato-italic.eot'); - src: url('font/lato-italic.eot?#iefix') format('embedded-opentype'), - url('font/lato-italic.woff2') format('woff2'), - url('font/lato-italic.woff') format('woff'), - url('font/lato-italic.ttf') format('truetype'), - url('font/lato-italic.svg#latoitalic') format('svg'); - font-weight: normal; - font-style: italic; + font-family: 'lato'; + src: url('font/lato-italic.eot'); + src: url('font/lato-italic.eot?#iefix') format('embedded-opentype'), url('font/lato-italic.woff2') format('woff2'), url('font/lato-italic.woff') format('woff'), url('font/lato-italic.ttf') format('truetype'), url('font/lato-italic.svg#latoitalic') format('svg'); + font-weight: normal; + font-style: italic; } @font-face { - font-family: 'lato'; - src: url('font/lato-bolditalic.eot'); - src: url('font/lato-bolditalic.eot?#iefix') format('embedded-opentype'), - url('font/lato-bolditalic.woff2') format('woff2'), - url('font/lato-bolditalic.woff') format('woff'), - url('font/lato-bolditalic.ttf') format('truetype'), - url('font/lato-bolditalic.svg#latobold_italic') format('svg'); - font-weight: bold; - font-style: italic; + font-family: 'lato'; + src: url('font/lato-bolditalic.eot'); + src: url('font/lato-bolditalic.eot?#iefix') format('embedded-opentype'), url('font/lato-bolditalic.woff2') format('woff2'), url('font/lato-bolditalic.woff') format('woff'), url('font/lato-bolditalic.ttf') format('truetype'), url('font/lato-bolditalic.svg#latobold_italic') format('svg'); + font-weight: bold; + font-style: italic; } @font-face { - font-family: 'lato'; - src: url('font/lato-bold.eot'); - src: url('font/lato-bold.eot?#iefix') format('embedded-opentype'), - url('font/lato-bold.woff2') format('woff2'), - url('font/lato-bold.woff') format('woff'), - url('font/lato-bold.ttf') format('truetype'), - url('font/lato-bold.svg#latobold') format('svg'); - font-weight: bold; - font-style: normal; + font-family: 'lato'; + src: url('font/lato-bold.eot'); + src: url('font/lato-bold.eot?#iefix') format('embedded-opentype'), url('font/lato-bold.woff2') format('woff2'), url('font/lato-bold.woff') format('woff'), url('font/lato-bold.ttf') format('truetype'), url('font/lato-bold.svg#latobold') format('svg'); + font-weight: bold; + font-style: normal; } nav, body { @@ -72,21 +53,32 @@ nav, body { line-height: 130%; font-size: 110%; } -nav{width: 100%;} -input { font-family: sans-serif; } + +nav { + width: 100%; +} + +input { + font-family: sans-serif; +} @media (min-width: 40em) { body { font-family: lato, sans-serif; background-color: #d3d4d9; } - - input { font-family: lato, sans-serif; } + input { + font-family: lato, sans-serif; + } } -a { color: #252627; } +a { + color: #252627; +} -audio { box-shadow: -0.1em 0.1em 1em 0.1em rgba(0, 0, 0, 0.3); } +audio { + box-shadow: -0.1em 0.1em 1em 0.1em rgba(0, 0, 0, 0.3); +} li { list-style-type: none; @@ -112,24 +104,30 @@ img, audio { height: auto; margin: 0 auto; } -img.EntryFirstImage{ + +img.EntryFirstImage { max-width: 100%; display: block; border-radius: 8px; margin-left: auto; - margin-right: auto; + margin-right: auto; } + section, aside { background-color: #fff9fb; overflow-x: hidden; padding: 1.5em 1.5em 0 1.5em; } + header p { padding: 1.5em 1.5em 0 1.5em; - color: rgba(0,0,0,.4); + color: rgba(0, 0, 0, .4); font-size: 1em; } -article {background-color: #fff9fb;} + +article { + background-color: #fff9fb; +} @media (min-width: 40em) { section, aside { @@ -137,56 +135,88 @@ article {background-color: #fff9fb;} margin: 1em auto; background-color: #fff9fb; border-radius: 3em; - box-shadow: -0.1em 0.1em 1em 0.1em rgba(0, 0, 0, 0.3); + box-shadow: -0.1em 0.1em 1em 0.1em rgba(0, 0, 0, 0.3); } - - img.EntryFirstImage{ + img.EntryFirstImage { max-width: 15em; float: right; left: none; transform: none; } - article{ + article { overflow: auto; } } + @media (min-width: 70em) { /* mise en deux colonnes */ - section{ + section { float: left; width: 40em; margin: 0.5em 0.5em 0.5em 2em; } - aside{ + aside { float: left; width: 20em; margin: 0.5em 0.5em; } - } -footer { clear: both; padding: 1em 2em; } +footer { + clear: both; + padding: 1em 2em; +} /* Prelude */ -nav ul li::before { display: none; } -nav ul { margin: 0; padding-left: 1.5em; } + +nav ul li::before { + display: none; +} + +nav ul { + margin: 0; + padding-left: 1.5em; +} @media (min-width: 40em) { - nav ul { text-align: center; } - nav ul li { display: inline-block; } - nav ul li::after { content: ' | '; } - nav ul li:last-child::after { display: none; } + nav ul { + text-align: center; + } + nav ul li { + display: inline-block; + } + nav ul li::after { + content: ' | '; + } + nav ul li:last-child::after { + display: none; + } } /* Titles */ -h1, h2, h3, h4, h5, h6 { font-family: komika; } -h1 { background-color: #bb0a21; margin-top: 0;font-size: 150%; } -h2 { background-color: #252627; font-size: 120%;} -h2 em {font-size: 80%;} +h1, h2, h3, h4, h5, h6 { + font-family: komika; +} + +h1 { + background-color: #bb0a21; + margin-top: 0; + font-size: 150%; +} + +h2 { + background-color: #252627; + font-size: 120%; +} + +h2 em { + font-size: 80%; +} + h1, h2 { position: relative; - left:0; + left: 0; color: #fff9fb; padding: 1.3em 0.7em 1.3em 4.2em; background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMDIuOSIgaGVpZ2h0PSIzMDIuOSI+PGcgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjZmZmIiBzdHJva2Utd2lkdGg9IjIwIj48cGF0aCBkPSJNMjkzIDE1MS40YzAgNzgtNjMuNSAxNDEuNS0xNDEuNiAxNDEuNUM3My40IDI5MyAxMCAyMjkgMTAgMTUxIDEwIDczLjIgNzMuMyAxMCAxNTEuNCAxMGM3OCAwIDE0MS41IDYzLjMgMTQxLjUgMTQxLjR6IiBjb2xvcj0iIzAwMCIgb3ZlcmZsb3c9InZpc2libGUiLz48ZyBzdHJva2Utd2lkdGg9IjEyIj48cGF0aCBkPSJNMTcwLjMgMTc3YzAgMjQuNC0yMCA0NC4zLTQ0LjQgNDQuMy0yNSAwLTQ1LTIwLTQ1LTQ0LjQgMC0yNSAyMC00NSA0NC40LTQ1IiBjb2xvcj0iIzAwMCIgb3ZlcmZsb3c9InZpc2libGUiLz48cGF0aCBkPSJNMTA1LjQgMTk3LjVsMjktMjltLTI5IDBsMjkgMjkiLz48L2c+PC9nPjwvc3ZnPg==); @@ -195,7 +225,8 @@ h1, h2 { background-position: 0.2em center; line-height: 150%; } -.homelink{ + +.homelink { display: block; position: absolute; top: 0; @@ -205,9 +236,11 @@ h1, h2 { overflow: hidden; color: transparent; } -@media (max-width: 40em) { - h1 { font-size: 140%; } +@media (max-width: 40em) { + h1 { + font-size: 140%; + } h2 { font-size: 100%; position: relative; @@ -220,20 +253,30 @@ h1, h2 { h1, h2 { padding: 1.3em 0.7em 1.3em 4.2em; } - h2 {border-radius: 4em;} + h2 { + border-radius: 4em; + } +} + +h1 a, h2 a { + color: #fff9fb; + text-decoration: none; } -h1 a, h2 a { color: #fff9fb; text-decoration: none; } /* Post info */ + p.post-info, p.post-info-co { text-align: center; color: #4b88a2; font-size: 90%; } -p.day-date { display: none; } +p.day-date { + display: none; +} /* Tags */ + ul.post-tags, #blognav .tags ul, #blognav .tags p { margin: 0; padding: 0; @@ -241,7 +284,9 @@ ul.post-tags, #blognav .tags ul, #blognav .tags p { } @media (max-width: 40em) { - ul.post-tags, #blognav .tags ul { font-size: 80%; } + ul.post-tags, #blognav .tags ul { + font-size: 80%; + } } ul.post-tags li, #blognav .tags li { @@ -249,7 +294,9 @@ ul.post-tags li, #blognav .tags li { display: inline-block; } -ul.post-tags li::before, #blognav .tags li::before { display: none; } +ul.post-tags li::before, #blognav .tags li::before { + display: none; +} ul.post-tags li a, #blognav .tags li a { display: block; @@ -263,22 +310,30 @@ ul.post-tags li a, #blognav .tags li a { } /* Sidebar */ -#sidebar { background-color: #d3d4d9; } + +#sidebar { + background-color: #d3d4d9; +} /* Footer */ + footer { background-color: #bb0a21; color: #d3d4d9; - } @media (min-width: 40em) { - footer { border-radius: 0 0 3em 3em; } + footer { + border-radius: 0 0 3em 3em; + } } -footer a { color: #fff9fb; } +footer a { + color: #fff9fb; +} /* Forms */ + fieldset { border: none; background-color: #4b88a2; @@ -295,65 +350,21 @@ input[type="text"], textarea { font-size: 110%; } -.field { width: 100%; } -.field input, .field textarea{ +.field { width: 100%; - box-sizing: border-box; } -/*Search form */ -#search input[type="text"] { width: 10em; } - -/*sectionr */ - -div.pagination-wrapper { - background-color: #4b88a2; - color: #fff9fb; +.field input, .field textarea { width: 100%; + box-sizing: border-box; } -@media (max-width: 40em) { - div.pagination-wrapper { - position: relative; - left: -1.5em; - padding: 0.1em 1.5em; - line-height: 170%; - } -} - -p.pagination>a, p.pagination>span { - display: block; - text-align: center; - background-color: #4b88a2; - color: #fff9fb; -} +/*Search form */ -p.pagination>a, p.pagination>span { - background-color: #4b88a2; - color: #fff9fb; +#search input[type="text"] { + width: 10em; } -@media (min-width: 40em) { - div.pagination-wrapper { display: table; } - p.pagination { display: table-row; } - p.pagination>a, p.pagination>span { display: table-cell; } - - p.pagination>a { - position: relative; - width: 35%; - padding: 1.5em; - } - - p.pagination>a.prev { - text-align: left; - left: -1.5em; - } - - p.pagination>span { text-align: center; } - - p.pagination>a.next { - text-align: right; - right: -1.5em; - } -} -.wholearticlelink{text-decoration: none;} \ No newline at end of file +.wholearticlelink { + text-decoration: none; +} \ No newline at end of file diff --git a/tpl/_top.html b/tpl/_top.html index 89b490f..6766693 100644 --- a/tpl/_top.html +++ b/tpl/_top.html @@ -1,6 +1,5 @@

{{tpl:BlogName encode_html="1"}}

- {{tpl:SysBehavior behavior="publicTopAfterContent"}} -
+ \ No newline at end of file