From 3aecf0047aa8688e551578aad241dc3eb3123944 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sat, 3 Jun 2017 12:57:45 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D1=83=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=D1=81=D0=BC=D0=BE=D1=82=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kinosearch/kinosearch3/webpp/header.inc.ftl | 1 + .../kinosearch/kinosearch3/webpp/searchResult.ftl | 2 ++ .../kinosearch/kinosearch3/webpp/static/media.css | 7 ++++--- .../kinosearch/kinosearch3/webpp/static/style.css | 12 +++++++++--- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/main/resources/kinosearch/kinosearch3/webpp/header.inc.ftl b/src/main/resources/kinosearch/kinosearch3/webpp/header.inc.ftl index 77ce05b..e683f53 100644 --- a/src/main/resources/kinosearch/kinosearch3/webpp/header.inc.ftl +++ b/src/main/resources/kinosearch/kinosearch3/webpp/header.inc.ftl @@ -4,6 +4,7 @@ + diff --git a/src/main/resources/kinosearch/kinosearch3/webpp/searchResult.ftl b/src/main/resources/kinosearch/kinosearch3/webpp/searchResult.ftl index cd8f0bc..ae37c21 100644 --- a/src/main/resources/kinosearch/kinosearch3/webpp/searchResult.ftl +++ b/src/main/resources/kinosearch/kinosearch3/webpp/searchResult.ftl @@ -14,11 +14,13 @@
+ Посмотреть
${cinema.description}
+ [/#list] diff --git a/src/main/resources/kinosearch/kinosearch3/webpp/static/media.css b/src/main/resources/kinosearch/kinosearch3/webpp/static/media.css index a132a2c..e7519e9 100644 --- a/src/main/resources/kinosearch/kinosearch3/webpp/static/media.css +++ b/src/main/resources/kinosearch/kinosearch3/webpp/static/media.css @@ -1,4 +1,4 @@ -@media only screen and (max-width: 768px) { +@media only screen and (max-width: 767px) { form#search .btn { height: 34px; } @@ -6,13 +6,14 @@ .searchResult .media-left { display: block; text-align: center; + padding-right: 0; } .searchResult .media-object { display: inline; } - .searchResult .media-body { - padding-top: 8px; + .searchResult .btn.view { + margin: 16px 0 8px 0; } } \ No newline at end of file diff --git a/src/main/resources/kinosearch/kinosearch3/webpp/static/style.css b/src/main/resources/kinosearch/kinosearch3/webpp/static/style.css index cb01943..df5295c 100644 --- a/src/main/resources/kinosearch/kinosearch3/webpp/static/style.css +++ b/src/main/resources/kinosearch/kinosearch3/webpp/static/style.css @@ -1,5 +1,3 @@ -@import url('/media.css'); - body { background: #f3f3f3 url('/noise-background.png'); background-size: auto; @@ -68,4 +66,12 @@ hr { .searchResult .panel-heading { font-weight: bold; -} \ No newline at end of file +} + +.searchResult .btn-block.view { + width: inherit; +} + +.searchResult .btn.view { + margin: 8px; +}