Skip to content
This repository
Browse code

Merge pull request #117 from msevestre/header_cleanup

Header cleanup
  • Loading branch information...
commit 4a353d4d74c52869cea5c096883f55e607c47ccc 2 parents 6fa8a0a + 9abd072
Jean-Philippe Boily authored
2  app/assets/stylesheets/monologue/blog/application.css
@@ -7,7 +7,7 @@
7 7 *= require monologue/blog/skeleton/skeleton
8 8 *= require monologue/blog/skeleton/layout
9 9 *= require monologue/foundation_icons/social_foundicons
10   - *= require_tree .
  10 + *= require monologue/blog/monologue
11 11 *= require monologue/blog/fonts
12 12 *= require monologue/blog/custom
13 13 */
13 app/assets/stylesheets/monologue/blog/monologue.css
@@ -33,7 +33,18 @@ a.social {
33 33 font-size: 30px;
34 34 }
35 35
  36 +.revision-header span {
  37 + text-transform: uppercase;
  38 + font-weight: bold;
  39 +}
36 40
  41 +.revision-header span:after{
  42 + content: "|";
  43 +}
  44 +
  45 +.revision-header span:last-child:after {
  46 + content: "";
  47 +}
37 48 /* pagination */
38 49
39 50 #pagination {
@@ -91,7 +102,7 @@ a.social {
91 102 }
92 103
93 104 /* tags */
94   -#tags {
  105 +.tags {
95 106 margin-top: 20px;
96 107 margin-bottom: 20px;
97 108 }
4 app/views/monologue/posts/_post.html.erb
@@ -2,11 +2,11 @@
2 2 <section>
3 3 <%= render :partial => 'monologue/posts/revision_header', :locals => {:revision=>revision} %>
4 4
5   - <div id="content" data-monologue="content">
  5 + <div class="content" data-monologue="content">
6 6 <%= truncate_html(revision.content, :length => 1000, :omission => '...') %>
7 7 </div>
8 8
9   - <div id="tags" data-monologue="tags">
  9 + <div class="tags" data-monologue="tags">
10 10 <%= render post.tags %>
11 11 </div>
12 12 <%= link_to t(".readmore"), revision.full_url, :class => "button" %>
17 app/views/monologue/posts/_revision_header.html.erb
... ... @@ -1,9 +1,16 @@
1 1 <header class="revision-header">
2 2 <h1><%= link_to revision.title, revision.full_url %></h1>
3 3 <div class="posted">
4   - <time datetime="<%= revision.published_at %>">
5   - <%= I18n.localize(revision.published_at.to_date, :format => :long) %>
6   - </time>
7   - &nbsp;&nbsp;|&nbsp;&nbsp;<%= revision.user.name %>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="<%= revision.full_url + "#disqus_thread" %>"></a>
  4 + <span data-monologue="time">
  5 + <time datetime="<%= revision.published_at %>">
  6 + <%= I18n.localize(revision.published_at.to_date, :format => :long) %>
  7 + </time>
  8 + </span>
  9 + <span data-monologue="user">
  10 + <%= revision.user.name %>
  11 + </span>
  12 + <span data-monologue="disqus">
  13 + <a href="<%= revision.full_url + "#disqus_thread" %>"></a>
  14 + </span>
8 15 </div>
9   -</header>
  16 +</header>
4 app/views/monologue/posts/show.html.erb
@@ -8,11 +8,11 @@
8 8
9 9 <article>
10 10 <%= render :partial => 'monologue/posts/revision_header', :locals => {:revision=>@revision}%>
11   - <div id="content" data-monologue="content">
  11 + <div class="content" data-monologue="content">
12 12 <%= raw @revision.content %>
13 13 </div>
14 14
15   - <div id="tags" data-monologue="tags">
  15 + <div class="tags" data-monologue="tags">
16 16 <%= render @revision.post.tags %>
17 17 </div>
18 18

0 comments on commit 4a353d4

Please sign in to comment.
Something went wrong with that request. Please try again.