master
fefa4ka 10 years ago
parent 5ae70a3540
commit f2e0749b5c
  1. 2
      app/settings.py
  2. 2
      blog/templates/blog/includes/blog_item.html
  3. 2
      blog/templates/blog/includes/blog_meta.html
  4. 2
      blog/templates/blog/post_detail.html
  5. 5
      blog/templates/blog/post_list.html
  6. 40
      zsite/static/less/blog.less
  7. 6
      zsite/static/less/header.less
  8. 17
      zsite/static/less/main.less
  9. 2
      zsite/static/less/people.less
  10. 4
      zsite/templates/base.html

@ -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

@ -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">

@ -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>

@ -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">

@ -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 %}

@ -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;
}
}
}

@ -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;
}

@ -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;

@ -40,7 +40,7 @@
}
a, a:hover, a:active {
border: 0;
border: 0 !important;
}
}

@ -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>

Loading…
Cancel
Save