diff --git a/resources/blog.scss b/resources/blog.scss index 13a60eb..4f95d00 100644 --- a/resources/blog.scss +++ b/resources/blog.scss @@ -222,20 +222,26 @@ padding-bottom: 0; } -.pre-expand-blog::before { +.show-more { + color: var(--color-accent-dark); + font-style: italic; + font-size: 16px; + font-weight: 700; + padding: 0px 12px; + margin-top: 5px; position: absolute; - z-index: 1; - top: 0; - left: 0; - width: 100%; - height: 100%; - content: ""; - background-image: -webkit-linear-gradient(bottom, gray, lightgray 3%, transparent 8%, transparent 100%); - border-radius: 8px; + inset: 50% 0px 60px; + background: linear-gradient(to bottom, rgba(255, 255, 255, 0) 1%, #f3f3f3 95%, #f3f3f3 100%); + display: flex; + -webkit-box-pack: end; + justify-content: flex-end; + align-items: flex-end; + cursor: pointer; + padding: 16px 16px; } -.pre-expand-blog:hover { - background-color: #f3f3f3; +.actionbar-box { + margin: 8px 16px; } .post-full { @@ -349,4 +355,4 @@ font-size: 2.5em; } } -} +} \ No newline at end of file diff --git a/templates/actionbar/list.html b/templates/actionbar/list.html index 24d07dc..e5761bb 100644 --- a/templates/actionbar/list.html +++ b/templates/actionbar/list.html @@ -1,51 +1,54 @@ {% set logged_in = request.user.is_authenticated %} {% set profile = request.profile if logged_in else None %} {% if logged_in %} - {% if include_hr %}
{% endif %} -
- - - - - +{% if include_hr %} +
{% endif %} +
+ + - {% if not hide_actionbar_comment %} - - - - {{_("Comment")}} {% if comment_list.count() %} ({{comment_list.count()}}) {% endif %} - - - {% endif %} - - - - {{_("Bookmark")}} - + + - - - - {{_("Share")}} - + + {% if not hide_actionbar_comment %} + + + + {{_("Comment")}} {% if comment_list.count() %} ({{comment_list.count()}}) {% endif + %} - {% if actionbar_report_url %} - - - - {{_("Report")}} - - - {% endif %} -
+
+ {% endif %} + + + + {{_("Bookmark")}} + + + + + + {{_("Share")}} + + + {% if actionbar_report_url %} + + + + {{_("Report")}} + + + {% endif %} +
{% endif %} \ No newline at end of file diff --git a/templates/blog/content.html b/templates/blog/content.html index b9a23fa..e2cf1aa 100644 --- a/templates/blog/content.html +++ b/templates/blog/content.html @@ -2,26 +2,26 @@
{% with authors=post.authors.all() %} - {%- if authors -%} - - - {%- endif -%} + {%- if authors -%} + + + {%- endif -%} {% endwith %} • {{ relative_time(post.publish_on, abs=_('on {time}'), rel=_('{time}')) -}} {%- if post.sticky %} • - {% endif -%} + {% endif -%} {% if post.is_organization_private and show_organization_private_icon %} - • - - {% for org in post.organizations.all() %} - - - {{ org.name }} - - - {% endfor %} + • + + {% for org in post.organizations.all() %} + + + {{ org.name }} + + {% endfor %} + {% endif %} @@ -39,9 +39,12 @@
{% cache 86400 'post_summary' post.id %} - {{ post.summary|default(post.content, true)|markdown(lazy_load=True)|reference|str|safe }} + {{ post.summary|default(post.content, true)|markdown(lazy_load=True)|reference|str|safe }} {% endcache %}
+
+
{{_("...Xem thêm")}}
+
{% set pagevote = post.pagevote %} {% set bookmark = post.bookmark %} {% set hide_actionbar_comment = True %} diff --git a/templates/three-column-content.html b/templates/three-column-content.html index eea22ee..4a7a84c 100644 --- a/templates/three-column-content.html +++ b/templates/three-column-content.html @@ -32,21 +32,20 @@ {% block js_media %}