diff --git a/_define.php b/_define.php index 40dea3e..c0c2c94 100644 --- a/_define.php +++ b/_define.php @@ -2,6 +2,6 @@ $this->registerModule( /* Name */ "Ventres mous", /* Description*/ "Thème Ventres mous", - /* Author */ "Zigazou", - /* Version */ '1.0' + /* Author */ "Zigazou & Gnieark", + /* Version */ '1.2' ); diff --git a/style-2018-06-12.css b/style-2018-06-12.css index 8d3283c..f37480b 100644 --- a/style-2018-06-12.css +++ b/style-2018-06-12.css @@ -65,14 +65,14 @@ font-style: normal; } -body { +nav, body { font-family: sans-serif; margin: 0; padding: 0; line-height: 130%; font-size: 110%; } - +nav{width: 100%;} input { font-family: sans-serif; } @media (min-width: 40em) { @@ -112,40 +112,70 @@ img, audio { height: auto; margin: 0 auto; } - -#page { +img.EntryFirstImage{ + max-width: 100%; + display: inline; + border-radius: 8px; + left: 50%; + transform: translate(50%, 0%); +} +section, aside { background-color: #fff9fb; overflow-x: hidden; + padding: 1.5em 1.5em 0 1.5em; } -#top p { +header p { padding: 1.5em 1.5em 0 1.5em; color: rgba(0,0,0,.4); font-size: 1em; } +article {background-color: #fff9fb;} + @media (min-width: 40em) { - #page { + section, aside { max-width: 40em; margin: 1em auto; background-color: #fff9fb; border-radius: 3em; box-shadow: -0.1em 0.1em 1em 0.1em rgba(0, 0, 0, 0.3); + + } + img.EntryFirstImage{ + max-width: 15em; + float: right; + left: none; + transform: none; + } + article{ + overflow: auto; } } +@media (min-width: 70em) { + /* mise en deux colonnes */ + section{ + float: left; + width: 40em; + margin: 0.5em 0.5em; + } + aside{ + float: left; + width: 20em; + margin: 0.5em 0.5em; + } -#main { padding: 1.5em 1.5em 0 1.5em; } -#sidebar { padding: 1.5em; } +} -#footer { padding: 1em 2em; } +footer { clear: both; padding: 1em 2em; } /* Prelude */ -#prelude li::before { display: none; } -#prelude { margin: 0; padding-left: 1.5em; } +nav ul li::before { display: none; } +nav ul { margin: 0; padding-left: 1.5em; } @media (min-width: 40em) { - #prelude { text-align: center; } - #prelude li { display: inline-block; } - #prelude li::after { content: ' | '; } - #prelude 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 */ @@ -171,7 +201,7 @@ h1, h2 { top: 0; left: 0; width: 3.7em; - height:100%; + height: 100%; overflow: hidden; color: transparent; } @@ -189,12 +219,11 @@ h1, h2 { @media (min-width: 40em) { h1, h2 { padding: 1.3em 0.7em 1.3em 4.2em; - border-radius: 4em; } + h2 {border-radius: 4em;} } h1 a, h2 a { color: #fff9fb; text-decoration: none; } - /* Post info */ p.post-info, p.post-info-co { text-align: center; @@ -237,16 +266,17 @@ ul.post-tags li a, #blognav .tags li a { #sidebar { background-color: #d3d4d9; } /* Footer */ -#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 { @@ -274,7 +304,7 @@ input[type="text"], textarea { /*Search form */ #search input[type="text"] { width: 10em; } -/* Pager */ +/*sectionr */ div.pagination-wrapper { background-color: #4b88a2; @@ -325,4 +355,5 @@ p.pagination>a, p.pagination>span { text-align: right; right: -1.5em; } -} \ No newline at end of file +} +.wholearticlelink{text-decoration: none;} \ No newline at end of file diff --git a/tpl/__layout.html b/tpl/__layout.html index 9f004fa..65ae1c5 100644 --- a/tpl/__layout.html +++ b/tpl/__layout.html @@ -22,7 +22,6 @@ - @@ -34,144 +33,95 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{tpl:include src="_head.html"}} - - - - -
- + + + + + + {{tpl:include src="_top.html"}} - - -
- -
- - - {{tpl:Breadcrumb}} - -
- - -
- -

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

- -

{{tpl:lang By}} {{tpl:EntryAuthorLink}} - {{tpl:lang on}} {{tpl:EntryDate}}, {{tpl:EntryTime}} - - - {{tpl:EntryCategory encode_html="1"}} - -

- - - - - - - {{tpl:SysBehavior behavior="publicEntryBeforeContent"}} - - - -
{{tpl:EntryExcerpt}}
-

{{tpl:lang Continue - reading}}...

- - - - -
{{tpl:EntryContent}}
- - - - {{tpl:SysBehavior behavior="publicEntryAfterContent"}} - - - -

- - - {{tpl:EntryCommentCount}} - - - {{tpl:EntryPingCount}} - - {{tpl:EntryAttachmentCount}} - -

- -
- - - -
-

- {{tpl:lang page}} {{tpl:PaginationCurrent}} {{tpl:lang of}} {{tpl:PaginationCounter}} -

-
- - - - -
- -
- - - - - -
+ + + +
+

main(){

+ + +
+

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

+ + {{tpl:SysBehavior behavior="publicEntryBeforeContent"}} + + + {{tpl:EntryFirstImage size="s" class="EntryFirstImage" with_category="1"}} +

+ + {{tpl:EntryExcerpt remove_html="1" encode_html="1"}} +

+

Lire la suite...

+ + + + + {{tpl:EntryFirstImage size="s" class="EntryFirstImage" with_category="1"}} +

+ + {{tpl:EntryContent remove_html="1" encode_html="1" cut_string="300"}} + +

+

Lire la suite...

+ + + + {{tpl:SysBehavior behavior="publicEntryAfterContent"}} + +
+ + + + + +
+ + + + + + + + + + + + + {{tpl:include src="_footer.html"}} + + + - - {{tpl:include src="_footer.html"}} - - -
- + diff --git a/tpl/__layout1.html b/tpl/__layout1.html index 4a3ad52..f343850 100644 --- a/tpl/__layout1.html +++ b/tpl/__layout1.html @@ -21,7 +21,6 @@ - diff --git a/tpl/_footer.html b/tpl/_footer.html index d646b01..0838622 100644 --- a/tpl/_footer.html +++ b/tpl/_footer.html @@ -1,5 +1,5 @@ - + {{tpl:SysBehavior behavior="publicFooterContent"}} + -{{tpl:SysBehavior behavior="publicFooterContent"}} \ No newline at end of file diff --git a/tpl/_head.html b/tpl/_head.html index 3b84d16..e0e6bf8 100644 --- a/tpl/_head.html +++ b/tpl/_head.html @@ -4,7 +4,7 @@ {{tpl:include src="user_head.html"}} {{tpl:SysBehavior behavior="publicHeadContent"}} - - + - + - +
+

Retour à la page d'accueil{{tpl:BlogName encode_html="1"}}

+ + {{tpl:SysBehavior behavior="publicTopAfterContent"}} +
- - -
- +
+

main(){

+
+

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

{{tpl:lang By}} {{tpl:EntryAuthorLink}} {{tpl:lang on}} {{tpl:EntryDate}} @@ -82,49 +77,49 @@ -

{{tpl:EntryExcerpt}}
+ {{tpl:EntryExcerpt}} -
{{tpl:EntryContent}}
+ {{tpl:EntryContent}} {{tpl:SysBehavior behavior="publicEntryAfterContent"}} -
- - - - -
-

{{tpl:lang Attachments}}

-
    - -
  • - - {{tpl:include src="_audio_player.html"}} - - - - {{tpl:include src="_video_player.html"}} - {{tpl:else}} - {{tpl:include src="_flv_player.html"}} + + + + +

    {{tpl:lang Attachments}}

    +
      + +
    • + + {{tpl:include src="_audio_player.html"}} + + + + {{tpl:include src="_video_player.html"}} + {{tpl:else}} + {{tpl:include src="_flv_player.html"}} + - - - {{tpl:AttachmentTitle}} - -
      • - -
    -
- - + + {{tpl:AttachmentTitle}} + + + + + + + + +
-
+

{{tpl:lang Comments}}

@@ -144,8 +139,8 @@
-
+
@@ -164,7 +159,7 @@ -
+

{{tpl:lang Your comment}}

@@ -176,38 +171,35 @@

{{tpl:lang Add a comment}}

-
- - {{tpl:SysBehavior behavior="publicCommentFormBeforeContent"}} - -

- -

- -

- -

- -

- -

- -

- -

- -

-

{{tpl:CommentHelp}}

- - - {{tpl:SysBehavior behavior="publicCommentFormAfterContent"}} -
- +
+ {{tpl:SysBehavior behavior="publicCommentFormBeforeContent"}} + +

+ +

+ +

+ +

+ +

+ +

+ +

+ +

+ +

+

{{tpl:CommentHelp}}

+ {{tpl:SysBehavior behavior="publicCommentFormAfterContent"}} +
+

@@ -216,7 +208,7 @@ -
+
+ @@ -253,4 +244,18 @@

{{tpl:lang This post's comments feed}}

 + + + + + diff --git a/tpl/tag.html b/tpl/tag.html index 1b3429b..fa9bda2 100644 --- a/tpl/tag.html +++ b/tpl/tag.html @@ -16,109 +16,75 @@ - - - - - - - - - - - - - - - - - - - - + -
-

{{tpl:lang Tag}} - {{tpl:TagID}}

- -

{{tpl:lang Entries feed}} +

+

{{tpl:lang Tag}} - {{tpl:TagID}}

+
+ + -
- -

{{tpl:EntryDate}}

 - -

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

- -

{{tpl:lang By}} {{tpl:EntryAuthorLink}} - {{tpl:lang on}} {{tpl:EntryDate}}, {{tpl:EntryTime}} - - - {{tpl:EntryCategory encode_html="1"}} - -

- - - - - - - {{tpl:SysBehavior behavior="publicEntryBeforeContent"}} - - - -
{{tpl:EntryExcerpt}}
-

{{tpl:lang Continue - reading}}...

- - - - -
{{tpl:EntryContent}}
- - - - {{tpl:SysBehavior behavior="publicEntryAfterContent"}} - - - -

- - - {{tpl:EntryCommentCount}} - - - {{tpl:EntryPingCount}} - - {{tpl:EntryAttachmentCount}} - -

- -
- - - -

- - {{tpl:lang page}} {{tpl:PaginationCurrent}} {{tpl:lang of}} {{tpl:PaginationCounter}} - -

- - - + +
+

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

+ + {{tpl:SysBehavior behavior="publicEntryBeforeContent"}} + + + {{tpl:EntryFirstImage size="s" class="EntryFirstImage" with_category="1"}} +

+ + {{tpl:EntryExcerpt remove_html="1" encode_html="1"}} +

+

Lire la suite...

+ + + + + {{tpl:EntryFirstImage size="s" class="EntryFirstImage" with_category="1"}} +

+ + {{tpl:EntryContent remove_html="1" encode_html="1" cut_string="300"}} + +

+

Lire la suite...

+ + + + {{tpl:SysBehavior behavior="publicEntryAfterContent"}} + +
+ + + + + + + diff --git a/tpl/tags.html b/tpl/tags.html index acf262a..98eddb4 100644 --- a/tpl/tags.html +++ b/tpl/tags.html @@ -14,24 +14,18 @@ - - - - - - - - + -
+

{{tpl:lang Tags}}

-
+ + -
-
+ +