1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-06-17 07:10:48 +03:00

Доработка компонентов

This commit is contained in:
Denis Shakhov 2014-12-30 20:52:27 +07:00
parent ab044ce9b2
commit 7a6dd314ba
51 changed files with 1191 additions and 763 deletions

View file

@ -11,5 +11,5 @@
{/block}
{block 'layout_content'}
{include 'components/admin/plugins.tpl' plugins=$plugins}
{component 'admin' template='plugins' plugins=$plugins}
{/block}

View file

@ -6,39 +6,6 @@
* @author Denis Shakhov <denis.shakhov@gmail.com>
*/
body {
font-size: 13px;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
line-height: 18px;
color: #333;
background-color: #f7f7f7;
}
/**
* Ссылки
*/
a { color: #1A80DB; text-decoration: none; }
a:hover { color: #058; }
/**
* Заголовки
*/
h1, h2, h3, h4, h5, h6 {
margin-bottom: 15px;
font-family: "Open Sans", sans-serif;
font-weight: 300;
line-height: 1.2em;
}
h1 { font-size: 28px; }
h2 { font-size: 26px; }
h3 { font-size: 24px; }
h4 { font-size: 22px; }
h5 { font-size: 20px; }
h6 { font-size: 18px; }
/**
* Сетка
@ -75,7 +42,7 @@ h6 { font-size: 18px; }
margin-right: 0;
}
.grid-role-sidebar {
padding-left: 10px;
padding-left: 10px !important;
}
.grid-role-sidebar .block {
margin-bottom: 10px;

View file

@ -0,0 +1,30 @@
/**
* Accordion
*
* @module ls/accordion
*
* @license GNU General Public License, version 2
* @copyright 2013 OOO "ЛС-СОФТ" {@link http://livestreetcms.com}
* @author Denis Shakhov <denis.shakhov@gmail.com>
*/
(function($) {
"use strict";
$.widget( "livestreet.lsAccordion", {
/**
* Дефолтные опции
*/
options: {},
/**
* Конструктор
*
* @constructor
* @private
*/
_create: function () {
this.element.accordion( this.options );
}
});
})(jQuery);

View file

@ -10,6 +10,7 @@
background: #fafafa;
padding: 10px 10px 0;
margin-bottom: 10px;
list-style: none;
}
.actionbar-item {
float: left;

View file

@ -13,11 +13,6 @@
{$classes = "{$classes} js-block-default"}
{/block}
{* Кнопка обновления *}
{block 'block_header_end'}
<div class="block-update js-block-update-tabs"></div>
{/block}
{* Навигация *}
{block 'block_content'}
{**

View file

@ -20,8 +20,10 @@
border: none;
}
.block-item-list li p {
margin: 0;
padding-top: 2px;
font-size: 11px;
line-height: 1.3em;
}
.block-item-list li a {
text-decoration: none;

View file

@ -7,9 +7,9 @@
{if $oUserCurrent}
<div class="activity-settings js-activity-settings">
<small class="note mb-15">
<p class="text-help">
{$aLang.activity.settings.note}
</small>
</p>
<div class="field-checkbox-group">
{foreach $smarty.local.types as $type => $data}

View file

@ -26,11 +26,11 @@
{* Активировать/деактивировать *}
<li>
{if $plugin.is_active}
{include 'components/button/button.tpl'
{component 'button'
url = "{router page='admin'}plugins/?plugin={$plugin.code}&action=deactivate&security_ls_key={$LIVESTREET_SECURITY_KEY}"
text = {lang 'admin.plugins.plugin.deactivate'}}
{else}
{include 'components/button/button.tpl'
{component 'button'
url = "{router page='admin'}plugins/?plugin={$plugin.code}&action=activate&security_ls_key={$LIVESTREET_SECURITY_KEY}"
mods = 'primary'
text = {lang 'admin.plugins.plugin.activate'}}
@ -40,7 +40,7 @@
{* Применить обновление *}
{if $plugin.apply_update && $plugin.is_active}
<li>
{include 'components/button/button.tpl'
{component 'button'
url = "{router page='admin'}plugins/?plugin={$plugin.code}&action=apply_update&security_ls_key={$LIVESTREET_SECURITY_KEY}"
text = {lang 'admin.plugins.plugin.apply_update'}}
</li>
@ -49,7 +49,7 @@
{* Ссылка на страницу настроек *}
{if $plugin.property->settings != "" && $plugin.is_active}
<li>
{include 'components/button/button.tpl'
{component 'button'
url = $plugin.property->settings
text = {lang 'admin.plugins.plugin.settings'}}
</li>
@ -57,10 +57,10 @@
{* Удалить *}
<li>
{include 'components/button/button.tpl'
url = "{router page='admin'}plugins/?plugin={$plugin.code}&action=remove&security_ls_key={$LIVESTREET_SECURITY_KEY}"
{component 'button'
url = "{router page='admin'}plugins/?plugin={$plugin.code}&action=remove&security_ls_key={$LIVESTREET_SECURITY_KEY}"
attributes = [ 'onclick' => "return confirm('{lang 'common.remove_confirm'}');" ]
text = {lang 'admin.plugins.plugin.remove'}}
text = {lang 'admin.plugins.plugin.remove'}}
</li>
</ul>
</td>

View file

@ -4,10 +4,13 @@
{extends 'components/modal/modal.tpl'}
{block 'modal_id'}modal-login{/block}
{block 'modal_class'}modal-login js-modal-default{/block}
{block 'modal_title'}{$aLang.auth.authorization}{/block}
{block 'modal_attributes'}data-modal-center="false"{/block}
{block 'modal_options' append}
{$id = 'modal-login'}
{$mods = "$mods auth"}
{$classes = "$classes js-modal-default"}
{$title = $aLang.auth.authorization}
{$attributes = array_merge( $attributes|default:[], [ 'data-modal-center' => 'false' ] )}
{/block}
{block 'modal_content'}
{if ! Config::Get('general.reg.invite')}

View file

@ -58,20 +58,6 @@
margin: 5px 0;
}
/* Кнопка обновления блока */
.block-update {
position: absolute;
top: 19px;
right: 15px;
width: 16px;
height: 16px;
background: url(../images/update.gif) no-repeat;
cursor: pointer;
}
.block-update.active {
background-position: -16px 0;
}
/**
* @modifier nopadding Блок без отступов у контента
*/

View file

@ -49,17 +49,6 @@
_this.elements.pane_container.css( 'height', 'auto' );
}
});
// Кнопка обновления активного таба
this.elements.update.on( 'click' + this.eventNamespace, function () {
this.elements.tabs.lsTabs( 'getActiveTab' ).lsTab( 'activate' );
this.elements.update.addClass( 'active' );
// Даем кнопке немного покрутиться
setTimeout(function() {
this.elements.update.removeClass( 'active' );
}.bind( this ), 600 );
}.bind( this ));
}
});
})(jQuery);

View file

