From d8177f143aa4256f9b81be93c9e15d6f42adb4bc Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sat, 22 Apr 2017 23:23:51 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8B=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=D0=BE=D0=B2=D0=BE?= =?UTF-8?q?=D0=B9=20=D1=84=D0=BE=D1=80=D0=BC=D1=8B=20=D0=BA=D0=B0=D0=BA=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD=D0=B5=D0=BD=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kinosearch/kinosearch3/webpp/about.ftl | 1 + .../kinosearch/kinosearch3/webpp/blog.ftl | 1 + .../kinosearch/kinosearch3/webpp/header.inc.ftl | 14 +------------- .../kinosearch/kinosearch3/webpp/index.ftl | 3 +++ .../kinosearch/kinosearch3/webpp/search.comp.ftl | 12 ++++++++++++ .../kinosearch/kinosearch3/webpp/static/style.css | 12 ++++++++++++ 6 files changed, 30 insertions(+), 13 deletions(-) create mode 100644 src/main/resources/kinosearch/kinosearch3/webpp/search.comp.ftl diff --git a/src/main/resources/kinosearch/kinosearch3/webpp/about.ftl b/src/main/resources/kinosearch/kinosearch3/webpp/about.ftl index c67e2fc..9b4d1bd 100644 --- a/src/main/resources/kinosearch/kinosearch3/webpp/about.ftl +++ b/src/main/resources/kinosearch/kinosearch3/webpp/about.ftl @@ -1,5 +1,6 @@ [#ftl] [#include "header.inc.ftl"] +[#include "search.comp.ftl"]

KinoSearch - это онлайн-кинотеатр без рекламы.

diff --git a/src/main/resources/kinosearch/kinosearch3/webpp/blog.ftl b/src/main/resources/kinosearch/kinosearch3/webpp/blog.ftl index e0b320c..cfd7c2f 100644 --- a/src/main/resources/kinosearch/kinosearch3/webpp/blog.ftl +++ b/src/main/resources/kinosearch/kinosearch3/webpp/blog.ftl @@ -1,5 +1,6 @@ [#ftl] [#include "header.inc.ftl"] +[#include "search.comp.ftl"]
diff --git a/src/main/resources/kinosearch/kinosearch3/webpp/header.inc.ftl b/src/main/resources/kinosearch/kinosearch3/webpp/header.inc.ftl index 368d57a..77ce05b 100644 --- a/src/main/resources/kinosearch/kinosearch3/webpp/header.inc.ftl +++ b/src/main/resources/kinosearch/kinosearch3/webpp/header.inc.ftl @@ -7,16 +7,4 @@ -
-

KinoSearch

-
-
-
- Найти: - - - - -
-
-
мини-блог | о сервисе
\ No newline at end of file +
\ No newline at end of file diff --git a/src/main/resources/kinosearch/kinosearch3/webpp/index.ftl b/src/main/resources/kinosearch/kinosearch3/webpp/index.ftl index 987fa61..99e03ab 100644 --- a/src/main/resources/kinosearch/kinosearch3/webpp/index.ftl +++ b/src/main/resources/kinosearch/kinosearch3/webpp/index.ftl @@ -1,3 +1,6 @@ [#ftl] [#include "header.inc.ftl"] + + +
[#include "search.comp.ftl"]
[#include "fother.inc.ftl"] \ No newline at end of file diff --git a/src/main/resources/kinosearch/kinosearch3/webpp/search.comp.ftl b/src/main/resources/kinosearch/kinosearch3/webpp/search.comp.ftl new file mode 100644 index 0000000..b9a1293 --- /dev/null +++ b/src/main/resources/kinosearch/kinosearch3/webpp/search.comp.ftl @@ -0,0 +1,12 @@ +

KinoSearch

+
+
+
+ Найти: + + + + +
+
+
мини-блог | о сервисе
\ 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 8415ada..3b0c1a1 100644 --- a/src/main/resources/kinosearch/kinosearch3/webpp/static/style.css +++ b/src/main/resources/kinosearch/kinosearch3/webpp/static/style.css @@ -16,6 +16,7 @@ body { vertical-align: bottom; height: 1.119em; display: inline-block; + margin-bottom: .2em; } .title a { @@ -39,4 +40,15 @@ hr { .news .row { margin-bottom: 2em; +} + +.ks3search.table { + height: 100%; + margin-bottom: 0; +} + +.ks3search.table > tr > td, +.ks3search.table > tbody > tr > td { + vertical-align: middle; + padding-bottom: 15vh; } \ No newline at end of file