fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 18:51:41 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue 2912 fixed. Web font disabled. Can be enabled as an option.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12716 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong 2013-02-07 03:01:20 +00:00
parent a232eb184a
commit e7bc5597c0
6 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
layouts/bootstrap.layout/bootstrap.layout.css vendored
View file

@ -1,10 +1,8 @@
@charset "utf-8";
body{min-width:300px;padding:0 10px}
body,table,input,textarea,button,select{font-family:돋움,Dotum,Arial,Helvetica,sans-serif}
body,table,input,textarea,select,button{font-family:나눔고딕,NanumGothic,돋움,Dotum,Arial,Helvetica,sans-serif;font-size:14px}
@media all and (min-width:768px){
body{padding:0}
@font-face{font-family:NG;src:url(https://themes.googleusercontent.com/static/fonts/earlyaccess/nanumgothic/v3/NanumGothic-Regular.eot);src:local(※),url(https://themes.googleusercontent.com/static/fonts/earlyaccess/nanumgothic/v3/NanumGothic-Regular.woff) format('woff')}
body,table,input,textarea,select,button{font-family:나눔고딕,NanumGothic,NG,돋움,Dotum,Arial,Helvetica,sans-serif;font-size:13px}
body,table,input,textarea,select,button{font-size:13px}
}
h1,h2,h3,h4,h5,h6,th,strong,b{font-weight:600}
/* Bootstrap Override */

2
layouts/bootstrap.layout/bootstrap.layout.ie78fix.css vendored
View file

@ -1,2 +0,0 @@
@charset "utf-8";
body,table,input,textarea,select,button{font-family:나눔고딕,NanumGothic,돋움,Dotum,Arial,Helvetica,sans-serif}

3
layouts/bootstrap.layout/bootstrap.layout.ie9fix.css vendored
View file

@ -1,3 +0,0 @@
@charset "utf-8";
@font-face{font-family:NG;src:url(https://themes.googleusercontent.com/static/fonts/earlyaccess/nanumgothic/v3/NanumGothic-Regular.eot)}
body,table,input,textarea,select,button{font-family:나눔고딕,NanumGothic,NG,돋움,Dotum,Arial,Helvetica,sans-serif}

5
layouts/bootstrap.layout/bootstrap.layout.webfont.css vendored Normal file
View file

@ -0,0 +1,5 @@
@charset "utf-8";
@font-face{font-family:NG;src:url(https://themes.googleusercontent.com/static/fonts/earlyaccess/nanumgothic/v3/NanumGothic-Regular.eot);src:local(※),url(https://themes.googleusercontent.com/static/fonts/earlyaccess/nanumgothic/v3/NanumGothic-Regular.woff) format('woff')}
@media all and (min-width:768px){
body,table,input,textarea,select,button{font-family:나눔고딕,NanumGothic,NG,돋움,Dotum,Arial,Helvetica,sans-serif}
}

12
layouts/bootstrap.layout/conf/info.xml
View file

@ -17,6 +17,18 @@
</menu>
</menus>
<extra_vars>
<var name="WEB_FONT" type="select">
<title xml:lang="ko">웹 폰트</title>
<title xml:lang="en">Web Font</title>
<options value="NO">
<title xml:lang="ko">'나눔고딕' 웹 폰트 사용 안함</title>
<title xml:lang="en">Do not use 'NanumGothic' web font</title>
</options>
<options value="YES">
<title xml:lang="ko">'나눔고딕' 웹 폰트 사용</title>
<title xml:lang="en">Use 'NanumGothic' web font</title>
</options>
</var>
<var name="LAYOUT_TYPE" type="select">
<title xml:lang="ko">레이아웃 유형</title>
<title xml:lang="en">Layout Type</title>

3
layouts/bootstrap.layout/layout.html
View file

@ -2,8 +2,7 @@
<load target="../../common/css/bootstrap.min.css" />
<load target="../../common/css/bootstrap-responsive.min.css" />
<load target="bootstrap.layout.css" />
<load target="bootstrap.layout.ie78fix.css" targetie="lt IE 9" />
<load target="bootstrap.layout.ie9fix.css" targetie="IE 9" />
<load target="bootstrap.layout.webfont.css" cond="$layout_info->WEB_FONT == 'YES'" />
<load target="../../common/js/respond.min.js" targetie="lt IE 9" />
<load target="bootstrap.layout.js" type="body" />
<div class="container">