From 34aa06a9b9c9bc6cdfb61607b2def8e1fc861b76 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 16 Oct 2016 11:51:38 +0200 Subject: WIP Signed-off-by: Thomas Citharel --- app/Resources/static/themes/material/css/main.css | 102 ++++++++++++++++++---- 1 file changed, 85 insertions(+), 17 deletions(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 2cc2e8a0..f5687318 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -17,12 +17,11 @@ 0 = Common ========================================================================== */ -@font-face { - font-family: icomoon; - src: url("../fonts/IcoMoon-Free.ttf"); - font-weight: normal; - font-style: normal; -} +/** + * + * Material icons + * + */ @font-face { font-family: 'Material Icons'; @@ -62,6 +61,33 @@ font-feature-settings: 'liga'; } +/* Rules for sizing the icon. */ +.material-icons.md-18 { font-size: 18px; } +.material-icons.md-24 { font-size: 24px; } +.material-icons.md-36 { font-size: 36px; } +.material-icons.md-48 { font-size: 48px; } + +/* Rules for using icons as black on a light background. */ +.material-icons.md-dark { color: rgba(0, 0, 0, 0.54); } +.material-icons.md-dark.md-inactive { color: rgba(0, 0, 0, 0.26); } + +/* Rules for using icons as white on a dark background. */ +.material-icons.md-light { color: rgba(255, 255, 255, 1); } +.material-icons.md-light.md-inactive { color: rgba(255, 255, 255, 0.3); } + +/** + * + * Icomoon icons + * + */ + +@font-face { + font-family: icomoon; + src: url("../fonts/IcoMoon-Free.ttf"); + font-weight: normal; + font-style: normal; +} + [class^="icon-"]::before, [class*=" icon-"]::before { font-family: icomoon; @@ -397,13 +423,23 @@ main ul.row { } .data .card .card-body { - height: 22em; + height: 19em; overflow: hidden; } -.card .card-content .card-title { - line-height: 32px; +.card .card-content .card-title, +.card .card-reveal .card-title { + line-height: 22.8px; max-height: 64px; + font-size: 19px; + font-family: roberto, "Helvetica Neue", Helvetica, Arial, sans-serif; + color: #313131; +} + +.card .card-content .activator, +.card .card-reveal .activator { + cursor: pointer; + font-family: "Material Icons"; } .card .card-content i.right, @@ -411,6 +447,11 @@ main ul.row { margin-left: 0; } +.card .card-content .original { + line-height: 24px; + font-size: 15px; +} + .card .card-entry-labels { position: absolute; top: 10px; @@ -433,7 +474,7 @@ main ul.row { } .card .card-entry-labels-hidden { - margin-top: 5px; + margin: 2.5px auto; } .card .card-entry-labels-hidden li { @@ -464,8 +505,8 @@ main ul.row { margin-bottom: 10px; } -.card .card-action .original { - line-height: 24px; +.card .card-action { + padding: 10px 5px 10px 15px; } .card .card-action ul.links { @@ -483,6 +524,11 @@ main ul.row { color: #fff; } +.card .card-action .reading-time { + display: inline-flex; + vertical-align: middle; +} + .quickstart .card .card-action a, .quickstart .card .card-action a:hover { color: #fff !important; @@ -499,7 +545,7 @@ main ul.row { } .card .card-image { - height: 14em; + height: 10em; } .card .card-image .preview { @@ -526,7 +572,8 @@ main ul.row { } #article > header > h1 { - font-size: 1.6em; + font-size: 2em; + margin: 2.1rem 0 0.68rem; } .reader-mode { @@ -565,9 +612,21 @@ main ul.row { z-index: 9999; } -#article aside .link { - color: #000; +#article aside .tools { font-size: 0.8em; + display: flex; + flex-flow: row wrap; + margin: 0 auto; +} + +#article aside .tools li { + display: inline-flex; + vertical-align: middle; + margin: auto 10px; +} + +#article aside .tools a { + color: #000; text-decoration: none; } @@ -578,10 +637,11 @@ main ul.row { #article aside .chip { background-color: rgba(0, 151, 167, 0.85); - color: #fff; padding: 0 15px 0 10px; + margin: auto 2px; } +#article aside .chip a, #article aside .chip i { color: #fff; } @@ -708,6 +768,14 @@ main ul.row { .nb-results { display: none; } + + main ul.row { + padding: 0; + } + + .row .col { + padding: 0; + } } /* ========================================================================== -- cgit v1.2.3 From ab61dbc073fa97afa2b3b9f9d3faed66d5d05b7b Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 16 Oct 2016 12:02:23 +0200 Subject: remove padding on small widths Signed-off-by: Thomas Citharel --- app/Resources/static/themes/material/css/main.css | 1 - 1 file changed, 1 deletion(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index f5687318..7bba6bc0 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -668,7 +668,6 @@ main ul.row { } #article { - padding: 15px; max-width: 35em; margin-left: auto; margin-right: auto; -- cgit v1.2.3 From 817724a7b8507877a81f3ff53639f7b49cb05851 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 22 Oct 2016 13:07:37 +0200 Subject: Re-add bottom pagination MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also pager.html.twig wasn’t necessary, there weren't enough duplication to put them in a dedicated template --- app/Resources/static/themes/baggy/css/main.css | 1 - 1 file changed, 1 deletion(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css index 44db2070..4c3e4ce3 100755 --- a/app/Resources/static/themes/baggy/css/main.css +++ b/app/Resources/static/themes/baggy/css/main.css @@ -581,7 +581,6 @@ img.preview { div.pagination ul { text-align: right; - margin-bottom: 50px; } .nb-results { -- cgit v1.2.3 From 3221b2e413eeddf952310a702fff0f887384018f Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 3 Nov 2016 11:28:40 +0100 Subject: Fix resolution issues and 'title' issues Also, modify editorconfig for css files. Signed-off-by: Thomas Citharel --- app/Resources/static/themes/material/css/main.css | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'app/Resources/static/themes') 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; -- cgit v1.2.3 From d56d416d9bf18722a54a1b262e742767a41fb165 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 3 Nov 2016 12:49:57 +0100 Subject: Deal with more resolution issues Signed-off-by: Thomas Citharel --- app/Resources/static/themes/material/css/main.css | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index d17d0198..446fe879 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -233,8 +233,17 @@ div.pagination ul .next.disabled { color: #fff; } +.page-footer .footer-copyright { + min-width: 50px; + height: auto !important; + line-height: 1em !important; +} + .page-footer .footer-copyright p { - display: inline; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + display: block; } .hidden { @@ -452,6 +461,13 @@ main ul.row { font-size: 15px; } +a.original { + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + display: block; +} + .card .card-entry-labels { position: absolute; top: 10px; -- cgit v1.2.3 From 7005b425e0b554f26a97863ae7784a4c5c52645a Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 8 Nov 2016 22:15:37 +0100 Subject: Remove the left margin of tag MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In the entries list, the first tag below the link isn’t stick to the left. Now it is. --- app/Resources/static/themes/material/css/main.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 446fe879..b5e47300 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -507,6 +507,10 @@ a.original { white-space: nowrap; } +.card .card-entry-labels-hidden li:first-child { + margin-left: 0; +} + .card-entry-tags a, .card-entry-labels a, .card-tag-labels a, -- cgit v1.2.3 From 8d7b4f0eff9d07f8d6d354e09fd926abf26aa4ce Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 8 Nov 2016 22:17:46 +0100 Subject: Display a bigger image in case of image content MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the content is only an image, we can display a bigger preview image because we won’t have text to display. Also, split different card view to avoid too much complexity in the entries.html.twig --- app/Resources/static/themes/material/css/main.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index b5e47300..48a7420a 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -568,7 +568,12 @@ a.original { height: 10em; } -.card .card-image .preview { +.card .card-fullimage { + height: 13.5em; +} + +.card .card-image .preview, +.card .card-fullimage .preview { height: 14em; background-size: cover; background-repeat: no-repeat; -- cgit v1.2.3 From 1c282b1da0491cda620e03ab92c00341aa80e18b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 10 Nov 2016 19:24:00 +0100 Subject: Added creation date on entries view --- app/Resources/static/themes/baggy/css/main.css | 3 ++- app/Resources/static/themes/material/css/main.css | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css index 4c3e4ce3..4dfa8790 100755 --- a/app/Resources/static/themes/baggy/css/main.css +++ b/app/Resources/static/themes/baggy/css/main.css @@ -413,7 +413,8 @@ footer a { margin-bottom: 2em; } -.estimatedTime .reading-time { +.reading-time, +.created-at { color: #999; font-style: italic; font-weight: normal; diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 48a7420a..86a39348 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -644,7 +644,7 @@ a.original { margin: 0 auto; } -#article aside .tools li { +.tools li { display: inline-flex; vertical-align: middle; margin: auto 10px; -- cgit v1.2.3 From 80302e5aaad623f53d9a393db553c439fbb0d8cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 11 Nov 2016 20:41:41 +0100 Subject: Changed display for material theme --- app/Resources/static/themes/material/css/main.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 86a39348..408fe14c 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -644,10 +644,9 @@ a.original { margin: 0 auto; } -.tools li { +article aside .tools li { display: inline-flex; vertical-align: middle; - margin: auto 10px; } #article aside .tools a { -- cgit v1.2.3