Skip to content

Commit

Permalink
Add content hyphenation (fix #1)
Browse files Browse the repository at this point in the history
  • Loading branch information
Kaspar Naaber committed Jan 23, 2015
1 parent 1f01576 commit 2fb099f
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 15 deletions.
6 changes: 3 additions & 3 deletions layouts/blog___news.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{% include "Langmenu" %}
<div id="wrapper">
<!-- start header -->
<div id="header">
<div id="header" class="content-hyphenate">
<div id="logo" class="clearfix">
{% editable site.header %}
<div class="clearer"></div>
Expand Down Expand Up @@ -38,7 +38,7 @@
{% addbutton class="add-article" %}

{% for article in articles %}
<div class="post">
<div class="post content-hyphenate">
<h1 class="title"><a href="{{article.url}}">{{article.title}}</a> | <span class="blog-author">{{article.created_at | format_date:"%d %b %y"}}, {{article.author.name}}</span></h1>
<div class="entry">
<p class="clearfix">{{article.excerpt}}</p>
Expand All @@ -65,7 +65,7 @@
</div>
<!-- start footer -->
<div id="footer">
<div id="legal" class="clearfix"><div id="designby">Unembellished template by <a href="http://www.freecsstemplates.org">freeCSStemplates.org</a></div><div id="footer-inner" class="clearfix">{% xcontent name="footer" %}</div><div id="edicy">{% loginblock %}{{ "footer_login_link" | lc }}{% endloginblock %}</div></div>
<div id="legal" class="clearfix content-hyphenate"><div id="designby">Unembellished template by <a href="http://www.freecsstemplates.org">freeCSStemplates.org</a></div><div id="footer-inner" class="clearfix">{% xcontent name="footer" %}</div><div id="edicy">{% loginblock %}{{ "footer_login_link" | lc }}{% endloginblock %}</div></div>
</div>
{% include "JS" %}
<!-- end footer -->
Expand Down
12 changes: 6 additions & 6 deletions layouts/blog_article.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{% include "Langmenu" %}
<div id="wrapper">
<!-- start header -->
<div id="header">
<div id="header" class="content-hyphenate">
<div id="logo" class="clearfix">
{% editable site.header %}
<div class="clearer"></div>
Expand All @@ -26,10 +26,10 @@
</div>
<div class="content-inner">
<div class="post" style="border-bottom: none;">
<h1 class="title">{% editable article.title %} | <span class="blog-author">{{article.created_at | format_date:"%d %b %y"}}, {{article.author.name}}</a></h1>
<h1 class="title content-hyphenate">{% editable article.title %} | <span class="blog-author">{{article.created_at | format_date:"%d %b %y"}}, {{article.author.name}}</a></h1>
<div class="entry">
<div class="excerpt clearfix" data-search-indexing-allowed="true">{% editable article.excerpt %}</div>
<div class="clearfix" data-search-indexing-allowed="true">{% editable article.body %}</div>
<div class="excerpt clearfix content-hyphenate" data-search-indexing-allowed="true">{% editable article.excerpt %}</div>
<div class="clearfix content-hyphenate" data-search-indexing-allowed="true">{% editable article.body %}</div>
<div class="clearfix">
{% if editmode %}
<div class="cfx article-tags">
Expand Down Expand Up @@ -59,7 +59,7 @@
</h2></td>
</tr>
{% for comment in article.comments %}
<tr class="edy-site-blog-comment">
<tr class="edy-site-blog-comment content-hyphenate">
<td class="date" valign="top">{{ comment.created_at | format_date:"%d %b %y" }} {% removebutton %}</td>
<td valign="top">
<span class="author">{{ comment.author }}:</span> {{ comment.body_html }}
Expand Down Expand Up @@ -115,7 +115,7 @@
</div>
<!-- start footer -->
<div id="footer">
<div id="legal" class="clearfix"><div id="designby">Unembellished template by <a href="http://www.freecsstemplates.org">freeCSStemplates.org</a></div><div id="footer-inner" class="clearfix">{% xcontent name="footer" %}</div><div id="edicy">{% loginblock %}{{ "footer_login_link" | lc }}{% endloginblock %}</div></div>
<div id="legal" class="clearfix content-hyphenate"><div id="designby">Unembellished template by <a href="http://www.freecsstemplates.org">freeCSStemplates.org</a></div><div id="footer-inner" class="clearfix">{% xcontent name="footer" %}</div><div id="edicy">{% loginblock %}{{ "footer_login_link" | lc }}{% endloginblock %}</div></div>
</div>
{% include "JS" %}
<!-- end footer -->
Expand Down
6 changes: 3 additions & 3 deletions layouts/common_page.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{% include "Langmenu" %}
<div id="wrapper">
<!-- start header -->
<div id="header">
<div id="header" class="content-hyphenate">
<div id="logo" class="clearfix">
{% editable site.header %}
<div class="clearer"></div>
Expand All @@ -17,7 +17,7 @@
<!-- end header -->

<!-- start page -->
<div id="page">
<div id="page" class="content-hyphenate">
<!-- start content -->
<div id="content">
<div id="menus">
Expand All @@ -42,7 +42,7 @@
</div>
<!-- start footer -->
<div id="footer">
<div id="legal" class="clearfix"><div id="designby">Unembellished template by <a href="http://www.freecsstemplates.org">freeCSStemplates.org</a></div><div id="footer-inner" class="clearfix">{% xcontent name="footer" %}</div><div id="edicy">{% loginblock %}{{ "footer_login_link" | lc }}{% endloginblock %}</div></div>
<div id="legal" class="clearfix content-hyphenate"><div id="designby">Unembellished template by <a href="http://www.freecsstemplates.org">freeCSStemplates.org</a></div><div id="footer-inner" class="clearfix">{% xcontent name="footer" %}</div><div id="edicy">{% loginblock %}{{ "footer_login_link" | lc }}{% endloginblock %}</div></div>
</div>
{% include "JS" %}
<!-- end footer -->
Expand Down
6 changes: 3 additions & 3 deletions layouts/front_page.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{% include "Langmenu" %}
<div id="wrapper">
<!-- start header -->
<div id="header">
<div id="header" class="content-hyphenate">
<div id="logo" class="clearfix">
{% editable site.header %}
<div class="clearer"></div>
Expand All @@ -17,7 +17,7 @@
<!-- end header -->

<!-- start page -->
<div id="page">
<div id="page" class="content-hyphenate">
<!-- start content -->
<div id="content">
<div id="menus">
Expand All @@ -42,7 +42,7 @@
</div>
<!-- start footer -->
<div id="footer">
<div id="legal" class="clearfix"><div id="designby">Unembellished template by <a href="http://www.freecsstemplates.org">freeCSStemplates.org</a></div><div id="footer-inner" class="clearfix">{% xcontent name="footer" %}</div><div id="edicy">{% loginblock %}{{ "footer_login_link" | lc }}{% endloginblock %}</div></div>
<div id="legal" class="clearfix content-hyphenate"><div id="designby">Unembellished template by <a href="http://www.freecsstemplates.org">freeCSStemplates.org</a></div><div id="footer-inner" class="clearfix">{% xcontent name="footer" %}</div><div id="edicy">{% loginblock %}{{ "footer_login_link" | lc }}{% endloginblock %}</div></div>
</div>
{% include "JS" %}
<!-- end footer -->
Expand Down
8 changes: 8 additions & 0 deletions stylesheets/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,14 @@ html { -webkit-text-size-adjust: none; }
background: url(../images/img02.jpg?1) no-repeat left top;
}

.content-hyphenate {
word-break: break-word;
-webkit-hyphens: auto;
-moz-hyphens: auto;
-ms-hyphens: auto;
hyphens: auto;
}

/* Header */

/* Menu */
Expand Down

0 comments on commit 2fb099f

Please sign in to comment.