* Style refractoring 2

This commit is contained in:
Visman 2018-09-18 20:04:30 +07:00
parent fa64f98f6c
commit b4405452bf
18 changed files with 109 additions and 100 deletions

View file

@ -94,7 +94,7 @@ msgid "No plugin message"
msgstr "There is no plugin called %s in the plugin directory."
msgid "Plugin failed message"
msgstr "Loading of the plugin - <strong>%s</strong> - failed."
msgstr "Loading of the plugin - <b>%s</b> - failed."
msgid "Data updated redirect"
msgstr "Data updated. Redirecting …"

View file

@ -31,10 +31,10 @@ msgid "Censoring info"
msgstr "Below is a list of censor words and their replacement. Wildcards are accepted (i.e. <b>*some*</b> would match <b>somewhere</b> and <b>lonesome</b>). Censor words also affect usernames. New users will not be able to register with usernames containing any censored words. The search is case insensitive."
msgid "Censoring enabled"
msgstr "<strong>Censoring is enabled in %s.</strong>"
msgstr "<b>Censoring is enabled in %s.</b>"
msgid "Censoring disabled"
msgstr "<strong>Censoring is disabled in %s.</strong>"
msgstr "<b>Censoring is disabled in %s.</b>"
msgid "Censored word label"
msgstr "Censored word"

View file

@ -185,13 +185,13 @@ msgstr "Replies"
msgid "%s Reply"
msgid_plural "%s Replies"
msgstr[0] "<strong>%s</strong> Reply"
msgstr[1] "<strong>%s</strong> Replies"
msgstr[0] "<b>%s</b> Reply"
msgstr[1] "<b>%s</b> Replies"
msgid "%s View"
msgid_plural "%s Views"
msgstr[0] "<strong>%s</strong> View"
msgstr[1] "<strong>%s</strong> Views"
msgstr[0] "<b>%s</b> View"
msgstr[1] "<b>%s</b> Views"
msgid "Pages"
msgstr "Pages:"

View file

@ -47,3 +47,6 @@ msgstr "Subscribe to this forum"
msgid "Topic %s was not found in the database"
msgstr "Topic №%s was not found in the database"
msgid "Last post <a href=\"%1$s\">%2$s</a>"
msgstr "<small>Last post </small><a href=\"%1$s\">%2$s</a>"

View file

@ -49,4 +49,4 @@ msgid "User info"
msgstr "User information"
msgid "Visitors online"
msgstr "Registered users online: <strong>%1$s</strong>, guests: <strong>%2$s</strong>."
msgstr "Registered users online: <b>%1$s</b>, guests: <b>%2$s</b>."

View file

@ -25,13 +25,13 @@ msgstr "No parent forum"
msgid "%s Topic"
msgid_plural "%s Topics"
msgstr[0] "<strong>%s</strong> Topic"
msgstr[1] "<strong>%s</strong> Topics"
msgstr[0] "<b>%s</b> Topic"
msgstr[1] "<b>%s</b> Topics"
msgid "%s Post"
msgid_plural "%s Posts"
msgstr[0] "<strong>%s</strong> Post"
msgstr[1] "<strong>%s</strong> Posts"
msgstr[0] "<b>%s</b> Post"
msgstr[1] "<b>%s</b> Posts"
msgid "Moderated by"
msgstr "Moderated by"
@ -44,3 +44,6 @@ msgstr "Mark this forum as read"
msgid "All is read"
msgstr "All is read"
msgid "Last post in the topic \"<a href=\"%1$s\">%2$s</a>\""
msgstr "<small>Last post in the topic &quot;</small><a href=\"%1$s\">%2$s</a><small>&quot;</small>"

View file

@ -102,7 +102,7 @@ msgid "User info"
msgstr "User information"
msgid "Visitors online"
msgstr "Registered users online in this topic: <strong>%1$s</strong>, guests: <strong>%2$s</strong>."
msgstr "Registered users online in this topic: <b>%1$s</b>, guests: <b>%2$s</b>."
msgid "Online users"
msgstr "Online:"

View file

@ -94,7 +94,7 @@ msgid "No plugin message"
msgstr "Нет плагина с именем %s в директории плагинов."
msgid "Plugin failed message"
msgstr "Загрузить плагин <strong>%s</strong> не удалось."
msgstr "Загрузить плагин <b>%s</b> не удалось."
msgid "Data updated redirect"
msgstr "Данные изменены. Переадресация …"

