From 3221b2e413eeddf952310a702fff0f887384018f Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 3 Nov 2016 11:28:40 +0100 Subject: [PATCH] Fix resolution issues and 'title' issues Also, modify editorconfig for css files. Signed-off-by: Thomas Citharel --- .editorconfig | 4 +++ .../static/themes/material/css/main.css | 11 ++++++-- .../themes/material/Entry/entries.html.twig | 12 ++++----- .../wallabagcore/themes/baggy/js/baggy.min.js | 26 +++++++++---------- .../themes/material/css/style.min.css | 4 +-- .../themes/material/js/material.min.js | 26 +++++++++---------- 6 files changed, 47 insertions(+), 36 deletions(-) diff --git a/.editorconfig b/.editorconfig index f339d2da..d4ef7349 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,3 +8,7 @@ indent_style = space indent_size = 4 trim_trailing_whitespace = true insert_final_newline = true + +[*.css] +indent_style = space +indent_size = 2 diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 7bba6bc0..d17d0198 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -430,7 +430,7 @@ main ul.row { .card .card-content .card-title, .card .card-reveal .card-title { line-height: 22.8px; - max-height: 64px; + max-height: 80px; font-size: 19px; font-family: roberto, "Helvetica Neue", Helvetica, Arial, sans-serif; color: #313131; @@ -711,7 +711,14 @@ main ul.row { } } -@media only screen and (min-width: 993px) and (max-width: 1180px) { +@media only screen and (min-width: 1200px) and (max-width: 1650px) { + .row .col.l3 { + width: 33.33333%; + margin-left: 0; + } +} + +@media only screen and (min-width: 993px) and (max-width: 1200px) { .row .col.l1 { width: 25%; margin-left: 0; diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index 2c145b2a..2a027086 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig @@ -37,16 +37,16 @@ more_vert {% endif %} - {{ entry.title|striptags|raw }} + {{ entry.title| striptags | truncate(80, true, '…') | raw }} {% if entry.previewPicture is null %} -

{{ entry.content|striptags|slice(0, 300)|raw }}…

+

{{ entry.content|striptags|slice(0, 250)|raw }}…