Merge pull request #43 from newscoop/revert-42-aes_demo

Revert "Aes demo"
newscoop · Jun 12, 2015 · 18e51e4 · 18e51e4
2 parents 52243c4 + 5a2c79d
commit 18e51e4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 21 deletions.
diff --git a/_css/content.css b/_css/content.css
@@ -185,20 +185,6 @@ s{
 
 }
 
-.article_content .content_text .deck{
-	margin: 35px 0 10px 0;
-	font-family: 'oswald' Tahoma, Arial, sans-serif;
-	font-size: 1em;
-	line-height: 1.6em;
-}
-
-.article_content .content_text .deck p{
-	font-family: 'oswald' Tahoma, Arial, sans-serif;
-	font-size: 1em;
-	line-height: 1.6em;
-
-}
-
 .article_content .content_text p{
 	font-size: 1em;
 }
@@ -208,8 +194,6 @@ s{
 }
 
 
-
-
 .content_text.content_text_contrast,
 .content_text.content_text_contrast h2,
 .content_text.content_text_contrast h3,

diff --git a/_css/elements.css b/_css/elements.css
@@ -73,7 +73,7 @@
 
 
 .news_item .thumbnail .caption {
-	padding:12px 20px 10px 20px;
+	padding:12px 20px 0 20px;
 	font-style: italic;
 
 }

diff --git a/_tpl/article-cont.tpl b/_tpl/article-cont.tpl
@@ -10,7 +10,16 @@
       {{ assign var="showStuff" value=1 }}
       {{ /if }}
 
+      {{if $showStuff}}
+      {{ image rendition="article" }}
 
+      <div class="thumbnail content_text">
+
+       <img src="{{ $image->src }}"  alt="{{ $image->caption }} (photo: {{ $image->photographer }})" alt="" />
+       <h6 class="caption ">{{ $image->caption }}</h6>
+     </div>
+     {{/image}}
+     {{/if}}
 
      <div class="content content_text">
        <h6 class="info">{{ $gimme->article->publish_date|camp_date_format:"%d.%m.%Y, %H:%i" }}</h6>
@@ -25,10 +34,6 @@
         </h6>
         {{ include file="_tpl/_edit-article.tpl" }}
 
-        <div class="deck">
-          {{$gimme->article->deck}}
-        </div>
-
 
         {{ if !$gimme->article->content_accessible }}
           <p>{{'infoOnLockedArticles'|translate}}</p>