れびゅー内容適用

kawazrepos · Oct 22, 2014 · 90d0d8a · 90d0d8a
1 parent dc1ef23
commit 90d0d8a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 51 deletions.
diff --git a/src/statics/less/blogs.less b/src/statics/less/blogs.less
@@ -21,11 +21,6 @@
 
 // Blog Article
 @protected-color: #FCF8E3;
-.blog-article {
-//  max-width: 800px;
-//  margin: 10px auto 20px;
- // padding: 10px 30px 30px;
-}
 .blog-article-header {
   .clearfix();
   margin-bottom: 20px;
@@ -38,7 +33,6 @@
     }
     dl {
     &.blog-author {
-
       dt {
         font-weight: normal;
         span {
@@ -84,14 +78,14 @@
 
 }
 .entry-item-right {
-      .blog-administration {
-      .blog-administration-head {
-        color: #fff;
-        background: @navbar-default-bg;
-        border-color: @navbar-default-bg;
-      }
+  .blog-administration {
+    .blog-administration-head {
+      color: #fff;
+      background: @navbar-default-bg;
+      border-color: @navbar-default-bg;
     }
   }
+}
 
 // 内部公開記事用のスタイル
 .bg-protected {
@@ -108,23 +102,23 @@
 
 .date {
   line-height: 1;
-  width: 65px; height: 89px;
+  width: 65px;
+  height: 89px;
   margin-right: 20px;
   padding: 8px 0 0 0;
   background: @navbar-default-bg;
   border-radius: 5px;
   p {
     font-family: Helvetica, sans-serif;
-    font-size: 50px; text-align: center; color: #fff;
+    font-size: 50px;
+    text-align: center;
+    color: #fff;
     span {
-      //background: @brand-primary;
       font-size: 14px;
       font-weight: bold;
       color: #fff;
       text-transform: uppercase;
       display: block;
-      //border-top: 2px solid darken(@brand-primary, 5%);
-
       padding: 4px 0 1px 0;
     }
   }

diff --git a/src/statics/less/markdown.less b/src/statics/less/markdown.less
@@ -39,21 +39,6 @@
     padding-bottom: 5px;
     border-bottom: 1px dotted #999;
   }
-  // h1 {
-  //   font-size: 30px;
-  //   color: white;
-  //   padding: 6px;
-  //   background-color: @brand-primary;
-  //   background-image: url("../img/markdown-h1-bg.png");
-  //   background-repeat: repeat;
-  //   margin-bottom: 20px;
-  //   text-shadow: 0px 1px 2px #666;
-  // }
-  // h2 {
-  //   border-bottom: solid 1px desaturate(lighten(@text-color, 60%), 40%);
-  //   margin-bottom: 20px;
-  //   padding-bottom: 3px;
-  // }
   h6 {
     color: @gray-light;
   }

diff --git a/src/templates/blogs/components/entry_detail.html b/src/templates/blogs/components/entry_detail.html
@@ -3,10 +3,9 @@
 
 <div class="row list-group article-wrap">
     <div class="entry-item entry-date col-xs-12 col-md-1">
-                <div class="date">
-                    <p>{{ object.created_at|date:"d" }}<span>{{ object.created_at|date:"Y/m" }}</span></p>
-                </div>
-
+        <div class="date">
+            <p>{{ object.created_at|date:"d" }}<span>{{ object.created_at|date:"Y/m" }}</span></p>
+        </div>
     </div>
     <div class="entry-item col-xs-12 col-md-9">
         <div class="blog-article">
@@ -18,13 +17,12 @@ <h1>{{ object.title }}</h1>
             </div>
             <article class="markdown">
                 {{ object.body | parser }}
-                <time><label>{% trans "Published at" %}</label>: {{ object.publish_at|date:"Y/m/d H:i" }}</time>
+                <time datetime="{ object.publish_at|date:'c' } "></time>
             </article>
         </div>
 
     </div>
 
-
     <div class="entry-item entry-item-right col-xs-12 col-md-2">
         <dl class="blog-author">
             <dt><span class="glyphicon glyphicon-pencil"></span><span>{% trans "Blog author" %}</span></dt>
@@ -35,8 +33,6 @@ <h1>{{ object.title }}</h1>
                 <a class="author-info author-name" href="{{ object.author.profile.get_absolute_url }}">
                     {{ object.author.nickname }}(id: {{ object.author }})
                 </a>
-
-
             </dd>
         </dl>
 
@@ -47,22 +43,13 @@ <h2 class="panel-title">{% trans "Administration" %}</h2>
       </div>
       <div class="list-group">
           {% if user has 'blogs.change_entry' of object %}
-        <a class="list-group-item" href="{% url 'blogs_entry_update' author=user.username pk=object.pk %}"><span class="glyphicon glyphicon-pencil"></span> {% trans "Entry Edit" %}</a>
+        <a class="list-group-item" href="{% url 'blogs_entry_update' author=user.username pk=object.pk %}"><span class="glyphicon glyphicon-pencil"></span> {% trans "Edit Entry" %}</a>
             {% endif %}
             {% if user has 'blogs.delete_entry' of object %}
-        <a class="list-group-item list-group-item-danger" href="{% url 'blogs_entry_delete' author=user.username pk=object.pk %}" confirm-message="{% trans "Do you want to delete this entry?" %}"><span class="glyphicon glyphicon-remove"></span> {% trans "Entry Delete" %}</a>
+        <a class="list-group-item list-group-item-danger" href="{% url 'blogs_entry_delete' author=user.username pk=object.pk %}" confirm-message="{% trans "Do you want to delete this entry?" %}"><span class="glyphicon glyphicon-remove"></span> {% trans "Delete Entry" %}</a>
             {% endif %}
       </div>
     </div>
 {% endif %}
-
-
     </div>
-
-
-
-
-
-
 </div>
-