Changeset 2644:88b1b462c4d0

Timestamp:

01/26/14 09:29:38 (12 years ago)

Author:

Anne Kozlika <kozlika@…>

Branch:

default

Message:

Currywurst templates: category.html some better classes and id --- Berlin Theme: styling category
+ some forgotten images in last commit.

Files:

• inc/public/default-templates/currywurst/category.html (modified) (1 diff)
• themes/berlin/img/hline.png (added)
• themes/berlin/img/last-hline.png (added)
• themes/berlin/img/vline.png (added)
• themes/berlin/scss/partials/_archive.scss (added)
• themes/berlin/scss/partials/_content.scss (modified) (2 diffs)
• themes/berlin/style.css (modified) (4 diffs)

inc/public/default-templates/currywurst/category.html

@@ -60 +60 @@
                                    {{tpl:CategoryTitle encode_html="1"}}
                               </h2>
-                              {{tpl:CategoryDescription}}
 
                               <tpl:CategoryIf has_entries="1">
-                                   <p class="feed-info">
-                                        <a type="application/atom+xml" href="{{tpl:CategoryFeedURL type="atom"}}"
-                                         title="{{tpl:lang This category's entries Atom feed}}" class="feed">{{tpl:lang Entries feed}}</a>
+                                   <ul class="content-info__feed">
+                                        <li><a type="application/atom+xml" href="{{tpl:CategoryFeedURL type="atom"}}"
+                                         title="{{tpl:lang This category's entries Atom feed}}" class="feed">{{tpl:lang Entries feed}}</a></li>
 
                                         <tpl:SysIf operator="or" comments_active="1" pings_active="1">
-                                              - <a type="application/atom+xml" href="{{tpl:CategoryFeedURL type="atom"}}/comments"
-                                              title="{{tpl:lang This category's comments Atom feed}}" class="feed">{{tpl:lang Comments feed}}</a>
+                                              <li><a type="application/atom+xml" href="{{tpl:CategoryFeedURL type="atom"}}/comments"
+                                              title="{{tpl:lang This category's comments Atom feed}}" class="feed">{{tpl:lang Comments feed}}</a></li>
                                         </tpl:SysIf>
-                                   </p>
+                                   </ul>
                               </tpl:CategoryIf>
+
+                              <div class="content-info__cat-desc">
+                                   {{tpl:CategoryDescription}}
+                              </div>
+
 
                               <tpl:CategoryFirstChildren>
                                    <tpl:CategoriesHeader>
-                                        <div id="subcategories">
+                                        <div id="subcategories" class="content-info__sub-cat">
                                              <h3>{{tpl:lang Subcategories}}</h3>
                                              <ul>

themes/berlin/scss/partials/_content.scss

@@ -30 +30 @@
     h2 {
         display: inline-block;
+        vertical-align: top;
         padding: .5em .75em;
         border-radius: .5em;
@@ -46 +47 @@
 
     }
+}
+.content-info__feed {
+    display: inline-block;
+    vertical-align: top;
+    list-style-type: none;
+    li {
+        display: inline;
+        margin-right: 1.5em;
+        }
+}
+.content-info__sub-cat {
+    margin-top: 2em;
+    h3 { font-weight: bold;}
 }
 // lien de retour, à combiner avec le script js

themes/berlin/style.css

@@ -761 +761 @@
   #content-info h2 {
     display: inline-block;
+    vertical-align: top;
     padding: .5em .75em;
     border-radius: .5em;
@@ -774 +775 @@
     margin-top: 0.5714286em;
     padding-left: 0; }
+
+.content-info__feed {
+  display: inline-block;
+  vertical-align: top;
+  list-style-type: none; }
+  .content-info__feed li {
+    display: inline;
+    margin-right: 1.5em; }
+
+.content-info__sub-cat {
+  margin-top: 2em; }
+  .content-info__sub-cat h3 {
+    font-weight: bold; }
 
 #gotop {
@@ -1080 +1094 @@
   vertical-align: top; }
   .arch-block a {
-    color: #555; }
+    color: #373737; }
   @media all and (min-width: 30em) {
     .arch-block {
@@ -1094 +1108 @@
   font-weight: normal;
   text-transform: lowercase;
-  color: #14709e; }
+  color: #267daf; }
 
 .arch-block h4 {
-  font-weight: normal;
+  font-weight: bold;
   font-size: 1.1em;
   margin-bottom: 0;
-  margin-top: 0; }
+  margin-top: 0;
+  color: #373737; }
 
 .arch-list, .arch-sub-list {