Skip to content

Commit

Permalink
Merge pull request #138 from iElectric/master
Browse files Browse the repository at this point in the history
consistency
  • Loading branch information
olasitarska committed Oct 18, 2014
2 parents ab6085c + 3ab9f2d commit 8088ac0
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions css/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ Your file should now look like this:
<div>
<p>published: {{ post.published_date }}</p>
<h1><a href="">{{ post.title }}</a></h1>
<p>{{ post.text }}</p>
<p>{{ post.text|linebreaks }}</p>
</div>
{% endfor %}
</body>
Expand Down Expand Up @@ -160,7 +160,7 @@ And now add a class `post` to your `div` containing a blog post.
<div class="post">
<p>published: {{ post.published_date }}</p>
<h1><a href="">{{ post.title }}</a></h1>
<p>{{ post.text }}</p>
<p>{{ post.text|linebreaks }}</p>
</div>

We will now add declaration blocks to different selectors. Selectors starting with `.` relate to classes. There are many great tutorials and explanations about CSS on the Web to help you understand the following code. For now, just copy and paste it into your `mysite/static/css/blog.css` file:
Expand Down Expand Up @@ -219,7 +219,7 @@ Then surround the HTML code which displays the posts with declarations of classe
<div class="post">
<p>published: {{ post.published_date }}</p>
<h1><a href="">{{ post.title }}</a></h1>
<p>{{ post.text }}</p>
<p>{{ post.text|linebreaks }}</p>
</div>
{% endfor %}

Expand All @@ -232,7 +232,7 @@ in the `blog/templates/blog/post_list.html` with this:
<div class="post">
<p>published: {{ post.published_date }}</p>
<h1><a href="">{{ post.title }}</a></h1>
<p>{{ post.text }}</p>
<p>{{ post.text|linebreaks }}</p>
</div>
{% endfor %}
</div>
Expand Down
2 changes: 1 addition & 1 deletion django_forms/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ so that the template will look like:
<a class="btn btn-default" href="{% url 'post_edit' pk=post.pk %}"><span class="glyphicon glyphicon-pencil"></span></a>
</div>
<h1>{{ post.title }}</h1>
<p>{{ post.text }}</p>
<p>{{ post.text|linebreaks }}</p>
{% endblock %}

In `blog/urls.py` we add this line:
Expand Down
4 changes: 2 additions & 2 deletions extend_your_application/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ We will start with adding a link inside `blog/templates/blog/post_list.html` fil
<div class="post">
<p>published: {{ post.published_date }}</p>
<h1><a href="">{{ post.title }}</a></h1>
<p>{{ post.text }}</p>
<p>{{ post.text|linebreaks }}</p>
</div>
{% endfor %}
{% endblock content %}
Expand Down Expand Up @@ -130,7 +130,7 @@ It will look like this:
{% endif %}
</div>
<h1>{{ post.title }}</h1>
<p>{{ post.text }}</p>
<p>{{ post.text|linebreaks }}</p>
{% endblock %}

Once again we are extending `base.html`. In the `content` block we want to display a post's published_date (if it exists), title and text. But we should discuss some important things, right?
Expand Down

0 comments on commit 8088ac0

Please sign in to comment.