From aa2d9c597ba32ceed86625ce7f3fd675a3d00361 Mon Sep 17 00:00:00 2001 From: ChanMyeong Date: Thu, 31 Jan 2013 06:30:05 +0000 Subject: [PATCH] Issue 2882: NanumGothic web font URI issue. http -> https git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12639 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- help/index.html | 4 ++-- layouts/bootstrap.layout/bootstrap.layout.css | 2 +- layouts/bootstrap.layout/bootstrap.layout.ie9fix.css | 2 +- modules/admin/tpl/css/admin_en.css | 2 +- modules/admin/tpl/css/admin_jp.css | 2 +- modules/admin/tpl/css/admin_ko.css | 2 +- modules/message/skins/default/message.css | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/help/index.html b/help/index.html index f82ee307b..8fe96210c 100644 --- a/help/index.html +++ b/help/index.html @@ -7,7 +7,7 @@ diff --git a/layouts/bootstrap.layout/bootstrap.layout.css b/layouts/bootstrap.layout/bootstrap.layout.css index c935fa1a3..8b53d63b8 100644 --- a/layouts/bootstrap.layout/bootstrap.layout.css +++ b/layouts/bootstrap.layout/bootstrap.layout.css @@ -3,7 +3,7 @@ body{min-width:300px;padding:0 10px} body,table,input,textarea,button,select{font-family:돋움,Dotum,Arial,Helvetica,sans-serif} @media all and (min-width:768px){ body{padding:0} -@font-face{font-family:NG;src:url(http://themes.googleusercontent.com/static/fonts/earlyaccess/nanumgothic/v3/NanumGothic-Regular.eot);src:local(※),url(http://themes.googleusercontent.com/static/fonts/earlyaccess/nanumgothic/v3/NanumGothic-Regular.woff) format('woff')} +@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} } h1,h2,h3,h4,h5,h6,th,strong,b{font-weight:600} diff --git a/layouts/bootstrap.layout/bootstrap.layout.ie9fix.css b/layouts/bootstrap.layout/bootstrap.layout.ie9fix.css index 619ff226c..146853e98 100644 --- a/layouts/bootstrap.layout/bootstrap.layout.ie9fix.css +++ b/layouts/bootstrap.layout/bootstrap.layout.ie9fix.css @@ -1,3 +1,3 @@ @charset "utf-8"; -@font-face{font-family:NG;src:url(http://themes.googleusercontent.com/static/fonts/earlyaccess/nanumgothic/v3/NanumGothic-Regular.eot)} +@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;font-size:13px} \ No newline at end of file diff --git a/modules/admin/tpl/css/admin_en.css b/modules/admin/tpl/css/admin_en.css index 10123e124..69f5f6173 100644 --- a/modules/admin/tpl/css/admin_en.css +++ b/modules/admin/tpl/css/admin_en.css @@ -1,5 +1,5 @@ @charset "utf-8"; -@font-face{font-family:NG;src:url(http://themes.googleusercontent.com/static/fonts/earlyaccess/nanumgothic/v3/NanumGothic-Regular.eot);src:local(※),url(http://themes.googleusercontent.com/static/fonts/earlyaccess/nanumgothic/v3/NanumGothic-Regular.woff) format('woff')} +@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>.x,.x table,.x input,.x textarea,.x select,.x button{font-family:나눔고딕,NanumGothic,NG,돋움,Dotum,Arial,Helvetica,sans-serif} @media all and (max-width:980px){ body>.x,.x table,.x input,.x textarea,.x select,.x button{font-family:돋움,Dotum,Arial,Helvetica,sans-serif} diff --git a/modules/admin/tpl/css/admin_jp.css b/modules/admin/tpl/css/admin_jp.css index 10123e124..69f5f6173 100644 --- a/modules/admin/tpl/css/admin_jp.css +++ b/modules/admin/tpl/css/admin_jp.css @@ -1,5 +1,5 @@ @charset "utf-8"; -@font-face{font-family:NG;src:url(http://themes.googleusercontent.com/static/fonts/earlyaccess/nanumgothic/v3/NanumGothic-Regular.eot);src:local(※),url(http://themes.googleusercontent.com/static/fonts/earlyaccess/nanumgothic/v3/NanumGothic-Regular.woff) format('woff')} +@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>.x,.x table,.x input,.x textarea,.x select,.x button{font-family:나눔고딕,NanumGothic,NG,돋움,Dotum,Arial,Helvetica,sans-serif} @media all and (max-width:980px){ body>.x,.x table,.x input,.x textarea,.x select,.x button{font-family:돋움,Dotum,Arial,Helvetica,sans-serif} diff --git a/modules/admin/tpl/css/admin_ko.css b/modules/admin/tpl/css/admin_ko.css index 10123e124..69f5f6173 100644 --- a/modules/admin/tpl/css/admin_ko.css +++ b/modules/admin/tpl/css/admin_ko.css @@ -1,5 +1,5 @@ @charset "utf-8"; -@font-face{font-family:NG;src:url(http://themes.googleusercontent.com/static/fonts/earlyaccess/nanumgothic/v3/NanumGothic-Regular.eot);src:local(※),url(http://themes.googleusercontent.com/static/fonts/earlyaccess/nanumgothic/v3/NanumGothic-Regular.woff) format('woff')} +@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>.x,.x table,.x input,.x textarea,.x select,.x button{font-family:나눔고딕,NanumGothic,NG,돋움,Dotum,Arial,Helvetica,sans-serif} @media all and (max-width:980px){ body>.x,.x table,.x input,.x textarea,.x select,.x button{font-family:돋움,Dotum,Arial,Helvetica,sans-serif} diff --git a/modules/message/skins/default/message.css b/modules/message/skins/default/message.css index 976507756..b61e2d19c 100644 --- a/modules/message/skins/default/message.css +++ b/modules/message/skins/default/message.css @@ -1,6 +1,6 @@ @charset "utf-8"; /* NHN | dece24@nhncorp.com */ -@font-face{font-family:NG;src:url(http://themes.googleusercontent.com/static/fonts/earlyaccess/nanumgothic/v3/NanumGothic-Regular.eot);src:local(※),url(http://themes.googleusercontent.com/static/fonts/earlyaccess/nanumgothic/v3/NanumGothic-Regular.woff) format('woff')} +@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, #access table, #access input, #access textarea, #access select, #access button, #access label{font-family:나눔고딕,NanumGothic,NG,돋움,Dotum,Arial,Helvetica,sans-serif;font-size:13px} @media all and (max-width:980px){ body, #access table, #access input, #access textarea, #access select, #access button, #access label{font-family:돋움,Dotum,Arial,Helvetica,sans-serif}