From dfe6c2ad567068808dcf806851200d57253ca268 Mon Sep 17 00:00:00 2001
From: Anna <sudnitsina@gmail.com>
Date: Sun, 5 Nov 2017 01:54:32 +0300
Subject: [PATCH] css

---
 blog/static/css/new.css            | 19 +++++++++++--------
 blog/templates/blog/base.html      |  9 +++++++--
 blog/templates/blog/post_list.html | 27 +++++++++++++--------------
 3 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/blog/static/css/new.css b/blog/static/css/new.css
index 4eda498..cfbce16 100644
--- a/blog/static/css/new.css
+++ b/blog/static/css/new.css
@@ -6,14 +6,22 @@ a {
 			font-family: 'Open Sans', sans-serif;
 			
 		}
+		.block {
+			background: #FFFFFF;
+			box-shadow: 0 0.005em 0.01em 0 rgba(0, 0, 0, 0.12), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
+			//display: block;
+			margin: 0 0 10px 0;
+			padding: 15px;
+		}
 		#content {
 			margin: 10px 0 0 0;
 		}
-		.date {
+		.date, .tag {
 			color: #999999;
+			display: inline-block;
 			font-size: 12px;
 			letter-spacing: 1px;
-			//float: left;
+			margin-right: 10px;
 		}
 		input#button-search {
 			background: url('https://touchit.com.ua/static/images/icons/search-25.png') no-repeat center center;
@@ -95,14 +103,9 @@ a {
 			
 		}
 		.sidemenu {
-			box-shadow: 0 0.005em 0.01em 0 rgba(0, 0, 0, 0.12), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
 			box-sizing: border-box;
-			background: #FFFFFF;
-			display: block;
 			float: left;
-			//margin-left: 10px;
 			margin-left: -240px;
-			padding: 15px;
 			width: 240px;
 		}
 		.sidemenu h2 {
@@ -126,4 +129,4 @@ a {
 			padding: 6px 12px;
 			width: 200px;
 			vertical-align: top;
-		}
\ No newline at end of file
+		}
diff --git a/blog/templates/blog/base.html b/blog/templates/blog/base.html
index 23d68e3..73fa3e9 100644
--- a/blog/templates/blog/base.html
+++ b/blog/templates/blog/base.html
@@ -6,6 +6,7 @@
 		<link rel="stylesheet" href="{% static 'css/blog.css' %}">
 		<link rel="stylesheet" href="{% static 'css/new.css' %}">
 		<meta charset="utf-8"><meta name=viewport content="width=device-width, initial-scale=1">
+		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.3.0/css/font-awesome.min.css">
 <!--script src="https://code.jquery.com/jquery-1.12.4.js"></script> <script src="https://code.jquery.com/ui/1.12.0/jquery-ui.js"></script-->
 <!--Let browser know website is optimized for mobile-->  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 	</head>
@@ -22,20 +23,24 @@
 		<div id="content">
         {% block content %}
         {% endblock %}
+<div class="sidemenu">
+Hop hey</div>
 		<div class="sidemenu">
+		<div class="block">
 			<h2>Меню</h2>
 			<ul>
 				<li><li><a href="{% url 'post_new' %}">new post</a></li>
 				<li><a href="/blog/1">all notes</a></li>
 			</ul>
 		</div>
-		<div class="sidemenu">
+		<div class="block">
 			<h2>Последние</h2>
 			<ul>
 				<li><a href="/">ToDo List</a><div class="date">2017-11-04</div></li>
 				<li><a href="/">Йа сцылко</a><div class="date">2017-11-03</div></li>
 				<li><a href="/">Йа сцылко №2</a><div class="date">2017-11-03</div></li>
-		<	/ul>
+		</ul>
+		</div>
 		</div>
 	</div>
 	
diff --git a/blog/templates/blog/post_list.html b/blog/templates/blog/post_list.html
index b5ac4e6..241fb98 100644
--- a/blog/templates/blog/post_list.html
+++ b/blog/templates/blog/post_list.html
@@ -2,23 +2,22 @@
 {% load pagination_tags %}
 {% block content %}
 
-	<div id="posts">
+<div id="posts">
     {% for post in posts %}
-		<div class="post">
-			<div class="post-header">
-				<h2><a href="{% url 'post_detail' pk=post.pk %}">{{ post.title }}</a></h2>
-				<div class="date">{{ post.published_date}}</div>
+	<div class="post">
+		<div class="post-header">
+		<h2><a href="{% url 'post_detail' pk=post.pk %}">{{ post.title }}</a></h2>
+		<div class="date"><i class="fa fa-calendar"></i> {{ post.published_date}}</div>
+	{% if post.tags.names %}                                  
+          <div class="tag">
+		<i class="fa fa-tags"></i>
+		{% for tag in post.tags.names %}
+            		<a href="{% url 'search_by_tag' tag=tag%}">{{ tag }}</a>
+	        {% endfor %}
+	  </div>
+{% endif %}
 			</div>
             {{ post.text|safe|linebreaksbr|truncatewords:80 }} <!--|linebreaksbr|truncatewords:80 }}</p--><br>           
-<p>
-{% if post.tags.names %}
-    Tags: 
-        {% for tag in post.tags.names %}
-            <a href="{% url 'search_by_tag' tag=tag%}">{{ tag }}</a>
-        {% endfor %}
-{% endif %}
-</p>
-     
 </div>    
 
 {% endfor %}