mirror of
https://github.com/Oreolek/ifhub.club.git
synced 2024-05-01 08:29:26 +03:00
Fix grid
This commit is contained in:
parent
55caada9bb
commit
aca24fff19
|
@ -23,15 +23,16 @@ a:hover { color: #f00; }
|
|||
/**
|
||||
* Grid
|
||||
*/
|
||||
#container { width: 900px; margin: 0 auto 20px; }
|
||||
#header { margin: 20px 0 40px; }
|
||||
#nav { margin-bottom: 20px; }
|
||||
#wrapper { margin-bottom: 20px; }
|
||||
#content { padding: 20px; float: left; width: 540px; margin-right: 20px; background: #f7f7f7; }
|
||||
#sidebar { float: left; width: 300px; }
|
||||
#footer { padding: 10px; background: #f7f7f7; }
|
||||
#container { margin: 0 auto 20px; }
|
||||
#header { margin: 20px 0 40px; }
|
||||
#nav { margin-bottom: 20px; }
|
||||
#wrapper { margin-bottom: 20px; }
|
||||
#content-wrapper { float: left; width: 100%; margin-right: -330px; }
|
||||
#content { margin-right: 330px; padding: 20px; background: #f7f7f7; }
|
||||
#sidebar { float: right; width: 300px; }
|
||||
#footer { padding: 10px; background: #f7f7f7; }
|
||||
|
||||
#container.no-sidebar #content { width: 880px; }
|
||||
#container.no-sidebar #content { width: 100%; margin-right: 0; }
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
@ -114,33 +114,35 @@
|
|||
{* Вспомогательный контейнер-обертка *}
|
||||
<div id="wrapper" class="clearfix {hook run='wrapper_class'}">
|
||||
{* Контент *}
|
||||
<div id="content" role="main">
|
||||
<div id="content-wrapper" role="main">
|
||||
<div id="content" role="main">
|
||||
|
||||
{hook run='content_begin'}
|
||||
{block name='layout_content_begin'}{/block}
|
||||
{hook run='content_begin'}
|
||||
{block name='layout_content_begin'}{/block}
|
||||
|
||||
{* Навигация *}
|
||||
{if $sNav or $sNavContent}
|
||||
<div class="nav-group">
|
||||
{if $sNav}
|
||||
{if in_array($sNav, $aMenuContainers)}
|
||||
{$aMenuFetch.$sNav}
|
||||
{* Навигация *}
|
||||
{if $sNav or $sNavContent}
|
||||
<div class="nav-group">
|
||||
{if $sNav}
|
||||
{if in_array($sNav, $aMenuContainers)}
|
||||
{$aMenuFetch.$sNav}
|
||||
{else}
|
||||
{include file="navs/nav.$sNav.tpl"}
|
||||
{/if}
|
||||
{else}
|
||||
{include file="navs/nav.$sNav.tpl"}
|
||||
{include file="navs/nav.$sNavContent.content.tpl"}
|
||||
{/if}
|
||||
{else}
|
||||
{include file="navs/nav.$sNavContent.content.tpl"}
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
{* Системные сообщения *}
|
||||
{include file='system_message.tpl'}
|
||||
{* Системные сообщения *}
|
||||
{include file='system_message.tpl'}
|
||||
|
||||
{block name='layout_content'}{/block}
|
||||
{block name='layout_content'}{/block}
|
||||
|
||||
{block name='layout_content_end'}{/block}
|
||||
{hook run='content_end'}
|
||||
{block name='layout_content_end'}{/block}
|
||||
{hook run='content_end'}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
|
|
@ -2,6 +2,22 @@
|
|||
|
||||
$config = array();
|
||||
|
||||
/**
|
||||
* Grid type:
|
||||
*
|
||||
* fluid - резина
|
||||
* fixed - фиксированная ширина
|
||||
*/
|
||||
$config['view']['grid']['type'] = 'fluid';
|
||||
|
||||
/* Fluid settings */
|
||||
$config['view']['grid']['fluid_min_width'] = 900;
|
||||
$config['view']['grid']['fluid_max_width'] = 1200;
|
||||
|
||||
/* Fixed settings */
|
||||
$config['view']['grid']['fixed_width'] = 1000;
|
||||
|
||||
|
||||
$config['head']['default']['js'] = Config::Get('head.default.js');
|
||||
$config['head']['default']['js'][] = '___path.static.skin___/js/init.js';
|
||||
|
||||
|
|
Loading…
Reference in a new issue