From de4a5d3664fd9de7c8fd560745668c320c018b45 Mon Sep 17 00:00:00 2001 From: Roman Bazalevsky Date: Fri, 20 May 2016 14:32:41 +0300 Subject: [PATCH] =?utf8?q?=D0=A0=D0=B0=D0=B7=D0=BB=D0=B8=D1=87=D0=BD=D1=8B?= =?utf8?q?=D0=B5=20=D1=81=D0=BF=D0=BE=D1=81=D0=BE=D0=B1=D1=8B=20=D0=BE?= =?utf8?q?=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20?= =?utf8?q?=D0=BE=D0=B1=D0=BB=D0=BE=D0=B6=D0=BA=D0=B8=20=D0=B4=D0=BB=D1=8F?= =?utf8?q?=20=D1=81=D0=BB=D1=83=D1=87=D0=B0=D0=B5=D0=B2=20=D1=81=20=D0=B2?= =?utf8?q?=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=BD=D1=8B=D0=BC=D0=B8=20?= =?utf8?q?=D0=B8=20=D0=B2=D1=8B=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=BD?= =?utf8?q?=D1=8B=D0=BC=D0=B8=20fancyapps?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- www/lang/Localization_ru.json | 1 + www/styles/style-default.css | 3 -- www/styles/style-eink.css | 48 +++++++++++++-------------- www/templates/default/bookdetail.html | 25 +++++++++----- 4 files changed, 41 insertions(+), 36 deletions(-) diff --git a/www/lang/Localization_ru.json b/www/lang/Localization_ru.json index d7cdb38..0b82275 100644 --- a/www/lang/Localization_ru.json +++ b/www/lang/Localization_ru.json @@ -143,6 +143,7 @@ "languages.tg":"Таджикский", "languages.tr":"Турецкий", "languages.ga":"Гэльский", +"languages.ka":"Грузинский", "tags.sf_history":"Альтернативная история", "tags.sf_action":"Боевая Фантастика", "tags.sf_epic":"Эпическая Фантастика", diff --git a/www/styles/style-default.css b/www/styles/style-default.css index b8166b8..7529081 100644 --- a/www/styles/style-default.css +++ b/www/styles/style-default.css @@ -394,8 +394,6 @@ body { margin: 5px; } } - - .modalDialog { position: fixed; font-family: Arial, Helvetica, sans-serif; @@ -451,4 +449,3 @@ body { margin: 5px; } .close:hover { background: #00d9ff; } - diff --git a/www/styles/style-eink.css b/www/styles/style-eink.css index d35b344..13327fe 100644 --- a/www/styles/style-eink.css +++ b/www/styles/style-eink.css @@ -401,36 +401,36 @@ body { margin: 5px; } .modalDialog { - position: fixed; - font-family: Arial, Helvetica, sans-serif; - top: 0; - right: 0; - bottom: 0; - left: 0; - background: rgba(0,0,0,0.8); - z-index: 99999; - opacity:0; - -webkit-transition: opacity 400ms ease-in; - -moz-transition: opacity 400ms ease-in; - transition: opacity 400ms ease-in; - pointer-events: none; + position: fixed; + font-family: Arial, Helvetica, sans-serif; + top: 0; + right: 0; + bottom: 0; + left: 0; + background: rgba(0,0,0,0.8); + z-index: 99999; + opacity:0; + -webkit-transition: opacity 400ms ease-in; + -moz-transition: opacity 400ms ease-in; + transition: opacity 400ms ease-in; + pointer-events: none; } .modalDialog:target { - opacity:1; - pointer-events: auto; + opacity:1; + pointer-events: auto; } .modalDialog > div { - width: 400px; - position: relative; - margin: 10% auto; - padding: 5px 20px 13px 20px; - border-radius: 10px; - background: #fff; - background: -moz-linear-gradient(#fff, #999); - background: -webkit-linear-gradient(#fff, #999); - background: -o-linear-gradient(#fff, #999); + width: 400px; + position: relative; + margin: 10% auto; + padding: 5px 20px 13px 20px; + border-radius: 10px; + background: #fff; + background: -moz-linear-gradient(#fff, #999); + background: -webkit-linear-gradient(#fff, #999); + background: -o-linear-gradient(#fff, #999); } diff --git a/www/templates/default/bookdetail.html b/www/templates/default/bookdetail.html index be7e54a..e30f03c 100644 --- a/www/templates/default/bookdetail.html +++ b/www/templates/default/bookdetail.html @@ -1,20 +1,27 @@
- {{? it.book.hasCover == 1}} + {{? $.cookie("use_fancyapps") == 1}}
-
- X - {{~it.book.authors:author:j}} +
+ X + {{~it.book.authors:author:j}} {{? j > 0}}, {{?}}

{{=htmlEscape (author.name)}}

- {{~}} -

{{=htmlEscape (it.title)}}

- {{=it.const.i18n.coverAlt}} -
+ {{~}} +

{{=htmlEscape (it.title)}}

+ {{=it.const.i18n.coverAlt}} +
{{?}} {{? it.book.hasCover == 1}} + {{? $.cookie("use_fancyapps") == 1}} - {{=it.const.i18n.coverAlt}} + {{?}} + {{? $.cookie("use_fancyapps") == 0}} + + {{?}} +
+ {{=it.const.i18n.coverAlt}} +
{{?}}
-- 2.34.1