From f2e0749b5cfb0fa352722782e9641e7f866ec1b2 Mon Sep 17 00:00:00 2001
From: fefa4ka <fefa4ka@gmail.com>
Date: Thu, 22 Oct 2015 23:07:28 +0300
Subject: [PATCH] fix blog

---
 app/settings.py                             |  2 +-
 blog/templates/blog/includes/blog_item.html |  2 +-
 blog/templates/blog/includes/blog_meta.html |  2 +-
 blog/templates/blog/post_detail.html        |  2 +-
 blog/templates/blog/post_list.html          |  5 +--
 zsite/static/less/blog.less                 | 40 ++++++++++++---------
 zsite/static/less/header.less               |  6 ++--
 zsite/static/less/main.less                 | 17 ++++++---
 zsite/static/less/people.less               |  2 +-
 zsite/templates/base.html                   |  4 +--
 10 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/app/settings.py b/app/settings.py
index 6ae606b..2779b52 100644
--- a/app/settings.py
+++ b/app/settings.py
@@ -26,7 +26,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 SECRET_KEY = '=%%a@whz46w1#=8ffk^a+8vya5fg-kz0ztyz!_@hdg-(5a9q+s'
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = False
+DEBUG = True
 
 TEMPLATE_DEBUG = False
 
diff --git a/blog/templates/blog/includes/blog_item.html b/blog/templates/blog/includes/blog_item.html
index 7c0640a..8eeacc2 100644
--- a/blog/templates/blog/includes/blog_item.html
+++ b/blog/templates/blog/includes/blog_item.html
@@ -4,7 +4,7 @@
 <article id="post-{{ post.slug }}" class="post-item">
     <header>
         <h2><a href="{{ post.get_absolute_url }}">{{ post.title }}</a></h2>
-        <p>{{ post.date_published|date:"DATE_FORMAT" }}</p>
+        <p class="date">{{ post.date_published|date:"DATE_FORMAT" }}</p>
     </header>
     {% if post.main_image_id %}
     <div class="blog-visual">
diff --git a/blog/templates/blog/includes/blog_meta.html b/blog/templates/blog/includes/blog_meta.html
index 017d448..52bab02 100644
--- a/blog/templates/blog/includes/blog_meta.html
+++ b/blog/templates/blog/includes/blog_meta.html
@@ -7,7 +7,7 @@
         {% trans "by" %} <a href="{% url 'blog:posts-author' post.author.get_username %}">{% if post.author.get_full_name %}{{ post.author.get_full_name }}{% else %}{{ post.author }}{% endif %}</a>
     </li>
     {% endif %}
-    <li>
+    <li class="date">
         {{ post.date_published|date:"DATE_FORMAT" }}
     </li>
 </ul>
diff --git a/blog/templates/blog/post_detail.html b/blog/templates/blog/post_detail.html
index 201a0f0..df3d5ff 100644
--- a/blog/templates/blog/post_detail.html
+++ b/blog/templates/blog/post_detail.html
@@ -18,7 +18,7 @@
     <content>
         <header>
             <h1>{% render_model post "title" %}</h1>
-            <p>{{ post.date_published|date:"DATE_FORMAT" }}</p>
+            <p class="date">{{ post.date_published|date:"DATE_FORMAT" }}</p>
         </header>
         {% if post.main_image_id %}
         <div class="blog-visual">
diff --git a/blog/templates/blog/post_list.html b/blog/templates/blog/post_list.html
index 0579c63..736ee6c 100644
--- a/blog/templates/blog/post_list.html
+++ b/blog/templates/blog/post_list.html
@@ -17,18 +17,15 @@
         </h2>
     </header>
     {% endblock %}
-    {% include "blog/includes/blog_item.html" with post=post_list.0 image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %}
     <div class="clearfix"></div>
     <div class="blog-list-older">
     {% for post in post_list %}
-        {% if forloop.counter != 1 %}
         <article>
             <header>
                 <h4><a href="{{ post.get_absolute_url }}">{{ post.title }}</a></h4>
-                <p>{{ post.date_published|date:"DATE_FORMAT" }}</p>
+                <p class="date">{{ post.date_published|date:"DATE_FORMAT" }}</p>
             </header>
         </article>
