oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-07-12 16:58:37 +00:00
Code Wiki Activity

Fix review again

Browse source 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2017-05-07 17:13:08 +02:00
parent 34806fab1b
commit 4c6ee89c9c
4 changed files with 57 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/Resources/static/themes/material/css/article.scss
View file

@ -103,10 +103,13 @@
aside { aside {
.tools { .tools {
font-size: 0.8em;
display: flex; display: flex;
flex-flow: row wrap; flex-flow: row wrap;
.stats {
font-size: 0.8em;
margin: 8px 15px 5px;
li { li {
display: inline-flex; display: inline-flex;
vertical-align: middle; vertical-align: middle;
@ -119,9 +122,10 @@
} }
} }
#list { .tags {
float: right; float: right;
margin: -5px 15px auto; margin: 5px 15px 10px;
}
} }
.chip { .chip {

2
app/Resources/static/themes/material/css/cards.scss
View file

@ -143,7 +143,7 @@ main {
} }
} }
a.original { a.original:not(.waves-effect) {
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;

18
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
View file

@ -216,7 +216,8 @@
<h1>{{ entry.title|striptags|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1> <h1>{{ entry.title|striptags|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1>
</header> </header>
<aside> <aside>
<ul class="tools"> <div class="tools">
<ul class="stats">
<li> <li>
{% include "@WallabagCore/themes/material/Entry/_reading_time.html.twig" with {'entry': entry} only %} {% include "@WallabagCore/themes/material/Entry/_reading_time.html.twig" with {'entry': entry} only %}
</li> </li>
@ -248,14 +249,15 @@
<i class="material-icons link">comment</i> <i class="material-icons link">comment</i>
{{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }} {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}
</li> </li>
<li id="list">
{% for tag in entry.tags %}
<div class="chip">
<a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i class="material-icons vertical-align-middle">delete</i></a>
</div>
{% endfor %}
</li>
</ul> </ul>
<ul class="tags">
{% for tag in entry.tags %}
<li class="chip">
<a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i class="material-icons vertical-align-middle">delete</i></a>
</li>
{% endfor %}
</ul>
</div>
<div class="input-field nav-panel-add-tag" style="display: none"> <div class="input-field nav-panel-add-tag" style="display: none">
{{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }} {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }}

2
web/bundles/wallabagcore/material.css
View file

File diff suppressed because one or more lines are too long