View file

@ -31,10 +31,10 @@ msgid "Censoring info"
msgstr "Ниже показан список нецензурных слов и их замена. Допускается указывать звёздочки в качестве маски (слово <b>*род*</b> будет опознано в словах <b>продукт</b> и <b>родители</b>). Нецензурные слова действуют и на имена пользователей. Новые пользователи не смогут зарегистрироваться с этими словами. Поиск нечувствителен к регистру."
msgid "Censoring enabled"
msgstr "<strong>Цензура включена на странице %s.</strong>"
msgstr "<b>Цензура включена на странице %s.</b>"
msgid "Censoring disabled"
msgstr "<strong>Цензура выключена на странице %s.</strong>"
msgstr "<b>Цензура выключена на странице %s.</b>"
msgid "Censored word label"
msgstr "Нецензурное слово"

View file

@ -185,15 +185,15 @@ msgstr "Ответов"
msgid "%s Reply"
msgid_plural "%s Replies"
msgstr[0] "<strong>%s</strong> Ответ"
msgstr[1] "<strong>%s</strong> Ответа"
msgstr[2] "<strong>%s</strong> Ответов"
msgstr[0] "<b>%s</b> Ответ"
msgstr[1] "<b>%s</b> Ответа"
msgstr[2] "<b>%s</b> Ответов"
msgid "%s View"
msgid_plural "%s Views"
msgstr[0] "<strong>%s</strong> Просмотр"
msgstr[1] "<strong>%s</strong> Просмотра"
msgstr[2] "<strong>%s</strong> Просмотров"
msgstr[0] "<b>%s</b> Просмотр"
msgstr[1] "<b>%s</b> Просмотра"
msgstr[2] "<b>%s</b> Просмотров"
msgid "Pages"
msgstr "Страницы"

View file

@ -47,3 +47,6 @@ msgstr "Подписаться на этот раздел"
msgid "Topic %s was not found in the database"
msgstr "Тема №%s не найдена в базе данных"
msgid "Last post <a href=\"%1$s\">%2$s</a>"
msgstr "<small>Последнее сообщение </small><a href=\"%1$s\">%2$s</a>"

View file

@ -49,4 +49,4 @@ msgid "User info"
msgstr "Информация о пользователях"
msgid "Visitors online"
msgstr "Сейчас пользователей: <strong>%1$s</strong>, гостей: <strong>%2$s</strong>."
msgstr "Сейчас пользователей: <b>%1$s</b>, гостей: <b>%2$s</b>."

View file

@ -26,15 +26,15 @@ msgstr "Нет родительского раздела"
msgid "%s Topic"
msgid_plural "%s Topics"
msgstr[0] "<strong>%s</strong> Тема"
msgstr[1] "<strong>%s</strong> Темы"
msgstr[2] "<strong>%s</strong> Тем"
msgstr[0] "<b>%s</b> Тема"
msgstr[1] "<b>%s</b> Темы"
msgstr[2] "<b>%s</b> Тем"
msgid "%s Post"
msgid_plural "%s Posts"
msgstr[0] "<strong>%s</strong> Сообщение"
msgstr[1] "<strong>%s</strong> Сообщения"
msgstr[2] "<strong>%s</strong> Сообщений"
msgstr[0] "<b>%s</b> Сообщение"
msgstr[1] "<b>%s</b> Сообщения"
msgstr[2] "<b>%s</b> Сообщений"
msgid "Moderated by"
msgid_plural "Moderated by"
@ -50,3 +50,6 @@ msgstr "Отметить все темы в этом раздел прочита
msgid "All is read"
msgstr "Всё прочитано"
msgid "Last post in the topic \"<a href=\"%1$s\">%2$s</a>\""
msgstr "<small>Последнее сообщение в теме &quot;</small><a href=\"%1$s\">%2$s</a><small>&quot;</small>"

View file

@ -103,7 +103,7 @@ msgid "User info"
msgstr "Информация о пользователях"
msgid "Visitors online"
msgstr "Сейчас в этой теме пользователей: <strong>%1$s</strong>, гостей: <strong>%2$s</strong>."
msgstr "Сейчас в этой теме пользователей: <b>%1$s</b>, гостей: <b>%2$s</b>."
msgid "Online users"
msgstr "Активны:"

View file

