fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 19:21:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:xpressengine/xe-core into develop

Browse source
This commit is contained in:
bnu 2015-04-07 14:22:24 +09:00
commit 801198bdba
5 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
layouts/xedition/css/welcome.css
View file

@ -14,10 +14,10 @@
/* section.xeicon */
.welcomeXE .xeicon{overflow:hidden;position:static;width:100%;margin:0;height:500px;background-image:url(../img/bg_stat.jpg);background-position:50% 0;background-attachment:fixed;background-repeat:no-repeat}
.welcomeXE .xeicon h1 {margin-top: 170px; font-size: 40px; color: #f6f6f6; text-align: center; letter-spacing: 1px; font-weight: 400; line-height: 1.2em; text-transform: uppercase; }
.welcomeXE .xeicon h1 {margin-top: 170px; font-size: 40px; color: #f6f6f6; text-align: center; letter-spacing: 3px; font-weight: 400; line-height: 1.2em; text-transform: uppercase; }
.welcomeXE .xeicon h1 a {color: #FFF; }
.welcomeXE .xeicon .button-area {text-align: center; }
.welcomeXE .xeicon .button-area .btn_item {font-size: 16px; }
.welcomeXE .xeicon .button-area .btn_item {font-size: 16px; letter-spacing: 2px;}
/* section.guide */
.welcomeXE .guide{height:640px;padding-top:80px}

8
layouts/xedition/css/xeicon.css
View file

@ -18,14 +18,14 @@
.XEicon p a:focus{color:#cda25a;border-bottom:1px solid #cda25a}
/* section .main_title */
.XEicon .main_title h1 {margin-bottom:47px;font-size:34px;font-weight:400;color:#cda25a;text-align:center;text-transform: uppercase}
.XEicon .main_title h1 {margin-bottom: 47px;font-size: 34px;font-weight: 600;color: #cda25a;text-align: center;font-family: Raleway,'나눔바른고딕',NanumBarunGothic,ng,'맑은 고딕','Malgun Gothic','돋움',Dotum,'애플 SD 산돌고딕 Neo','Apple SD Gothic Neo',AppleGothic,Helvetica,sans-serif;text-transform: uppercase;letter-spacing: 1px;}
.XEicon .main_title p {font-size:15px;line-height:28px;color:#444;text-align:center}
/* section .feature */
.XEicon .feature{height:518px;padding-top:120px;}
.XEicon .feature ul{padding-top:80px}
.XEicon .feature li{position:relative;float:left;width:314px;min-height:140px;padding:0 16px 0 70px;margin:0 0 30px 0}
.XEicon .feature h2{padding:7px 24px 13px 0;font-size:17px;font-weight:normal;line-height:23px;color:#333}
.XEicon .feature h2{padding:7px 24px 13px 0;font-size:17px;font-weight:600;line-height:23px;color:#333}
.XEicon .feature p{padding:0 24px 0 0;font-size:14px;line-height:26px;color:#888}
.XEicon .feature .ico{position:absolute;top:0;left:0;width:48px;height:48px;font-size:22px;text-align:center;line-height:50px;color:#555}
@ -35,7 +35,7 @@
.XEicon .get_started ul {margin-top:34px;}
.XEicon .get_started li {position:relative; float:left; width:286px; height:212px; margin-right:15px; border:1px solid #e8e8e8; background:#fff; text-align:center;}
.XEicon .get_started li:last-child {margin-right:0;}
.XEicon .get_started li h2 {padding:33px 0 19px; font-size:17px; font-weight: normal}
.XEicon .get_started li h2 {padding:33px 0 19px; font-size:17px; font-weight: 600}
.XEicon .get_started li p {padding: 0 37px; font-size:14px; line-height: 26px; color:#888;}
.XEicon .get_started li > a {position:absolute; display:block; bottom:0; width:100%; height:50px; background:#888; border-top:1px solid #e1e1e1; line-height: 50px; font-size:14px; font-weight:600; text-transform:uppercase; color:#fff; -webkit-transition: all .2s ease-in-out;-moz-transition: all .2s ease-in-out;-ms-transition: all .2s ease-in-out;-o-transition: all .2s ease-in-out;transition: all .2s ease-in-out}
.XEicon .get_started li > a:hover,
@ -48,7 +48,7 @@
/* section .contribution */
.XEicon .contribution {height:442px; padding-top:93px; box-sizing:border-box; text-align:center;}
.XEicon .contribution .cont {font-size:15px;line-height:26px;text-align:center; margin-top:58px; color:#888;}
.XEicon .contribution .btn_github{display:inline-block;margin:50px 0;padding:0 42px;height:52px;border:2px solid #cda25a;background-color:#fff;font-size:16px;line-height:52px;letter-spacing:1px;color:#cda25a;-webkit-transition: all .2s ease-in-out;-moz-transition: all .2s ease-in-out;-ms-transition: all .2s ease-in-out;-o-transition: all .2s ease-in-out;transition: all .2s ease-in-out}
.XEicon .contribution .btn_github{display:inline-block;margin:50px 0;padding:0 40px;height:52px;border:2px solid #cda25a;background-color:#fff;font-size:15px;line-height:52px;font-weight: 600;letter-spacing:1px;color:#cda25a;-webkit-transition: all .2s ease-in-out;-moz-transition: all .2s ease-in-out;-ms-transition: all .2s ease-in-out;-o-transition: all .2s ease-in-out;transition: all .2s ease-in-out}
.XEicon .contribution .btn_github:hover,
.XEicon .contribution .btn_github:active
.XEicon .contribution .btn_github:focus{background-color:#cda25a;color:#fff}

4
layouts/xedition/demo/welcome_main.html
View file

@ -3,8 +3,8 @@
<section class="xeicon">
<h1>Beautiful iconpack<br>XEIcon</h1>
<div class="button-area">
<a class="btn_item" target="_blank" href="http://xpressengine.github.io/XEIcon">homepage</a>
<a class="btn_item" target="_blank" href="https://github.com/xpressengine/XEIcon">github</a>
<a class="btn_item" target="_blank" href="http://xpressengine.github.io/XEIcon">HOMEPAGE</a>
<a class="btn_item" target="_blank" href="https://github.com/xpressengine/XEIcon">GITHUB</a>
</div>
</section>

5
layouts/xedition/js/layout.js
View file

@ -63,11 +63,10 @@
// login popup
$hoverEl.on('mouseenter mouseleave focusin focusout',function(e){
e.preventDefault();
$this = $(this);
if(e.type == 'mouseenter' || e.type == 'focusin'){
$this.addClass('on');
$(this).addClass('on');
} else {
$this.removeClass('on');
$(this).removeClass('on');
}
});

2
modules/board/skins/xedition/_header.html
View file

@ -1,6 +1,6 @@
<load target="board.default.css" />
<load target="board.default.js" type="body" />
<load target="//cdn.jsdelivr.net/xeicon/1.0.4/xeicon.min.css" type="body" />
<load target="/common/xeicon/xeicon.min.css" />
<!--@if($order_type == "desc")-->
{@ $order_type = "asc"; }