Skip to content

Commit

Permalink
Fix #1 (add content hyphenation rules)
Browse files Browse the repository at this point in the history
  • Loading branch information
Kaspar Naaber committed Mar 30, 2015
1 parent 0222591 commit 0983acc
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 8 deletions.
2 changes: 1 addition & 1 deletion components/footer.tpl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div id="footer" class="clear">
<div class="left">
<div class="left content-hyphenate">
{% xcontent name="footer" %}
</div>
<div id="edicy">{% loginblock %}{{ "footer_login_link" | lc }}{% endloginblock %}</div>
Expand Down
2 changes: 1 addition & 1 deletion components/mainmenu.tpl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="nav" class="clear">
<div id="nav" class="clear content-hyphenate">
<ul>
{% unless site.root_item.hidden? %}<li{% if site.root_item.selected? %} class="active"{% endif %}>
<a href="{{site.root_item.url}}">{{site.root_item.title}}</a>
Expand Down
2 changes: 1 addition & 1 deletion layouts/blog___news.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
{% endif %}


<ul id="blog-list">
<ul id="blog-list" class="content-hyphenate">
{% addbutton class="add-article" %}

{% for article in articles %}
Expand Down
4 changes: 2 additions & 2 deletions layouts/blog_article.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
{% include "Menu" %}
<div id="content-wrap" class="clear">
<div class="content">
<div class="excerpt" data-search-indexing-allowed="true">{% editable article.excerpt %}</div>
<div data-search-indexing-allowed="true">{% editable article.body %}</div>
<div class="excerpt content-hyphenate" data-search-indexing-allowed="true">{% editable article.excerpt %}</div>
<div class="content-hyphenate"data-search-indexing-allowed="true">{% editable article.body %}</div>

{% if editmode %}
<div class="cfx article-tags">
Expand Down
2 changes: 1 addition & 1 deletion layouts/common_page.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</div>
{% include "Menu" %}
<div id="content-wrap" class="clear">
<div class="content" data-search-indexing-allowed="true"> {% content %} </div>
<div class="content content-hyphenate" data-search-indexing-allowed="true"> {% content %} </div>
<div id="sidebar">
<div class="inner"> {% include "Submenu" %}

Expand Down
4 changes: 2 additions & 2 deletions layouts/front_page.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div id="header">
<div id="header-inner" class="clear">
<div class="wrapper">
<h1 id="logo">{% editable site.header %}</h1>
<h1 id="logo" class="content-hyphenate">{% editable site.header %}</h1>
{% include "Search" %} </div>
<!-- //wrapper -->
</div>
Expand All @@ -23,7 +23,7 @@
<div id="top-bar" class="clear">
<h2>{% content name="slogan" %}</h2>
{% include "Langmenu" %} </div>
<div id="content-block" data-search-indexing-allowed="true">{% content %}</div>
<div id="content-block" class="content-hyphenate" data-search-indexing-allowed="true">{% content %}</div>
<!-- //content block -->
<div id="sidebar"> {% include "News" %} </div>
<!-- //sidebar -->
Expand Down
8 changes: 8 additions & 0 deletions stylesheets/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,14 @@ img {
hyphens: auto;
}

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

/* => MAIN SECTIONS */
#wrap {
overflow: hidden
Expand Down

0 comments on commit 0983acc

Please sign in to comment.