@ -40,7 +40,7 @@
<section class="f-subforums">
<ol class="f-ftlist">
<li id="id-subforums{!! $p->model->id !!}" class="f-category">
<h2>{{ __('Sub forum', 2) }}</h2>
<h2 class="f-ftch2">{{ __('Sub forum', 2) }}</h2>
<ol class="f-table">
<li class="f-row f-thead" value="0">
<div class="f-hcell f-cmain">{!! __('Sub forum', 1) !!}</div>
@ -131,18 +131,14 @@
</div>
</div>
<div class="f-cell f-cstats">
<ul>
<li>{!! __('%s Reply', $topic->num_replies, num($topic->num_replies)) !!}</li>
<span>{!! __('%s Reply', $topic->num_replies, num($topic->num_replies)) !!}</span>
@if ($topic->showViews)
<li>{!! __('%s View', $topic->num_views, num($topic->num_views)) !!}</li>
<span>{!! __('%s View', $topic->num_views, num($topic->num_views)) !!}</span>
@endif
</ul>
</div>
<div class="f-cell f-clast">
<ul>
<li class="f-cltopic"><a href="{!! $topic->linkLast !!}" title="&quot;{{ cens($topic->subject) }}&quot; - {!! __('Last post') !!}">{{ dt($topic->last_post) }}</a></li>
<li class="f-clposter">{!! __('by %s', $topic->last_poster) !!}</li>
</ul>
<span class="f-cltopic">{!! __('Last post <a href="%1$s">%2$s</a>', $topic->linkLast, dt($topic->last_post)) !!}</span>
<span class="f-clposter">{!! __('by %s', $topic->last_poster) !!}</span>
</div>
</li>
@endif

View file

@ -4,7 +4,7 @@
<ol class="f-ftlist">
@foreach ($p->categoryes as $id => $forums)
<li id="cat-{!! $id !!}" class="f-category">
<h2>{{ current($forums)->cat_name }}</h2>
<h2 class="f-ftch2">{{ current($forums)->cat_name }}</h2>
<ol class="f-table">
<li class="f-row f-thead" value="0">
<div class="f-hcell f-cmain">{!! __('Forum') !!}</div>

View file

@ -48,21 +48,17 @@
</div>
</div>
<div class="f-cell f-cstats">
<ul>
<li>{!! __('%s Topic', $cur->tree->num_topics, num($cur->tree->num_topics)) !!}</li>
<li>{!! __('%s Post', $cur->tree->num_posts, num($cur->tree->num_posts)) !!}</li>
</ul>
<span>{!! __('%s Topic', $cur->tree->num_topics, num($cur->tree->num_topics)) !!}</span>
<span>{!! __('%s Post', $cur->tree->num_posts, num($cur->tree->num_posts)) !!}</span>
</div>
<div class="f-cell f-clast">
<ul>
@if ($cur->tree->last_post_id)
<li class="f-cltopic"><a href="{!! $cur->tree->linkLast !!}" title="&quot;{{ cens($cur->tree->last_topic) }}&quot; - {!! __('Last post') !!}">{{ cens($cur->tree->last_topic) }}</a></li>
<li class="f-clposter">{!! __('by %s', $cur->tree->last_poster) !!}</li>
<li class="f-cltime">{!! dt($cur->tree->last_post) !!}</li>
<span class="f-cltopic">{!! __('Last post in the topic "<a href="%1$s">%2$s</a>"', $cur->tree->linkLast, cens($cur->tree->last_topic)) !!}</span>
<span class="f-clposter">{!! __('by %s', $cur->tree->last_poster) !!}</span>
<span class="f-cltime">{!! dt($cur->tree->last_post) !!}</span>
@else
<li class="f-cltopic">{!! __('Never') !!}</li>
<span class="f-cltopic">{!! __('Never') !!}</span>
@endif
</ul>
</div>
</li>
@endif

View file