-        {% endif %}
     {% empty %}
     <p class="blog-empty">{% trans "No article found." %}</p>
     {% endfor %}
diff --git a/zsite/static/less/blog.less b/zsite/static/less/blog.less
index c1138e2..8376c0c 100644
--- a/zsite/static/less/blog.less
+++ b/zsite/static/less/blog.less
@@ -30,11 +30,33 @@
     }
 }
 
-.blog-list-older {
-    margin-top: 40px;
+.blog-latest-entries {
+    .date {
+        font-size: 11px;
+    }
 }
 
 article {
+
+    header {
+        h1 {
+            margin-top: 0;
+        }
+        h2, h4 {
+            margin-bottom: 5px;
+        }
+        p {
+            margin-bottom: 15px;
+        }
+
+        .date {
+            font-size: 11px;
+        }
+
+    }
+}
+
+article.post-item {
     .make-row();
     
     content {
@@ -53,19 +75,5 @@ article {
         }
     }
 
-    header {
-        h1 {
-            margin-top: 0;
-        }
-        h2, h4 {
-            margin-bottom: 5px;
-        }
-        p {
-            margin-bottom: 15px;
-        }
 
-        .date {
-            font-size: 11px;
-        }
-    }
 }
diff --git a/zsite/static/less/header.less b/zsite/static/less/header.less
index 3dfd246..1111203 100644
--- a/zsite/static/less/header.less
+++ b/zsite/static/less/header.less
@@ -11,8 +11,8 @@
   .make-sm-column(4);
   .make-xs-column(4);
 
-  a {
-    border: 0;
+  a, a:hover, a:focus {
+    border: 0 !important;
   }
 
   .slogan {
@@ -138,7 +138,7 @@
         //   margin-right: 50px;
         // }
 
-        a, a:hover, a:active {
+        a, a:hover, a:active, a:focus {
           text-decoration: underline;
           border-bottom: 0;
         }
diff --git a/zsite/static/less/main.less b/zsite/static/less/main.less
index bcc9888..6f3bc46 100644
--- a/zsite/static/less/main.less
+++ b/zsite/static/less/main.less
@@ -31,15 +31,18 @@
 @import 'nice.less';
 
 
-a, a:hover, a:active, a:focus, a:-webkit-any-link {
+a, a:hover, a:active, a:focus {
   text-decoration: none;
-
+  line-height: 140%;
   border-bottom: 1px solid;
-
 }
 
 a {
-  border-color: rgba(51, 122, 183, 0.3);
+  border-bottom-color: rgba(51, 122, 183, 0.3);
+}
+
+a.filer_image_link {
+  border: 0;
 }
 
 a:hover {
@@ -51,6 +54,12 @@ h1 {
   font-weight: 600;
 }
 
+.plugin_picture {
+  a {
+    border-bottom: 0;
+  }
+}
+
 .breadcrumb {
   padding: 0;
 
diff --git a/zsite/static/less/people.less b/zsite/static/less/people.less
index 8043a8b..c283695 100644
--- a/zsite/static/less/people.less
+++ b/zsite/static/less/people.less
@@ -40,7 +40,7 @@
     }
 
    a, a:hover, a:active {
-        border: 0;
+        border: 0 !important;
     }
 }
 
diff --git a/zsite/templates/base.html b/zsite/templates/base.html
index 3dc4d05..00aeecb 100644
--- a/zsite/templates/base.html
+++ b/zsite/templates/base.html
@@ -4,7 +4,7 @@
 <html ng-app="zuykov">
     <head>
         <meta charset="utf-8">
-        <title>{% block title %}Zuykov and partners{% endblock title %} – {% trans 'Zuykov and partners' %}</title>
+        <title>{% block title %}Zuykov and partners{% endblock title %}</title>
         <meta name="viewport" content="width=device-width,initial-scale=1">
 
         {% stylesheet 'main' %}
@@ -77,7 +77,7 @@
                             {% trans "dom 28" %}<br/>
                             {% trans "Moscow, Russia, 129090" %}
                         </li>
-                        <li>+7 800 700-16-83</li>
+                        <li>+7 800 700-16-37</li>
                     </ul>
                 </div>
             </footer>