fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-02 01:52:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge #1530 XEDITON에서 로고 텍스트 표시 by ehii

Browse source 
* pr/1530:
  logo_text

Conflicts:
	layouts/xedition/css/layout.css
This commit is contained in:
Kijin Sung 2015-10-08 15:03:06 +09:00
commit 142a183daf
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
layouts/xedition/css/layout.css
View file

@ -134,6 +134,13 @@ a:hover, a:active, a:focus {
vertical-align: middle;
max-height: 40px;
}
.header > .logo-item a {
font-size: 24px;
color: #888;
}
.header > .logo-item a:hover {
color: #444;
}
/* Fixed Header */
.container.fixed_header {
padding-top: 100px

14
layouts/xedition/layout.html
View file

@ -184,16 +184,14 @@
<block cond="$_magazine_header && $layout_info->logo_img_magazine">
{@ $_logo_img = $layout_info->logo_img_magazine}
</block>
<block cond="$_onepage_header && $layout_info->logo_img_transparent">
{@ $_logo_img = $layout_info->logo_img_transparent}
</block>
<a href="<!--@if($layout_info->logo_url)-->{$layout_info->logo_url}<!--@else-->{getUrl('')}<!--@end-->">
<!--@if($_logo_img)-->
<!--@if($_magazine_header)-->
<img src="{$layout_info->logo_img_magazine}" alt="{$layout_info->logo_text}" />
<!--@else-->
<block cond="$_onepage_header && $layout_info->logo_img_transparent">
{@ $_logo_img = $layout_info->logo_img_transparent}
</block>
<img src="{$_logo_img}" data-logo="{$layout_info->logo_img}"|cond="$_onepage_header && $layout_info->logo_img_transparent" alt="{$layout_info->logo_text}" />
<!--@endif-->
<img src="{$_logo_img}" data-logo="{$layout_info->logo_img}"|cond="$_onepage_header && $layout_info->logo_img_transparent" alt="{$layout_info->logo_text}" />
<!--@elseif($layout_info->logo_text)-->
{$layout_info->logo_text}
<!--@else-->
{@ $_logo_img = 'logo.png'}
<block cond="$_magazine_header">{@ $_logo_img = 'm_logo.png'}</block>