diff --git a/templates/skin/developer/blocks/block.blogInfo.tpl b/templates/skin/developer/blocks/block.blogInfo.tpl index 8d00a2aa..7378b180 100644 --- a/templates/skin/developer/blocks/block.blogInfo.tpl +++ b/templates/skin/developer/blocks/block.blogInfo.tpl @@ -4,7 +4,7 @@
-

+

diff --git a/templates/skin/developer/css/blocks.css b/templates/skin/developer/css/blocks.css index 7b3c6428..7e05e6a7 100644 --- a/templates/skin/developer/css/blocks.css +++ b/templates/skin/developer/css/blocks.css @@ -5,6 +5,7 @@ .block { background: #fafafa; margin-bottom: 30px; border-radius: 3px; } .block:last-child { margin-bottom: 0; } .sidebar-left .block { margin-bottom: 10px; } +.block .text { font-size: 13px; line-height: 18px; } .block .block-header { padding: 13px 20px; background: #f5f5f5; border-top: 1px solid #eee; position: relative; } .block .block-header h3 { font-size: 16px; line-height: 1em; font-weight: normal; } diff --git a/templates/skin/developer/css/common.css b/templates/skin/developer/css/common.css index fec00154..57d79aba 100644 --- a/templates/skin/developer/css/common.css +++ b/templates/skin/developer/css/common.css @@ -140,8 +140,10 @@ /* Хелперы ---------------------------------------------------- */ -.mt-10 { margin-bottom: 10px !important; } -.mt-20 { margin-bottom: 20px !important; } +.mt-10 { margin-top: 10px !important; } +.mt-15 { margin-top: 15px !important; } +.mt-20 { margin-top: 20px !important; } +.mt-30 { margin-top: 30px !important; } .mb-10 { margin-bottom: 10px !important; } .mb-15 { margin-bottom: 15px !important; } @@ -180,5 +182,14 @@ .loader { background: #fafafa url(../images/loader.gif) 50% 50% no-repeat; } .user, .ls-user { font-weight: bold; color: #333; } -.ls-user:before { content: ''; display: inline-block; width: 14px; height: 14px; margin-right: 3px; background: url(../images/icons.png) -168px 0 no-repeat; vertical-align: middle; } +.ls-user { display: inline-block; } +.ls-user:before { + content: ''; + display: inline-block; + width: 14px; + height: 14px; + margin-right: 3px; + background: url(../images/icons.png) -168px 0 no-repeat; + vertical-align: middle; +} .user.inactive { color: #aaa; } \ No newline at end of file diff --git a/templates/skin/developer/css/grid.css b/templates/skin/developer/css/grid.css index f6808276..8abe09a2 100644 --- a/templates/skin/developer/css/grid.css +++ b/templates/skin/developer/css/grid.css @@ -2,18 +2,18 @@ СЕТКА -------------------------------------------- */ -#container { margin: 0 auto; margin-bottom: 20px; } -#header { padding: 50px 0; position: relative; } -#nav { margin-bottom: 15px; overflow: hidden; } -#wrapper { overflow: hidden; zoom: 1; padding: 30px; background: #fff; border-bottom: 1px solid #eee; -webkit-box-shadow: 0 0 3px rgba(0,0,0,.1); box-shadow: 0 0 3px rgba(0,0,0,.1); } -#content { float: left; width: 61%; margin-right: 4%; background: #fff; position: relative; } -#sidebar { float: left; width: 35%; } -#footer { overflow: hidden; zoom: 1; margin-bottom: 20px; padding: 20px 0 50px; color: #777; } +#container { margin: 0 auto; margin-bottom: 20px; } +#header { padding: 50px 0; position: relative; } +#nav { margin-bottom: 15px; overflow: hidden; } +#wrapper { overflow: hidden; zoom: 1; padding: 30px; background: #fff; border-bottom: 1px solid #eee; -webkit-box-shadow: 0 0 3px rgba(0,0,0,.1); box-shadow: 0 0 3px rgba(0,0,0,.1); } +#content-wrapper { float: left; width: 100%; margin-right: -330px; } +#content { margin-right: 330px; background: #fff; position: relative; } +#sidebar { float: right; width: 300px; } +#footer { overflow: hidden; zoom: 1; margin-bottom: 20px; padding: 20px 0 50px; color: #777; } #content.content-full-width { width: 100%; margin-right: 0; } -#content.content-right { margin-right: 0; float: none; margin-left: 311px; width: auto; } -#sidebar.sidebar-left { float: left; width: 250px; padding-right: 30px; border-right: 1px solid #eee; margin-right: 30px; } - - +#content-wrapper.content-right { float: right; margin-right: 0; margin-left: -311px; } +#content-wrapper.content-right #content { margin-left: 311px; margin-right: 0; width: auto; } +#sidebar.sidebar-left { float: left; width: 250px; padding-right: 30px; border-right: 1px solid #eee; margin-right: 30px; } diff --git a/templates/skin/developer/footer.tpl b/templates/skin/developer/footer.tpl index 2ea01dc3..2c894559 100644 --- a/templates/skin/developer/footer.tpl +++ b/templates/skin/developer/footer.tpl @@ -1,5 +1,6 @@ - {hook run='content_end'} - + {hook run='content_end'} + + {if !$noSidebar && $sidebarPosition != 'left'} diff --git a/templates/skin/developer/header.tpl b/templates/skin/developer/header.tpl index c8fd063a..e76d3799 100644 --- a/templates/skin/developer/header.tpl +++ b/templates/skin/developer/header.tpl @@ -127,12 +127,12 @@ {include file='sidebar.tpl'} {/if} -
- - {include file='nav_content.tpl'} - {include file='system_message.tpl'} - - {hook run='content_begin'} \ No newline at end of file +
+
+ + {include file='nav_content.tpl'} + {include file='system_message.tpl'} + + {hook run='content_begin'} \ No newline at end of file diff --git a/templates/skin/synio/blocks/block.blogInfo.tpl b/templates/skin/synio/blocks/block.blogInfo.tpl index 8d00a2aa..7378b180 100644 --- a/templates/skin/synio/blocks/block.blogInfo.tpl +++ b/templates/skin/synio/blocks/block.blogInfo.tpl @@ -4,7 +4,7 @@
-

+

diff --git a/templates/skin/synio/css/common.css b/templates/skin/synio/css/common.css index 01fb26b8..167d8a8e 100644 --- a/templates/skin/synio/css/common.css +++ b/templates/skin/synio/css/common.css @@ -296,8 +296,10 @@ /* Хелперы ---------------------------------------------------- */ -.mt-10 { margin-bottom: 10px !important; } -.mt-20 { margin-bottom: 20px !important; } +.mt-10 { margin-top: 10px !important; } +.mt-15 { margin-top: 15px !important; } +.mt-20 { margin-top: 20px !important; } +.mt-30 { margin-top: 30px !important; } .mb-10 { margin-bottom: 10px !important; } .mb-15 { margin-bottom: 15px !important; } @@ -341,7 +343,18 @@ .loader { background: #fafafa url(../images/loader.gif) 50% 50% no-repeat; } .user, .ls-user { font-weight: bold; color: #333; } -.user:before, .ls-user:before { content: ''; display: inline-block; width: 12px; height: 12px; margin-right: 4px; background: url(../images/icons-synio.png) -165px -75px no-repeat; vertical-align: middle; position: relative; top: -1px; } +.ls-user { display: inline-block; } +.user:before, .ls-user:before { + content: ''; + display: inline-block; + width: 12px; + height: 12px; + margin-right: 4px; + background: url(../images/icons-synio.png) -165px -75px no-repeat; + vertical-align: middle; + position: relative; + top: -1px; +} .user .icon-user { margin-right: 3px; } .username.inactive, .user.inactive { color: #aaa !important; } diff --git a/templates/skin/synio/css/grid.css b/templates/skin/synio/css/grid.css index 5c8f04fe..d12622dd 100644 --- a/templates/skin/synio/css/grid.css +++ b/templates/skin/synio/css/grid.css @@ -22,14 +22,16 @@ background: -ms-linear-gradient(top, #fdfdfd 0%,#f6f8f9 100%); background: linear-gradient(top, #fdfdfd 0%,#f6f8f9 100%); } -#wrapper { overflow: hidden; zoom: 1; padding: 20px 16px 20px 27px; margin-bottom: 60px; background: #fff url(../images/sidebar-border.png) 100% 0px repeat-y; border-bottom: 1px solid #eee; -webkit-box-shadow: 0 0 5px rgba(0,0,0,.05); box-shadow: 0 0 5px rgba(0,0,0,.05); border-radius: 10px; } -#content { min-height: 1px; margin-right: 295px; background: #fff; position: relative; } -#sidebar { float: right; width: 240px; } -#footer { overflow: hidden; zoom: 1; margin-bottom: 20px; padding: 0 0 50px 30px; font-size: 11px; } +#wrapper { overflow: hidden; zoom: 1; padding: 20px 16px 20px 27px; margin-bottom: 60px; background: #fff url(../images/sidebar-border.png) 100% 0px repeat-y; border-bottom: 1px solid #eee; -webkit-box-shadow: 0 0 5px rgba(0,0,0,.05); box-shadow: 0 0 5px rgba(0,0,0,.05); border-radius: 10px; } +#content-wrapper { float: left; width: 100%; margin-right: -295px; } +#content { margin-right: 295px; background: #fff; position: relative; } +#sidebar { float: right; width: 240px; } +#footer { overflow: hidden; zoom: 1; margin-bottom: 20px; padding: 0 0 50px 30px; font-size: 11px; } -#wrapper.no-sidebar { background-image: none; } -#wrapper.no-sidebar #content { width: 100%; margin-right: 0; } +#wrapper.no-sidebar { background-image: none; } +#wrapper.no-sidebar #content { width: 100%; margin-right: 0; } +#wrapper.no-sidebar #content-wrapper { margin-right: 0; } -#container.toolbar-margin { padding: 0; } -#container.toolbar-margin #wrapper { margin-right: 48px; } +#container.toolbar-margin { padding: 0; } +#container.toolbar-margin #wrapper { margin-right: 48px; } diff --git a/templates/skin/synio/footer.tpl b/templates/skin/synio/footer.tpl index 716aa460..e19b90d6 100644 --- a/templates/skin/synio/footer.tpl +++ b/templates/skin/synio/footer.tpl @@ -1,5 +1,6 @@ - {hook run='content_end'} -
+ {hook run='content_end'} +
+
diff --git a/templates/skin/synio/header.tpl b/templates/skin/synio/header.tpl index 6a36592e..3c45e9e1 100644 --- a/templates/skin/synio/header.tpl +++ b/templates/skin/synio/header.tpl @@ -130,8 +130,9 @@ {include file='sidebar.tpl'} {/if} -
- {include file='nav_content.tpl'} - {include file='system_message.tpl'} - - {hook run='content_begin'} \ No newline at end of file +
+
+ {include file='nav_content.tpl'} + {include file='system_message.tpl'} + + {hook run='content_begin'} \ No newline at end of file