From 812c980fa5ea03b9282e32a93723e459eee763a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 29 May 2017 10:59:30 +0200 Subject: Fixed tags display on grid view --- app/Resources/static/themes/material/css/cards.scss | 17 +++++++++++++++++ .../static/themes/material/css/entries.scss | 9 +++++++++ .../static/themes/material/css/various.scss | 20 ++++++++++++++++++++ 3 files changed, 46 insertions(+) (limited to 'app/Resources/static') diff --git a/app/Resources/static/themes/material/css/cards.scss b/app/Resources/static/themes/material/css/cards.scss index f5b79193..1e0155c3 100644 --- a/app/Resources/static/themes/material/css/cards.scss +++ b/app/Resources/static/themes/material/css/cards.scss @@ -182,6 +182,23 @@ a.original:not(.waves-effect) { ul.tools-list { display: none; } + + .preview { + float: left; + width: 90px; + height: 50px; + + img { + max-height: 50px; + padding-right: 10px; + width: 80px; + } + } + + .domain, + .footer { + font-size: 12px; + } } .quickstart .card .card-action a, diff --git a/app/Resources/static/themes/material/css/entries.scss b/app/Resources/static/themes/material/css/entries.scss index b6a46a9e..c667be27 100644 --- a/app/Resources/static/themes/material/css/entries.scss +++ b/app/Resources/static/themes/material/css/entries.scss @@ -2,6 +2,15 @@ * Entries * ========================================================================== */ +.collection { + margin: 15px 15px 0; + + .collection-item { + padding: 7px; + height: 65px; + } +} + .results { height: 1em; diff --git a/app/Resources/static/themes/material/css/various.scss b/app/Resources/static/themes/material/css/various.scss index 7daf40ec..512ed8cd 100644 --- a/app/Resources/static/themes/material/css/various.scss +++ b/app/Resources/static/themes/material/css/various.scss @@ -30,3 +30,23 @@ nav .input-field input { .tab { flex: 1; } + +.chip { + margin: auto 0; + border-radius: 4px; + background-color: #eee; + font-weight: normal; + height: 20px; + line-height: normal; + + a { + color: #9e9e9e; + } + + i.material-icons { + float: right; + font-size: 16px; + line-height: 32px; + padding-left: 8px; + } +} -- cgit v1.2.3 From 91775f36fee13c5e1fd77abf27555e6c77fa93da Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 31 May 2017 14:34:46 +0200 Subject: Add some flex magic Signed-off-by: Thomas Citharel --- .../static/themes/material/css/cards.scss | 61 +++++++++++++++++----- .../static/themes/material/css/various.scss | 20 ------- 2 files changed, 47 insertions(+), 34 deletions(-) (limited to 'app/Resources/static') diff --git a/app/Resources/static/themes/material/css/cards.scss b/app/Resources/static/themes/material/css/cards.scss index 1e0155c3..596d0a59 100644 --- a/app/Resources/static/themes/material/css/cards.scss +++ b/app/Resources/static/themes/material/css/cards.scss @@ -175,30 +175,63 @@ a.original:not(.waves-effect) { } .card-stacked { - &:hover ul.tools-list { - display: block; - } + display: flex; + flex-flow: row wrap; - ul.tools-list { - display: none; + &:hover ul.tools-list { + display: inline; + text-align: right; } .preview { - float: left; - width: 90px; - height: 50px; + max-width: 100px; + height: auto; + margin-right: 10px; + flex: 1; img { - max-height: 50px; - padding-right: 10px; - width: 80px; + max-width: 100%; + max-height: 100%; + } + } + + div.metadata { + .chip { + background-color: $blueAccentColor; + padding: 0 15px 0 10px; + margin: auto 2px; + + a, + i { + color: #fff; + } + + i.material-icons { + float: right; + font-size: 20px; + line-height: 32px; + padding-left: 8px; + } } } - .domain, - .footer { - font-size: 12px; + div.card-content { + flex: 4; } + + ul.tools-list { + flex: 1; + display: none; + flex-basis: 5em; + align-self: flex-end; + float: right; + max-width: 6em; + } +} + +#content .collection .collection-item { + min-height: 65px; + height: auto; } .quickstart .card .card-action a, diff --git a/app/Resources/static/themes/material/css/various.scss b/app/Resources/static/themes/material/css/various.scss index 512ed8cd..7daf40ec 100644 --- a/app/Resources/static/themes/material/css/various.scss +++ b/app/Resources/static/themes/material/css/various.scss @@ -30,23 +30,3 @@ nav .input-field input { .tab { flex: 1; } - -.chip { - margin: auto 0; - border-radius: 4px; - background-color: #eee; - font-weight: normal; - height: 20px; - line-height: normal; - - a { - color: #9e9e9e; - } - - i.material-icons { - float: right; - font-size: 16px; - line-height: 32px; - padding-left: 8px; - } -} -- cgit v1.2.3 From 84b041e87f1e2642627bb4f86284ed538333eb1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 31 May 2017 20:31:35 +0200 Subject: Reduced border-radius for tags --- app/Resources/static/themes/material/css/article.scss | 1 + app/Resources/static/themes/material/css/cards.scss | 1 + 2 files changed, 2 insertions(+) (limited to 'app/Resources/static') diff --git a/app/Resources/static/themes/material/css/article.scss b/app/Resources/static/themes/material/css/article.scss index 8b67f6bd..27ff5221 100644 --- a/app/Resources/static/themes/material/css/article.scss +++ b/app/Resources/static/themes/material/css/article.scss @@ -132,6 +132,7 @@ background-color: $blueAccentColor; padding: 0 15px 0 10px; margin: auto 2px; + border-radius: 6px; a, i { diff --git a/app/Resources/static/themes/material/css/cards.scss b/app/Resources/static/themes/material/css/cards.scss index 596d0a59..3edbe673 100644 --- a/app/Resources/static/themes/material/css/cards.scss +++ b/app/Resources/static/themes/material/css/cards.scss @@ -200,6 +200,7 @@ a.original:not(.waves-effect) { background-color: $blueAccentColor; padding: 0 15px 0 10px; margin: auto 2px; + border-radius: 6px; a, i { -- cgit v1.2.3