@ -7,9 +7,12 @@
{extends 'components/modal/modal.tpl'}
{block 'modal_id'}modal-blog-delete{/block}
{block 'modal_class'}modal-blog-delete js-modal-default{/block}
{block 'modal_title'}{$aLang.blog.remove.title}{/block}
{block 'modal_options' append}
{$id = "modal-blog-delete"}
{$mods = "$mods blog-delete"}
{$classes = "$classes js-modal-default"}
{$title = $aLang.blog.remove.title}
{/block}
{block 'modal_content'}
{$blog = $smarty.local.blog}

View file

@ -1,5 +1,6 @@
/**
* Buttons
* Стили частично позаимствованы у бутстрапа
*
* @module ls/button
*
@ -9,114 +10,181 @@
*/
.button {
display: inline-block;
padding: 7px 13px;
margin: 0;
border: 1px solid #ddd;
text-align: center;
display: inline-block;
margin: 0;
border: 1px solid transparent;
text-align: center;
vertical-align: middle;
text-decoration: none;
font-size: 13px;
line-height: normal;
color: #444;
background: transparent;
font-family: Arial, sans-serif;
cursor: pointer;
position: relative;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
-webkit-transition: background .2s, color .2s;
-moz-transition: background .2s, color .2s;
transition: background .2s, color .2s;
touch-action: manipulation;
white-space: nowrap;
line-height: normal;
color: #444;
background-image: none;
cursor: pointer;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
-webkit-transition: background .2s, color .2s;
-moz-transition: background .2s, color .2s;
transition: background .2s, color .2s;
}
.button:hover { text-decoration: none; background: #fafafa; color: #333; }
.button:active {
position: relative;
top: 1px;
position: relative;
top: 1px;
}
.button:focus { outline: none; }
.button:active,
.button.active {
background: #eaeaea;
outline: none;
-webkit-box-shadow: inset 0 3px 5px rgba(0,0,0,.125);
box-shadow: inset 0 3px 5px rgba(0,0,0,.125);
}
/* Icon */
.button [class^="icon-"],
.button [class*=" icon-"] {
float: left;
position: relative;
margin-right: 5px;
float: left;
position: relative;
margin-right: 5px;
}
/**
* Colors
*/
.button {
color: #333;
background-color: #fff;
border-color: #ccc;
}
.button:hover {
color: #333;
background-color: #e6e6e6;
border-color: #adadad;
}
.button--primary {
color: #fff;
background-color: #337ab7;
border-color: #2e6da4;
}
.button--primary:hover {
color: #fff;
background-color: #286090;
border-color: #204d74;
}
.button--success {
color: #fff;
background-color: #5cb85c;
border-color: #4cae4c;
}
.button--success:hover {
color: #fff;
background-color: #449d44;
border-color: #398439;
}
.button--info {
color: #fff;
background-color: #5bc0de;
border-color: #46b8da;
}
.button--info:hover {
color: #fff;
background-color: #31b0d5;
border-color: #269abc;
}
.button--warning {
color: #fff;
background-color: #f0ad4e;
border-color: #eea236;
}
.button--warning:hover {
color: #fff;
background-color: #ec971f;
border-color: #d58512;
}
.button--danger {
color: #fff;
background-color: #d9534f;
border-color: #d43f3a;
}
.button--danger:hover {
color: #fff;
background-color: #c9302c;
border-color: #ac2925;
}
/*
* Button Disabled
/**
* Disabled
*/
.button.disabled,
.button.disabled:hover,
.button[disabled],
.button[disabled]:hover {
border-color: #ccc;
background: #eee;
color: #999;
border-color: #ccc;
background: #eee;
color: #999;
}
.button.disabled:active,
.button[disabled]:active {
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
/**
* Button Primary
*/
.button--primary { border-color: #74A2FF; color: #777DFF; }
.button--primary:hover { background: #91B6FF; color: #fff; }
.button--primary.active { background: #006DCC; }
/**
* Button Icon
* Icon
*/
.button.button--icon { padding-left: 6px; padding-right: 6px; }
.button.button--icon [class^="icon-"],
.button.button--icon [class*=" icon-"] { margin: 0; }
/**
* Button Small
* Sizes
*/
.button--small { height: 24px; font-size: 11px; padding-left: 8px; padding-right: 8px; }
a.button--small { padding-top: 4px; }
.button.button--small.button-icon { padding-left: 5px; padding-right: 5px; }
/**
* Button Large
*/
.button--large { height: 34px; font-size: 14px; }
a.button--large { padding-top: 8px; }
.button.button--large.button-icon { padding-left: 9px; padding-right: 9px; }
.button {
padding: 7px 12px;
font-size: 13px;
}
.button--large {
padding: 10px 16px;
font-size: 18px;
}
.button--small {
padding: 5px 10px;
font-size: 12px;
}
.button--xsmall {
padding: 1px 5px;
font-size: 12px;
}
.button--block {
display: block;
width: 100%;
}
.button--block + .button--block {
margin-top: 5px;
}
input[type="submit"].button--block,
input[type="reset"].button--block,
input[type="button"].button--block {
width: 100%;
}
/**
* Loading
*/
.button[disabled].loading,
.button.loading {
color: transparent;
background-repeat: no-repeat;
background-position: 50% 50%;
}
/**
* Dropdown support
*/
.button.dropdown-toggle { padding-right: 25px; }
color: transparent;
background-repeat: no-repeat;
background-position: 50% 50%;
}

View file

@ -0,0 +1 @@
TODO

View file

@ -0,0 +1,109 @@
{**
* Кнопки
*}
{test_heading text='Кнопки'}
{capture 'test_example_content'}
{component 'button' text='Кнопка'}
{component 'button' text='Ссылка' url='http://example.com'}
{/capture}
{capture 'test_example_code'}
{ldelim}component 'button' text='Кнопка'{rdelim}
{ldelim}component 'button' text='Ссылка' url='http://example.com'{rdelim}
{/capture}
{test_example content=$smarty.capture.test_example_content code=$smarty.capture.test_example_code}
{**
* Цвета
*}
{test_heading text='Цвета'}
<p>Модификаторы <code>primary</code> <code>success</code> <code>info</code> <code>warning</code> <code>danger</code></p>
{capture 'test_example_content'}
{component 'button' text='Primary' mods='primary'}
{component 'button' text='Success' mods='success'}
{component 'button' text='Info' mods='info'}
{component 'button' text='Warning' mods='warning'}
{component 'button' text='Danger' mods='danger'}
{/capture}
{capture 'test_example_code'}
{ldelim}component 'button' text='Default'{rdelim}
{ldelim}component 'button' text='Primary' mods='primary'{rdelim}
{ldelim}component 'button' text='Success' mods='success'{rdelim}
{ldelim}component 'button' text='Info' mods='info'{rdelim}
{ldelim}component 'button' text='Warning' mods='warning'{rdelim}
{ldelim}component 'button' text='Danger' mods='danger'{rdelim}
{/capture}
{test_example content=$smarty.capture.test_example_content code=$smarty.capture.test_example_code}
{**
* Размеры
*}
{test_heading text='Размеры'}
<p>Модификаторы <code>large</code> <code>small</code> <code>xsmall</code></p>
{capture 'test_example_content'}
<p>{component 'button' text='Large button' mods='large'}</p>
<p>{component 'button' text='Default button' mods='default'}</p>
<p>{component 'button' text='Small button' mods='small'}</p>
<p>{component 'button' text='Xsmall button' mods='xsmall'}</p>
{/capture}
{capture 'test_example_code'}
{ldelim}component 'button' text='Large button' mods='large'{rdelim}
{ldelim}component 'button' text='Default button' mods='default'{rdelim}
{ldelim}component 'button' text='Small button' mods='small'{rdelim}
{ldelim}component 'button' text='Extra small button' mods='xsmall'{rdelim}
{/capture}
{test_example content=$smarty.capture.test_example_content code=$smarty.capture.test_example_code}
<h3>Кнопка во всю ширину родительского блока</h3>
<p>Модификатор <code>block</code></p>
{capture 'test_example_content'}
<div style="background: #fafafa; padding: 20px; width: 200px;">
{component 'button' text='Block button' mods='large block'}
</div>
{/capture}
{capture 'test_example_code'}
{ldelim}component 'button' text='Large button' mods='large block'{rdelim}
{/capture}
{test_example content=$smarty.capture.test_example_content code=$smarty.capture.test_example_code}
{**
* Отправка формы
*}
{test_heading text='Отправка формы'}
<p>Опция <code>form</code> позволяет указать id формы для отправки, это бывает полезно если кнопку отправки необходимо разместить вне формы.</p>
{capture 'test_example_content'}
<form id="myform">
<input type="text" value="Name">
</form>
{ldelim}component 'button' text='Кнопка' classes='active'{rdelim}
{/capture}
{capture 'test_example_code'}
<form id="myform">
<input type="text" value="Name">
</form>
{ldelim}component 'button' text='Отправить' form='myform'{rdelim}
{/capture}
{test_example content=$smarty.capture.test_example_content code=$smarty.capture.test_example_code}

View file

@ -15,14 +15,12 @@
{extends 'components/modal/modal.tpl'}
{block 'modal_options' append}
{$mods = "$mods crop"}
{$title = $smarty.local.title|escape|default:{lang 'crop.title'}}
{$desc = $smarty.local.desc|escape}
{$usePreview = $smarty.local.usePreview}
{/block}
{block 'modal_class'}modal--crop{/block}
{block 'modal_title'}{$title}{/block}
{block 'modal_content'}
{if $desc}
<p class="crop-desc">{$desc}</p>

View file

@ -59,7 +59,7 @@
.word-wrap {
white-space: -moz-pre-wrap !important;
white-space: -pre-wrap;
white-space: -o-pre-wrap;
white-space: -o-pre-wrap;
white-space: pre-wrap;
word-wrap: break-word;
white-space: normal;
@ -94,4 +94,34 @@
.link-dashed { text-decoration: none; border-bottom: 1px dashed; }
.link-dotted { text-decoration: none; border-bottom: 1px dotted; }
.hide { display: none; }
/* Images */
.img-responsive {
min-width: 100%;
height: auto;
}
.img-rounded { border-radius: 5px; }
.img-circle { border-radius: 50%; }
.img-thumbnail {
display: inline-block;
max-width: 100%;
height: auto;
padding: 4px;
line-height: 1.4;
background-color: #fff;
border: 1px solid #ddd;
border-radius: 4px;
-webkit-transition: all .2s ease-in-out;
transition: all .2s ease-in-out;
}
/* Visibility */
.show {
display: block !important;
}
.hidden {
display: none !important;
visibility: hidden !important;
}
.invisible {
visibility: hidden;
}

View file

@ -1,397 +0,0 @@
/* Adapted from git.io/normalize */
/* ==========================================================================
HTML5 display definitions
========================================================================== */
/**
* Correct `block` display not defined in IE 8/9.
*/
article,
aside,
details,
figcaption,
figure,
footer,
header,
hgroup,
nav,
section,
summary {
display: block;
}
/**
* Correct `inline-block` display not defined in IE 8/9.
*/
audio,
canvas,
video {
display: inline-block;
}
/**
* Prevent modern browsers from displaying `audio` without controls.
* Remove excess height in iOS 5 devices.
*/
audio:not([controls]) {
display: none;
height: 0;
}
/**
* Address styling not present in IE 8/9.
*/
[hidden] {
display: none;
}
/* ==========================================================================
Base
========================================================================== */
/**
* 1. Set default font family to sans-serif.
* 2. Prevent iOS text size adjust after orientation change, without disabling
* user zoom.
*/
html {
font-family: sans-serif; /* 1 */
-webkit-text-size-adjust: 100%; /* 2 */
-ms-text-size-adjust: 100%; /* 2 */
}
/**
* Remove default margin.
*/
body {
margin: 0;
}
/* ==========================================================================
Links
========================================================================== */
/**
* Address `outline` inconsistency between Chrome and other browsers.
*/
a:focus {
outline: 0;
}
/**
* Improve readability when focused and also mouse hovered in all browsers.
*/
a:active,
a:hover {
outline: 0;
}
/* ==========================================================================
Typography
========================================================================== */
/**
* Address variable `h1` font size within `section` and `article` contexts in
* Firefox 4+, Safari 5, and Chrome.
*/
h1, h2, h3, h4, h5, h6 {
font-size: 1em;
line-height: 1.6em;
font-weight: normal;
margin: 0;
font-family: sans-serif;
}
p { margin: 0; }
/**
* Address styling not present in IE 8/9, Safari 5, and Chrome.
*/
abbr[title],
acronym[title] {
border-bottom: 1px dotted;
cursor: help;
}
/**
* Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
*/
b,
strong {
font-weight: bold;
}
/**
* Address styling not present in Safari 5 and Chrome.
*/
dfn {
font-style: italic;
}
/**
* Address styling not present in IE 8/9.
*/
mark {
background: #ff0;
color: #000;
}
/**
* Correct font family set oddly in Safari 5 and Chrome.
*/
code,
kbd,
pre,
samp {
font-family: monospace, serif;
font-size: 1em;
}
/**
* Improve readability of pre-formatted text in all browsers.
*/
/* pre {
white-space: pre;
white-space: pre-wrap;
word-wrap: break-word;
} */
/**
* Set consistent quote types.
*/
q {
quotes: "\201C" "\201D" "\2018" "\2019";
}
/**
* Address inconsistent and variable font size in all browsers.
*/
small {
font-size: 80%;
}
/**
* Prevent `sub` and `sup` affecting `line-height` in all browsers.
*/
sub,
sup {
font-size: 75%;
line-height: 0;
position: relative;
vertical-align: baseline;
}
sup {
top: -0.5em;
}
sub {
bottom: -0.25em;
}
/* =============================================================================
Lists
========================================================================== */
ul, ol, dl, dd, dt { margin: 0; padding: 0; }
ul, ol {
list-style: none;
list-style-image: none;
}
/* ==========================================================================
Embedded content
========================================================================== */
/**
* Remove border when inside `a` element in IE 8/9.
*/
img {
border: 0;
}
/**
* Correct overflow displayed oddly in IE 9.
*/
svg:not(:root) {
overflow: hidden;
}
iframe {
border: 0;
}
/* ==========================================================================
Figures
========================================================================== */
/**
* Address margin not present in IE 8/9 and Safari 5.
*/
figure {
margin: 0;
}
/* ==========================================================================
Forms
========================================================================== */
/**
* Define consistent border, margin, and padding.
*/
fieldset {
border: 0;
margin: 0 2px;
padding: 0;
}
/**
* 1. Correct `color` not being inherited in IE 8/9.
* 2. Remove padding so people aren't caught out if they zero out fieldsets.
*/
legend {
border: 0; /* 1 */
padding: 0; /* 2 */
}
/**
* 1. Correct font family not being inherited in all browsers.
* 2. Correct font size not being inherited in all browsers.
* 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
*/
button,
input,
select,
textarea {
font-family: inherit; /* 1 */
font-size: 100%; /* 2 */
margin: 0; /* 3 */
}
/**
* Address Firefox 4+ setting `line-height` on `input` using `!important` in
* the UA stylesheet.
*/
button,
input {
line-height: normal;
}
/**
* 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
* and `video` controls.
* 2. Correct inability to style clickable `input` types in iOS.
* 3. Improve usability and consistency of cursor style between image-type
* `input` and others.
*/
button,
html input[type="button"], /* 1 */
input[type="reset"],
input[type="submit"] {
-webkit-appearance: button; /* 2 */
cursor: pointer; /* 3 */
}
/**
* Re-set default cursor for disabled elements.
*/
button[disabled],
html input[disabled] {
cursor: default;
}
/**
* 1. Address box sizing set to `content-box` in IE 8/9.
* 2. Remove excess padding in IE 8/9.
*/
input[type="checkbox"],
input[type="radio"] {
box-sizing: border-box; /* 1 */
padding: 0; /* 2 */
}
/**
* 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
* 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
* (include `-moz` to future-proof).
*/
input[type="search"] {
-webkit-appearance: textfield; /* 1 */
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box; /* 2 */
box-sizing: content-box;
}
/**
* Remove inner padding and search cancel button in Safari 5 and Chrome
* on OS X.
*/
input[type="search"]::-webkit-search-cancel-button,
input[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
/**
* Remove inner padding and border in Firefox 4+.
*/
button::-moz-focus-inner,
input::-moz-focus-inner {
border: 0;
padding: 0;
}
/**
* 1. Remove default vertical scrollbar in IE 8/9.
* 2. Improve readability and alignment in all browsers.
*/
textarea {
overflow: auto; /* 1 */
vertical-align: top; /* 2 */
}
/* ==========================================================================
Tables
========================================================================== */
/**
* Remove most spacing between table cells.
*/
table {
border-collapse: collapse;
border-spacing: 0;
}

View file

@ -0,0 +1,427 @@
/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
/**
* 1. Set default font family to sans-serif.
* 2. Prevent iOS text size adjust after orientation change, without disabling
* user zoom.
*/
html {
font-family: sans-serif; /* 1 */
-ms-text-size-adjust: 100%; /* 2 */
-webkit-text-size-adjust: 100%; /* 2 */
}
/**
* Remove default margin.
*/
body {
margin: 0;
}
/* HTML5 display definitions
========================================================================== */
/**
* Correct `block` display not defined for any HTML5 element in IE 8/9.
* Correct `block` display not defined for `details` or `summary` in IE 10/11
* and Firefox.
* Correct `block` display not defined for `main` in IE 11.
*/
article,
aside,
details,
figcaption,
figure,
footer,
header,
hgroup,
main,
menu,
nav,
section,
summary {
display: block;
}
/**
* 1. Correct `inline-block` display not defined in IE 8/9.
* 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
*/
audio,
canvas,
progress,
video {
display: inline-block; /* 1 */
vertical-align: baseline; /* 2 */
}
/**
* Prevent modern browsers from displaying `audio` without controls.
* Remove excess height in iOS 5 devices.
*/
audio:not([controls]) {
display: none;
height: 0;
}
/**
* Address `[hidden]` styling not present in IE 8/9/10.
* Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
*/
[hidden],
template {
display: none;
}
/* Links
========================================================================== */
/**
* Remove the gray background color from active links in IE 10.
*/
a {
background-color: transparent;
}
/**
* Improve readability when focused and also mouse hovered in all browsers.
*/
a:active,
a:hover {
outline: 0;
}
/* Text-level semantics
========================================================================== */
/**
* Address styling not present in IE 8/9/10/11, Safari, and Chrome.
*/
abbr[title] {
border-bottom: 1px dotted;
}
/**
* Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
*/
b,
strong {
font-weight: bold;
}
/**
* Address styling not present in Safari and Chrome.
*/
dfn {
font-style: italic;
}
/**
* Address variable `h1` font-size and margin within `section` and `article`
* contexts in Firefox 4+, Safari, and Chrome.
*/
h1 {
font-size: 2em;
margin: 0.67em 0;
}
/**
* Address styling not present in IE 8/9.
*/
mark {
background: #ff0;
color: #000;
}
/**
* Address inconsistent and variable font size in all browsers.
*/
small {
font-size: 80%;
}
/**
* Prevent `sub` and `sup` affecting `line-height` in all browsers.
*/
sub,
sup {
font-size: 75%;
line-height: 0;
position: relative;
vertical-align: baseline;
}
sup {
top: -0.5em;
}
sub {
bottom: -0.25em;
}
/* Embedded content
========================================================================== */
/**
* Remove border when inside `a` element in IE 8/9/10.
*/
img {
border: 0;
}
/**
* Correct overflow not hidden in IE 9/10/11.
*/
svg:not(:root) {
overflow: hidden;
}
/* Grouping content
========================================================================== */
/**
* Address margin not present in IE 8/9 and Safari.
*/
figure {
margin: 1em 40px;
}
/**
* Address differences between Firefox and other browsers.
*/
hr {
-moz-box-sizing: content-box;
box-sizing: content-box;
height: 0;
}
/**
* Contain overflow in all browsers.
*/
pre {
overflow: auto;
}
/**
* Address odd `em`-unit font size rendering in all browsers.
*/
code,
kbd,
pre,
samp {
font-family: monospace, monospace;
font-size: 1em;
}
/* Forms
========================================================================== */
/**
* Known limitation: by default, Chrome and Safari on OS X allow very limited
* styling of `select`, unless a `border` property is set.
*/
/**
* 1. Correct color not being inherited.
* Known issue: affects color of disabled elements.
* 2. Correct font properties not being inherited.
* 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
*/
button,
input,
optgroup,
select,
textarea {
color: inherit; /* 1 */
font: inherit; /* 2 */
margin: 0; /* 3 */
}
/**
* Address `overflow` set to `hidden` in IE 8/9/10/11.
*/
button {
overflow: visible;
}
/**
* Address inconsistent `text-transform` inheritance for `button` and `select`.
* All other form control elements do not inherit `text-transform` values.
* Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
* Correct `select` style inheritance in Firefox.
*/
button,
select {
text-transform: none;
}
/**
* 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
* and `video` controls.
* 2. Correct inability to style clickable `input` types in iOS.
* 3. Improve usability and consistency of cursor style between image-type
* `input` and others.
*/
button,
html input[type="button"], /* 1 */
input[type="reset"],
input[type="submit"] {
-webkit-appearance: button; /* 2 */
cursor: pointer; /* 3 */
}
/**
* Re-set default cursor for disabled elements.
*/
button[disabled],
html input[disabled] {
cursor: default;
}
/**
* Remove inner padding and border in Firefox 4+.
*/
button::-moz-focus-inner,
input::-moz-focus-inner {
border: 0;
padding: 0;
}
/**
* Address Firefox 4+ setting `line-height` on `input` using `!important` in
* the UA stylesheet.
*/
input {
line-height: normal;
}
/**
* It's recommended that you don't attempt to style these elements.
* Firefox's implementation doesn't respect box-sizing, padding, or width.
*
* 1. Address box sizing set to `content-box` in IE 8/9/10.
* 2. Remove excess padding in IE 8/9/10.
*/
input[type="checkbox"],
input[type="radio"] {
box-sizing: border-box; /* 1 */
padding: 0; /* 2 */
}
/**
* Fix the cursor style for Chrome's increment/decrement buttons. For certain
* `font-size` values of the `input`, it causes the cursor style of the
* decrement button to change from `default` to `text`.
*/
input[type="number"]::-webkit-inner-spin-button,
input[type="number"]::-webkit-outer-spin-button {
height: auto;
}
/**
* 1. Address `appearance` set to `searchfield` in Safari and Chrome.
* 2. Address `box-sizing` set to `border-box` in Safari and Chrome
* (include `-moz` to future-proof).
*/
input[type="search"] {
-webkit-appearance: textfield; /* 1 */
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box; /* 2 */
box-sizing: content-box;
}
/**
* Remove inner padding and search cancel button in Safari and Chrome on OS X.
* Safari (but not Chrome) clips the cancel button when the search input has
* padding (and `textfield` appearance).
*/
input[type="search"]::-webkit-search-cancel-button,
input[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
/**
* Define consistent border, margin, and padding.
*/
fieldset {
border: 1px solid #c0c0c0;
margin: 0 2px;
padding: 0.35em 0.625em 0.75em;
}
/**
* 1. Correct `color` not being inherited in IE 8/9/10/11.
* 2. Remove padding so people aren't caught out if they zero out fieldsets.
*/
legend {
border: 0; /* 1 */
padding: 0; /* 2 */
}
/**
* Remove default vertical scrollbar in IE 8/9/10/11.
*/
textarea {
overflow: auto;
}
/**
* Don't inherit the `font-weight` (applied by a rule above).
* NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
*/
optgroup {
font-weight: bold;
}
/* Tables
========================================================================== */
/**
* Remove most spacing between table cells.
*/
table {
border-collapse: collapse;
border-spacing: 0;
}
td,
th {
padding: 0;
}

View file

@ -29,7 +29,7 @@
.dropdown-toggle {
position: relative;
cursor: pointer;
padding-right: 25px;
padding-right: 25px !important;
}
.dropdown-toggle:after {
content: "";

View file

@ -9,9 +9,9 @@
<div class="feed-blogs js-feed-blogs">
{$blogsSubscribed = $smarty.local.blogsSubscribed}
<small class="note mb-15">
<p class="text-help">
{$aLang.feed.blogs.note}
</small>
</p>
{if $smarty.local.blogsJoined}
<div class="field-checkbox-group">

View file

@ -7,7 +7,16 @@
*/
/* Input Text */
/**
* Forms
*/
form p {
margin-bottom: 20px;
}
/**
* Inputs
*/
textarea,
select,
input[type="password"],
@ -35,55 +44,82 @@ input[type="text"] {
line-height: 18px;
}
/* Checkboxes */
input[type="checkbox"],
.input-checkbox {
position: relative;
top: 1px;
margin: 0 2px 0 1px;
}
/* Textarea */
textarea { line-height: 1.4em; }
/* Select */
select { padding: 4px; }
select[multiple] { height: auto; min-height: 150px; }
select {
padding: 4px;
}
select[multiple] {
height: auto;
min-height: 150px;
}
/**
* Fieldset
*/
fieldset {
margin-bottom: 30px;
padding-top: 20px;
border: none;
padding: 20px 0 0;
border-top: 1px solid #eaeaea;
}
fieldset legend {
color: #000;
font-size: 18px;
padding-right: 10px;
}
/* Fieldset */
fieldset { margin-bottom: 30px; padding-top: 20px; border-top: 1px solid #eaeaea; }
fieldset legend { color: #000; font-size: 18px; padding-right: 10px; }
.fieldset {
margin-bottom: 20px;
background: #fafafa;
}
.fieldset-header {
padding: 15px;
}
.fieldset-body, .fieldset-footer {
padding: 0 15px 15px;
}
.fieldset-title {
font-size: 20px;
line-height: 1em;
margin-bottom: 0;
}
.fieldset-help {
color: #aaa;
font-size: 13px;
margin-top: 15px;
}
.fieldset { margin-bottom: 20px; background: #fafafa; }
.fieldset-header { padding: 15px; }
.fieldset-body,
.fieldset-footer { padding: 0 15px 15px; }
.fieldset-title { font-size: 20px; line-height: 1em; margin-bottom: 0; }
.note.fieldset-note { font-size: 13px; margin-top: 15px; }
form p { margin-bottom: 20px; }
form .icon-question-sign { cursor: help; }
/* Note */
.note { display: block; margin-top: 3px; font-size: 12px; color: #aaa; }
.note.note-header { margin-bottom: 20px; }
.captcha-image { vertical-align: top; }
/* Placeholder */
/**
* Placeholder
*/
:-moz-placeholder { color: #afafaf; }
::-moz-placeholder { color: #afafaf; opacity: 1; }
::-webkit-input-placeholder { color: #afafaf; }
:-ms-input-placeholder { color: #afafaf; }
.placeholder { color: #afafaf; } /* Old IE */
/**
* Input file replacer
*/
.form-input-file {
position: relative;
overflow: hidden;
cursor: pointer;
display: block;
}
.form-input-file input[type=file] {
position: absolute;
top: 0;
left: -200%;
}
/* Validate */
/**
* Validation
*/
.parsley-error-list {
background: #ffe4e4;
color: #ff0000;
@ -93,9 +129,4 @@ form .icon-question-sign { cursor: help; }
.parsley-validated.parsley-error {
border-color: #FF9B9B;
background: #ffe4e4;
}
/* Input File Replacer */
.form-input-file { position: relative; overflow: hidden; cursor: pointer; display: block; }
.form-input-file input[type=file] { position: absolute; top: 0; left: -200%; }
}

View file

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

View file

@ -1,7 +1,7 @@
/**
* Список с информацией
*/
.info-list { margin-bottom: 20px; }
.info-list { margin-bottom: 20px; list-style: none; padding: 0; }
.info-list:last-child { margin-bottom: 0; }
.info-list-item { margin-bottom: 5px; overflow: hidden; }
.info-list-item:last-child { margin-bottom: 0; }

View file

@ -24,8 +24,6 @@
"nprogress": "nprogress/nprogress.js",
"fotorama": "fotorama/fotorama.js",
"highlight": "highlight/highlight.pack.js",
"parsley": "parsley/parsley.js",
"messages.ru": "parsley/i18n/messages.ru.js"
},
@ -36,7 +34,6 @@
"jquery.notifier": "notifier/jquery.notifier.css",
"fotorama": "fotorama/fotorama.css",
"nprogress": "nprogress/nprogress.css",
"highlight": "highlight/styles/googlecode.css",
"colorbox": "colorbox/colorbox.css"
}
}

View file

@ -4,13 +4,16 @@
{extends 'components/modal/modal.tpl'}
{block 'modal_id'}{$smarty.local.id}{/block}
{block 'modal_class'}modal--media js-modal-media{/block}
{block 'modal_title'}{lang name='media.title'}{/block}
{block 'modal_attributes'}data-modal-center="false"{/block}
{block 'modal_options' append}
{$mods = "$mods media"}
{$classes = "$classes js-modal-media"}
{$title = {lang name='media.title'}}
{$attributes = array_merge( $attributes|default:[], [ 'data-modal-center' => 'false' ] )}
{/block}
{block 'modal_content_after'}
{include 'components/media/media-content.tpl'}
{/block}
{* Убираем подвал *}
{block 'modal_footer'}{/block}

View file

@ -1,13 +1,11 @@
/**
* Создать
*
* @template modals/modal.write.tpl
*/
.modal.modal-write {
width: 500px;
.modal.modal--create {
max-width: 525px;
}
.modal.modal-write .modal-content {
.modal.modal--create .modal-content {
padding: 20px 10px 0;
}

View file

@ -4,9 +4,12 @@
{extends 'components/modal/modal.tpl'}
{block 'modal_id'}modal-write{/block}
{block 'modal_class'}modal-write js-modal-default{/block}
{block 'modal_title'}{lang 'modal_create.title'}{/block}
{block 'modal_options' append}
{$id = 'modal-write'}
{$mods = "$mods create"}
{$classes = "$classes js-modal-default"}
{$title = {lang name='modal_create.title'}}
{/block}
{block 'modal_content'}
{function modal_create_item}

View file

@ -2,7 +2,7 @@
* Modals
*
* @module modal
*
*
* @license GNU General Public License, version 2
* @copyright 2013 OOO "ЛС-СОФТ" {@link http://livestreetcms.com}
* @author Denis Shakhov <denis.shakhov@gmail.com>
@ -19,110 +19,123 @@
color: #333;
border: 1px solid #666;
background-color: #fff;
z-index: 1000;
-webkit-box-shadow: 0 0 15px rgba(0,0,0,.5);
-moz-box-shadow: 0 0 15px rgba(0,0,0,.5);
box-shadow: 0 0 15px rgba(0,0,0,.5);
z-index: 1000;
-webkit-box-shadow: 0 0 15px rgba(0,0,0,.5);
-moz-box-shadow: 0 0 15px rgba(0,0,0,.5);
box-shadow: 0 0 15px rgba(0,0,0,.5);
}
/* Close button */
.modal .modal-close:before { display: block; content: "×"; }
.modal .modal-close {
position: absolute;
top: 50%;
right: 15px;
margin-top: -13px;
font-size: 26px;
line-height: 1em;
color: #000;
opacity: .3;
filter: alpha(opacity=30);
cursor: pointer;
position: absolute;
top: 17px;
right: 15px;
padding: 0;
line-height: 1em;
color: #000;
opacity: .3;
filter: alpha(opacity=30);
cursor: pointer;
border: none;
background-color: transparent;
}
.modal .modal-close:hover {
opacity: .7;
filter: alpha(opacity=70);
opacity: .7;
filter: alpha(opacity=70);
}
/* Header */
.modal-header {
background: #fafafa;
border-bottom: 1px solid #eee;
padding: 15px 20px 13px;
position: relative;
min-height: 10px;
background: #fafafa;
border-bottom: 1px solid #eee;
padding: 15px 20px 13px;
position: relative;
min-height: 10px;
}
.modal-title {
font-size: 17px;
margin: 0 30px 0 0;
color: #000;
}
.modal-title { font-size: 17px; margin: 0 30px 0 0; color: #000; }
/* Nav */
.modal > .nav { padding: 20px 20px 0; }
.modal > .nav {
padding: 20px 20px 0;
}
/* Content */
.modal .modal-content { padding: 20px; }
.modal .modal-body {
padding: 20px;
}
/* Lock */
.modal .modal-lock {
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
background: #000;
opacity: .2;
filter: alpha(opacity=20);
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
background: #000;
opacity: .2;
filter: alpha(opacity=20);
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
/* Footer */
.modal .modal-footer { background: #fafafa; border-top: 1px solid #eee; padding: 15px 20px; text-align: right; }
.modal .modal-footer {
background: #fafafa;
border-top: 1px solid #eee;
padding: 15px 20px;
text-align: right;
}
/* Loader */
.modal-loader {
display: none;
width: 100px;
height: 50px;
margin: -25px 0 0 -50px;
position: fixed;
top: 50%;
left: 50%;
border-radius: 5px;
background-color: #000;
background-color: rgba(0,0,0,.8);
z-index: 1001;
display: none;
width: 100px;
height: 50px;
margin: -25px 0 0 -50px;
position: fixed;
top: 50%;
left: 50%;
border-radius: 5px;
background-color: #000;
background-color: rgba(0,0,0,.8);
z-index: 1001;
}
.modal-loader.modal-loader-text {
background-image: none;
color: #eee;
text-align: center;
font-size: 13px;
line-height: 1.2em;
padding: 15px;
width: 300px;
margin-left: -150px;
height: auto;
background-image: none;
color: #eee;
text-align: center;
font-size: 13px;
line-height: 1.2em;
padding: 15px;
width: 300px;
margin-left: -150px;
height: auto;
}
/* Overlay */
.modal-overlay {
display: none;
position: fixed;
top: 0;
bottom: 0;
left: 0;
right: 0;
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAA9JREFUeNpiYmBgaAAIMAAAjwCD5Hc2/AAAAABJRU5ErkJggg==);;
background: rgba(0,0,0,.5);
z-index: 999;
overflow: auto;
padding: 30px;
display: none;
position: fixed;
top: 0;
bottom: 0;
left: 0;
right: 0;
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAA9JREFUeNpiYmBgaAAIMAAAjwCD5Hc2/AAAAABJRU5ErkJggg==);;
background: rgba(0,0,0,.5);
z-index: 999;
overflow: auto;
padding: 30px;
}

View file

@ -2,30 +2,45 @@
* Базовый шаблон модальных окон
*}
{block 'modal_options'}{/block}
{$component = 'modal'}
{block 'modal_options'}
{$id = $smarty.local.id}
{$title = $smarty.local.title}
{$content = $smarty.local.content}
{$classes = $smarty.local.classes}
{$mods = $smarty.local.mods}
{/block}
<div class="modal {block 'modal_class'}{/block}" id="{block 'modal_id'}{/block}" data-type="modal" {block 'modal_attributes'}{/block}>
{* Header *}
{block 'modal_title' hide}
<div class="{$component} {cmods name=$component mods=$mods} {$classes}" {cattr list=$attributes}
id="{$id}"
data-type="modal">
{* Шапка *}
{block 'modal_title'}
<header class="modal-header">
<h3 class="modal-title">{$smarty.block.child}</h3>
<span class="modal-close" data-type="modal-close"></span>
{* Заголовок *}
<h3 class="modal-title">{$title}</h3>
{* Кнопка закрытия *}
<button class="modal-close" data-type="modal-close">
{component 'icon' icon='remove' attributes=[ 'aria-hidden' => 'true' ]}
</button>
</header>
{/block}
{block 'modal_header_after'}{/block}
{* Content *}
{block 'modal_content' hide}
<div class="modal-content">
{$smarty.block.child}
{* Содержимое *}
{block 'modal_content'}
<div class="modal-body">
{$content}{$smarty.block.child}
</div>
{/block}
{block 'modal_content_after'}{/block}
{* Footer *}
{* Подвал *}
{block 'modal_footer'}
<div class="modal-footer">
{block 'modal_footer_begin'}{/block}
@ -35,6 +50,4 @@
{/block}
</div>
{/block}
{block 'modal_footer_after'}{/block}
</div>

View file

@ -7,7 +7,7 @@
*/
.nav { }
.nav { list-style: none; padding: 0; }
.nav > li { float: left; position: relative; }
.nav > li > a { float: left; padding: 10px 15px; text-decoration: none; }

View file

@ -1,29 +1,24 @@
{**
* Создание опроса
*
* @styles css/modals.css
*}
{extends 'components/modal/modal.tpl'}
{block 'modal_id'}modal-poll-create{/block}
{block 'modal_class'}modal-poll-create js-modal-default{/block}
{block 'modal_title'}
{if $oPoll}
{$aLang.poll.form.title.edit}
{else}
{$aLang.poll.form.title.add}
{/if}
{block 'modal_options' append}
{$id = "modal-poll-create"}
{$mods = "$mods poll-create"}
{$classes = "$classes js-modal-media"}
{$title = ( $oPoll ) ? {lang 'poll.form.title.edit'} : {lang 'poll.form.title.add'}}
{/block}
{block 'modal_content'}
{include 'components/poll/poll.form.tpl'}
{include 'components/poll/poll.form.tpl'}
{/block}
{block 'modal_footer_begin'}
{include 'components/button/button.tpl'
form = 'js-poll-form'
text = ($oPoll) ? $aLang.common.save : $aLang.common.add
classes = 'js-poll-form-submit'
mods = 'primary'}
{include 'components/button/button.tpl'
form = 'js-poll-form'
text = ($oPoll) ? $aLang.common.save : $aLang.common.add
classes = 'js-poll-form-submit'
mods = 'primary'}
{/block}

View file

@ -1,17 +1,16 @@
{**
* Модальное окно с предпросмотром видео для свойства с типом video
*
* @styles css/modals.css
*}
{extends 'components/modal/modal.tpl'}
{block 'modal_id'}modal-property-type-video-{$value->getId()}{/block}
{block 'modal_class'}modal-property js-modal-default{/block}
{block 'modal_title'}Предпросмотр видео{/block}
{block 'modal_options' append}
{$id = "modal-property-type-video-{$value->getId()}"}
{$mods = "$mods property property-video"}
{$classes = "$classes js-modal-media"}
{$title = 'Предпросмотр видео'}
{/block}
{block 'modal_content'}
{$value->getValueTypeObject()->getVideoCodeFrame()}
{/block}
{block 'modal_footer'}{/block}
{/block}

View file

@ -6,9 +6,12 @@
{extends 'components/modal/modal.tpl'}
{block 'modal_id'}modal-complaint-user{/block}
{block 'modal_class'}modal-complaint-user js-modal-default{/block}
{block 'modal_title'}{lang 'report.form.title'}{/block}
{block 'modal_options' append}
{$id = "modal-complaint-user"}
{$mods = "$mods report"}
{$classes = "$classes js-modal-default"}
{$title = {lang 'report.form.title'}}
{/block}
{block 'modal_content'}
<form action="" method="post" id="form-complaint-user">

View file

@ -1,30 +1,75 @@
/**
* Таблицы
* Стили частично позаимствованы у бутстрапа
*
* @license GNU General Public License, version 2
* @copyright 2013 OOO "ЛС-СОФТ" {@link http://livestreetcms.com}
* @author Denis Shakhov <denis.shakhov@gmail.com>
*
* TODO: Responsive tables
*/
caption {
padding-top: @table-cell-padding;
padding-bottom: @table-cell-padding;
color: @text-muted;
text-align: left;
}
th {
text-align: left;
}
.table {
width: 100%;
max-width: 100%;
margin-bottom: 15px;
}
.table td, .table th {
padding: 14px;
vertical-align: top;
line-height: 18px;
border-top: 1px solid #eee;
}
.table th {
text-align: left;
background: #fafafa;
vertical-align: bottom;
border-bottom: 2px solid #eee;
}
.table td, .table th {
border-bottom: 1px solid #eee;
padding: 15px;
.table caption + thead th,
.table colgroup + thead th,
.table thead:first-child tr:first-child th,
.table thead:first-child tr:first-child td {
border-top: 0;
}
.table tr.active td {
background: #F6F6FA;
}
.table a.asc:after {
.table .table-sort-asc:after {
content: "▲";
}
.table a.desc:after {
.table .table-sort-desc:after {
content: "▼";
}
/**
* Condensed
*/
.table--condensed td,
.table--condensed th {
padding: 7px;
}
/**
* Striped
*/
.table--striped tbody tr:nth-child(odd) td {
background: #fafafa;
}
/**
* Hover
*/
.table--hover tbody tr:hover td {
background: #f7f7f7;
}

View file

@ -0,0 +1,116 @@
{**
* Таблица
*}
{test_heading text='Таблица'}
{capture 'test_example_content'}
<table class="table">
<thead>
<tr>
<th>#</th>
<th>First Name</th>
<th>Last Name</th>
</tr>
</thead>
<tbody>
{section name='table_rows' loop=5}<tr>
<td>{$smarty.section.table_rows.index + 1}</td>
<td>First Name</td>
<td>Last Name</td>
</tr>
{/section}
</tbody>
</table>
{/capture}
{test_example content=$smarty.capture.test_example_content}
{**
* Компактная таблица
*}
{test_heading text='Компактная таблица'}
<p>Для компактных таблиц используется модификатор <code>condensed</code></p>
{capture 'test_example_content'}
<table class="table {cmods name='table' mods='condensed'}">
<thead>
<tr>
<th>#</th>
<th>First Name</th>
<th>Last Name</th>
</tr>
</thead>
<tbody>
{section name='table_rows' loop=5}<tr>
<td>{$smarty.section.table_rows.index + 1}</td>
<td>First Name</td>
<td>Last Name</td>
</tr>
{/section}
</tbody>
</table>
{/capture}
{test_example content=$smarty.capture.test_example_content showCode=false}
{**
* Изменение фона рядов при наведении
*}
{test_heading text='Изменение фона рядов при наведении'}
<p>Для таблиц с рядами, которые изменяют фон при наведении, используется модификатор <code>hover</code></p>
{capture 'test_example_content'}
<table class="table {cmods name='table' mods='hover'}">
<thead>
<tr>
<th>#</th>
<th>First Name</th>
<th>Last Name</th>
</tr>
</thead>
<tbody>
{section name='table_rows' loop=5}<tr>
<td>{$smarty.section.table_rows.index + 1}</td>
<td>First Name</td>
<td>Last Name</td>
</tr>
{/section}
</tbody>
</table>
{/capture}
{test_example content=$smarty.capture.test_example_content showCode=false}
{**
* Зебра
*}
{test_heading text='Зебра'}
<p>Для зебры используется модификатор <code>striped</code></p>
{capture 'test_example_content'}
<table class="table {cmods name='table' mods='striped'}">
<thead>
<tr>
<th>#</th>
<th>First Name</th>
<th>Last Name</th>
</tr>
</thead>
<tbody>
{section name='table_rows' loop=5}<tr>
<td>{$smarty.section.table_rows.index + 1}</td>
<td>First Name</td>
<td>Last Name</td>
</tr>
{/section}
</tbody>
</table>
{/capture}
{test_example content=$smarty.capture.test_example_content showCode=false}

View file

@ -8,11 +8,13 @@
.tab-list {
padding: 0;
margin-bottom: 20px;
}
/* Tab */
.tab {
list-style: none;
float: left;
padding: 7px 12px;
margin-right: 2px;

View file

@ -4,9 +4,12 @@
{extends 'components/modal/modal.tpl'}
{block 'modal_id'}favourite-form-tags{/block}
{block 'modal_class'}modal-favourite-tags js-modal-default{/block}
{block 'modal_title'}{lang 'favourite_tags.title'}{/block}
{block 'modal_options' append}
{$id = "favourite-form-tags"}
{$mods = "$mods favourite-tags"}
{$classes = "$classes js-modal-default"}
{$title = {lang 'favourite_tags.title'}}
{/block}
{block 'modal_content'}
<form id="js-favourite-form">

View file

@ -15,7 +15,7 @@
active = $activeTag
assign = tags}
{include 'components/accordion/accordion.tpl' classes='js-tags-favourite-accordion' items=[[
{component 'accordion' classes='js-tags-favourite-accordion' items=[[
'title' => "{lang 'favourite_tags.title'} {if $activeTag}({$activeTag}){/if}",
'content' => $tags
]]}

View file

@ -54,7 +54,7 @@
</form>
{/capture}
{include 'components/accordion/accordion.tpl' classes='js-talk-search-form' items=[[
{component 'accordion' classes='js-talk-search-form' items=[[
'title' => {lang 'talk.search.title'},
'content' => $smarty.capture.talk_search_form
]]}

View file

@ -4,10 +4,10 @@
{extends 'components/modal/modal.tpl'}
{block 'modal_id'}{$smarty.local.id}{/block}
{block 'modal_class'}modal--uploader {$smarty.local.classes}{/block}
{block 'modal_title'}{$smarty.local.title}{/block}
{block 'modal_attributes'}data-modal-center="false"{/block}
{block 'modal_options' append}
{$mods = "$mods uploader"}
{$attributes = array_merge( $attributes|default:[], [ 'data-modal-center' => 'false' ] )}
{/block}
{block 'modal_content'}
{include 'components/uploader/uploader.tpl' classes='js-uploader-modal'}

View file

@ -1,15 +1,13 @@
{**
* Добавление в друзья
*
* @styles css/modals.css
*}
{extends 'components/modal/modal.tpl'}
{block 'modal_id'}modal-add-friend{/block}
{block 'modal_class'}js-modal-default{/block}
{block 'modal_title'}
{lang name='user.friends.form.title'}
{block 'modal_options' append}
{$id = "modal-add-friend"}
{$classes = "$classes js-modal-default"}
{$title = {lang 'user.friends.form.title'}}
{/block}
{block 'modal_content'}

View file

@ -4,19 +4,15 @@
* @param array $users
* @param boolean $selectable
* @param string $target
* @param string $titleText
*}
{extends 'components/modal/modal.tpl'}
{block 'modal_id'}modal-users-select{/block}
{block 'modal_class'}
modal-users-select js-modal-default
{/block}
{block 'modal_title'}
{$smarty.local.titleText|default:$aLang.user.users}
{block 'modal_options' append}
{$id = "modal-users-select"}
{$mods = "$mods users-select"}
{$classes = "$classes js-modal-default"}
{$title = $title|default:$aLang.user.users|escape}
{/block}
{block 'modal_content'}

View file

@ -22,7 +22,7 @@
<fieldset>
<legend>{lang name='user.settings.account.password'}</legend>
<small class="note mb-20">{lang name='user.settings.account.password_note'}</small>
<p class="text-info">{lang name='user.settings.account.password_note'}</p>
{* Текущий пароль *}
{include 'components/field/field.text.tpl'

View file

@ -31,6 +31,7 @@
/* Лого */
.userbar-logo {
float: left;
font-size: 28px;
line-height: 54px;
margin: 0 25px 0 0;
}

View file

@ -78,18 +78,18 @@
{* Воздержаться *}
{if $smarty.local.useAbstain}
<div class="{$component}-item {$component}-item-abstain js-{$component}-item" {if ! $vote}title="{$aLang.$component.abstain}"{/if} data-vote-value="0">
{include 'components/icons/icon.tpl' icon='eye-open' classes=$iconMod}
{component 'icon' icon='eye-open' classes=$iconMod}
</div>
{/if}
{* Нравится *}
<div class="{$component}-item {$component}-item-up js-{$component}-item" {if ! $vote}title="{$aLang.$component.up}"{/if} data-vote-value="1">
{include 'components/icons/icon.tpl' icon='plus' classes=$iconMod}
{component 'icon' icon='plus' classes=$iconMod}
</div>
{* Не нравится *}
<div class="{$component}-item {$component}-item-down js-{$component}-item" {if ! $vote}title="{$aLang.$component.down}"{/if} data-vote-value="-1">
{include 'components/icons/icon.tpl' icon='minus' classes=$iconMod}
{component 'icon' icon='minus' classes=$iconMod}
</div>
</div>
</div>

View file

@ -18,7 +18,7 @@ $config['view']['grid']['fluid_max_width'] = '1000px';
$config['view']['grid']['fixed_width'] = '1000px';
// Показывать баннер с лого и описанием или нет
$config['view']['layout_show_banner'] = false;
$config['view']['layout_show_banner'] = true;
// Подключение скриптов шаблона
$config['head']['default']['js'] = array_merge(Config::Get('head.default.js'), array(