@ -49,7 +49,7 @@ body,
#fork article,
#fork aside,
#fork audio,
#fork b,
/*#fork b,*/
#fork big,
#fork blockquote,
#fork canvas,
@ -79,7 +79,7 @@ body,
#fork h6,
#fork header,
#fork hgroup,
#fork i,
/*#fork i,*/
#fork iframe,
#fork img,
#fork input,
@ -98,13 +98,13 @@ body,
#fork pre,
#fork q,
#fork ruby,
#fork s,
/*#fork s,*/
#fork samp,
#fork section,
#fork small,
#fork span,
#fork strike,
#fork strong,
/*#fork strong,*/
#fork sub,
#fork summary,
#fork sup,
@ -118,7 +118,7 @@ body,
#fork time,
#fork tr,
#fork tt,
#fork u,
/*#fork u,*/
#fork ul,
#fork var,
#fork video {
@ -1144,20 +1144,14 @@ body,
/***************************************/
/* Таблица разделов, подразделов и тем */
/***************************************/
#fork .f-ftlist .f-cell {
padding-top: 0.625rem;
padding-bottom: 0.625rem;
overflow: hidden;
}
#fork .f-ftlist .f-hcell {
display: none;
}
#fork .f-ftlist .f-category {
margin-top: 0.625rem;
}
#fork .f-ftch2 {
padding: 0.625rem 0.625rem 0.3125rem 0.625rem;
}
#fork .f-ftlist .f-row {
border-bottom: 0.0625rem solid #AA7939;
}
@ -1166,10 +1160,22 @@ body,
border-bottom: 0.125rem solid #AA7939;
}
#fork .f-ftlist .f-cmain,
#fork .f-ftlist .f-cstats {
padding-left: 0.625rem;
padding-right: 0.625rem;
#fork .f-ftlist .f-cell {
padding: 0.625rem;
overflow: hidden;
}
#fork .f-ftlist .f-cmain {
display: flex;
flex-wrap: nowrap;
}
#fork .f-ftlist .f-ficon {
width: 2rem;
}
#fork .f-ftlist .f-finfo {
width: calc(100% - 2rem);
}
#fork .f-ftlist .f-cstats {
@ -1178,27 +1184,10 @@ body,
font-size: 0.75rem;
}
#fork .f-ftlist .f-cstats li {
display: inline-block;
}
#fork .f-ftlist .f-clast {
display: none;
}
#fork .f-category > h2 {
padding: 0.625rem 0.625rem 0.3125rem 0.625rem;
}
#fork .f-ftlist .f-ficon {
width: 2rem;
float: left;
}
#fork .f-ftlist .f-finfo {
margin-left: 2rem;
}
#fork .f-ftlist .f-fdesc {
font-size: 0.875rem;
}
@ -1214,6 +1203,14 @@ body,
margin-left: -0.875rem;
}
#fork .f-subforums .f-fsub:before {
margin-left: 0.875rem;
}
#fork .f-subforums .f-ftname:before {
content: "└ ";
}
#fork .f-fsub > dt {
display: none;
}
@ -1294,29 +1291,33 @@ body,
*/
@media screen and (min-width: 50rem) {
#fork .f-ftlist .f-cell {
display: table-cell;
#fork .f-ftlist .f-row {
display: flex;
flex-wrap: nowrap;
}
#fork .f-ftlist .f-cmain {
width: 100%;
margin-right: auto;
}
#fork .f-ftlist .f-cstats {
display: flex;
justify-content: center;
flex-direction: column;
min-width: 8rem;
padding-top: 0.625rem;
padding-left: 0;
vertical-align: middle;
white-space: nowrap;
}
#fork .f-ftlist .f-cstats li {
display: block;
}
#fork .f-ftlist .f-clast {
display: flex;
justify-content: center;
flex-direction: column;
width: 15rem;
padding-right: 0.625rem;
vertical-align: middle;
min-width: 15rem;
padding-left: 0;
font-size: 0.875rem;
text-align: right;
}
@ -1324,7 +1325,6 @@ body,
#fork .f-ftlist .f-cltopic,
#fork .f-ftlist .f-clposter,
#fork .f-ftlist .f-cltime {
width: 15rem;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
@ -1335,6 +1335,11 @@ body,
}
}
#fork .f-ftlist .f-hcell,
#fork .f-ftlist small {
display: none;
}
/********************/
/* Страница раздела */
/********************/
@ -1342,17 +1347,17 @@ body,
margin: 1rem 0;
}
#fork .f-subforums .f-category > h2 {
#fork .f-subforums .f-ftch2 {
display: none;
}
#fork .f-forum h3 {
/* font-family: Arial, Helvetica, sans-serif; */
font-weight: normal;
font-size: 1rem;
/*font-size: 1rem;*/
position: relative;
display: block;
word-break: break-all;
/*word-break: break-all;*/
}
#fork .f-cmposter,