diff --git a/2_apply.bat b/2_apply.bat index af0a0a0b..520e3f36 100644 --- a/2_apply.bat +++ b/2_apply.bat @@ -39,8 +39,31 @@ for /f "delims=" %%i in (list.txt) do ( set source_file=%target_directory%!line! set relative_path=!line:%source_prefix%=! set target_file=%target_prefix%!relative_path! + ) else if "!line:~-4!" == ".svg" ( + set source_file=%target_directory%!line! + set relative_path=!line:%source_prefix%=! + set target_file=%target_prefix%!relative_path! + ) else if "!line:~-4!" == ".reb" ( + set source_file=%target_directory%!line! + set relative_path=!line:%source_prefix%=! + set target_file=%target_prefix%!relative_path! + ) else if "!line:~-4!" == ".png" ( + set source_file=%target_directory%!line! + set relative_path=!line:%source_prefix%=! + set target_file=%target_prefix%!relative_path! + ) else if "!line:~-6!" == ".woff2" ( + set source_file=%target_directory%!line! + set relative_path=!line:%source_prefix%=! + set target_file=%target_prefix%!relative_path! + ) else if "!line:~-5!" == ".woff" ( + set source_file=%target_directory%!line! + set relative_path=!line:%source_prefix%=! + set target_file=%target_prefix%!relative_path! + ) else if "!line:~-4!" == ".otf" ( + set source_file=%target_directory%!line! + set relative_path=!line:%source_prefix%=! + set target_file=%target_prefix%!relative_path! ) - rem Copy the source file to the target location, overwriting if necessary echo Copying "!source_file!" to "!target_file!" xcopy /i /Y "!source_file!" "!target_file!" diff --git a/list.txt b/list.txt index b4d6a931..c923403b 100644 --- a/list.txt +++ b/list.txt @@ -11,4 +11,10 @@ src\main\webapp\WEB-INF\views\home\index.jsp src\main\webapp\com\img\common\bg\main_info_visual_20240905.png src\main\webapp\com\img\common\bg\main_info_visual_20240906.png src\main\webapp\WEB-INF\views\scheduledGroupEducationApplication\inquiry\scheduledGroupEducationApplicationInquiry.jsp -src\main\webapp\WEB-INF\views\scheduledGroupEducationApplication\input\scheduledGroupEducationApplicationInput.jsp \ No newline at end of file +src\main\webapp\WEB-INF\views\scheduledGroupEducationApplication\input\scheduledGroupEducationApplicationInput.jsp +src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Regular.woff2 +src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Regular.woff +src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Regular.otf +src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Bold.woff2 +src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Bold.woff +src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Bold.otf \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/home/index.jsp b/src/main/webapp/WEB-INF/views/home/index.jsp index 42766200..dac49e3c 100644 --- a/src/main/webapp/WEB-INF/views/home/index.jsp +++ b/src/main/webapp/WEB-INF/views/home/index.jsp @@ -326,36 +326,49 @@
diff --git a/src/main/webapp/com/css/common.v2.0.css b/src/main/webapp/com/css/common.v2.0.css index f84e91f5..65ac73c7 100644 --- a/src/main/webapp/com/css/common.v2.0.css +++ b/src/main/webapp/com/css/common.v2.0.css @@ -740,7 +740,7 @@ nav.navbar.navbar-default ul.nav > li > a { header nav.navbar .navbar-nav > li > a, nav.navbar.bootsnav ul.nav > li > a { font-size: 16px; - font-weight: bold; + font-weight: 500; line-height: 80px; padding: 0px 30px; margin: 0px; @@ -1709,12 +1709,12 @@ button.mfp-close, /* ==== main flexslider 커스텀 끝 ==== */ /* 문의 연락처 시작 */ .contact-box { - height: 260px; + height: 287px; padding: 30px; } .contact-title { - font-size: 26px; + font-size: 24px; font-weight: bold; margin-bottom: 26px; } @@ -2094,7 +2094,7 @@ button.mfp-close, .main-info-user-count-group .user-count-box { position: relative; width: 100%; - font-size: 20px; + font-size: 18px; background-color: #d0e3f1; border-radius: 10px; clear: both; diff --git a/src/main/webapp/com/css/sass/common.v2.0.scss b/src/main/webapp/com/css/sass/common.v2.0.scss index d64b723e..f74ab599 100644 --- a/src/main/webapp/com/css/sass/common.v2.0.scss +++ b/src/main/webapp/com/css/sass/common.v2.0.scss @@ -714,7 +714,7 @@ nav.navbar.navbar-default ul.nav > li > a { header nav.navbar .navbar-nav > li > a, nav.navbar.bootsnav ul.nav > li > a { font-size: 16px; - font-weight: bold; + font-weight: 500; line-height: 80px; padding: 0px 30px; margin: 0px; @@ -1500,11 +1500,11 @@ button.mfp-close, /* 문의 연락처 시작 */ .contact-box { - height: 260px; + height: 287px; padding: 30px; } .contact-title { - font-size: 26px; + font-size: 24px; font-weight: bold; margin-bottom: 26px; } @@ -1827,7 +1827,7 @@ button.mfp-close, .main-info-user-count-group .user-count-box { position: relative; width: 100%; - font-size: 20px; + font-size: 18px; background-color: #d0e3f1; border-radius: 10px; clear: both; diff --git a/src/main/webapp/com/css/style.css b/src/main/webapp/com/css/style.css index 69c71273..515bbf7f 100644 --- a/src/main/webapp/com/css/style.css +++ b/src/main/webapp/com/css/style.css @@ -54,18 +54,18 @@ Table of contents font-family: 'Noto Sans KR'; font-style: normal; font-weight: 300; - src: url(/fonts/NotoSansKr/NotoSansKR-Light.woff2) format('woff2'), - url(/fonts/NotoSansKr/NotoSansKR-Light.woff) format('woff'), - url(/fonts/NotoSansKr/NotoSansKR-Light.otf) format('opentype'); + src: url(../fonts/NotoSansKr/NotoSansKR-Light.woff2) format('woff2'), + url(../fonts/NotoSansKr/NotoSansKR-Light.woff) format('woff'), + url(../fonts/NotoSansKr/NotoSansKR-Light.otf) format('opentype'); } @font-face { font-family: 'Noto Sans KR'; font-style: normal; font-weight: 400; - src: url(/fonts/NotoSansKr/NotoSansKR-Regular.woff2) format('woff2'), - url(/fonts/NotoSansKr/NotoSansKR-Regular.woff) format('woff'), - url(/fonts/NotoSansKr/NotoSansKR-Regular.otf) format('opentype'); + src: url(../fonts/NotoSansKr/NotoSansKR-Regular.woff2) format('woff2'), + url(../fonts/NotoSansKr/NotoSansKR-Regular.woff) format('woff'), + url(../fonts/NotoSansKr/NotoSansKR-Regular.otf) format('opentype'); } @@ -73,9 +73,9 @@ Table of contents font-family: 'Noto Sans KR'; font-style: normal; font-weight: 700; - src: url(/fonts/NotoSansKr/NotoSansKR-Bold.woff2) format('woff2'), - url(/fonts/NotoSansKr/NotoSansKR-Bold.woff) format('woff'), - url(/fonts/NotoSansKr/NotoSansKR-Bold.otf) format('opentype'); + src: url(../fonts/NotoSansKr/NotoSansKR-Bold.woff2) format('woff2'), + url(../fonts/NotoSansKr/NotoSansKR-Bold.woff) format('woff'), + url(../fonts/NotoSansKr/NotoSansKR-Bold.otf) format('opentype'); } /* =================================== 02. Custom @@ -87,7 +87,7 @@ body { font-smoothing: antialiased; font-size:16px; color:#000; - font-weight: 400; + font-weight: 300; line-height: 24px; } body, html { diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Black.eot b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Black.eot new file mode 100644 index 00000000..7c274d92 Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Black.eot differ diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Black.otf b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Black.otf new file mode 100644 index 00000000..ee8f9db8 Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Black.otf differ diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Black.woff b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Black.woff new file mode 100644 index 00000000..0cb85829 Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Black.woff differ diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Black.woff2 b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Black.woff2 new file mode 100644 index 00000000..288a5841 Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Black.woff2 differ diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Bold.eot b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Bold.eot new file mode 100644 index 00000000..a3a402a4 Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Bold.eot differ diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSans-DemiLight.eot b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-DemiLight.eot new file mode 100644 index 00000000..6087c592 Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-DemiLight.eot differ diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSans-DemiLight.otf b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-DemiLight.otf new file mode 100644 index 00000000..97321713 Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-DemiLight.otf differ diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSans-DemiLight.woff b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-DemiLight.woff new file mode 100644 index 00000000..117f89f2 Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-DemiLight.woff differ diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSans-DemiLight.woff2 b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-DemiLight.woff2 new file mode 100644 index 00000000..5cd6b2cc Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-DemiLight.woff2 differ diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Light.eot b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Light.eot new file mode 100644 index 00000000..35e63faa Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Light.eot differ diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Light.otf b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Light.otf new file mode 100644 index 00000000..ecd67fad Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Light.otf differ diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Light.woff b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Light.woff new file mode 100644 index 00000000..6608beca Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Light.woff differ diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Light.woff2 b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Light.woff2 new file mode 100644 index 00000000..ff4d53d6 Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Light.woff2 differ diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Medium.eot b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Medium.eot new file mode 100644 index 00000000..37b4540e Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Medium.eot differ diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Medium.otf b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Medium.otf new file mode 100644 index 00000000..15c2009a Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Medium.otf differ diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Medium.woff b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Medium.woff new file mode 100644 index 00000000..81b841aa Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Medium.woff differ diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Medium.woff2 b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Medium.woff2 new file mode 100644 index 00000000..c452c23a Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Medium.woff2 differ diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Regular.eot b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Regular.eot new file mode 100644 index 00000000..8c6e3776 Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Regular.eot differ diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Thin.eot b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Thin.eot new file mode 100644 index 00000000..7060a94a Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Thin.eot differ diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Thin.otf b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Thin.otf new file mode 100644 index 00000000..5cbef9b1 Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Thin.otf differ diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Thin.woff b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Thin.woff new file mode 100644 index 00000000..ef6a254f Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Thin.woff differ diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Thin.woff2 b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Thin.woff2 new file mode 100644 index 00000000..672ba55b Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSans-Thin.woff2 differ diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSansKR-Bold.otf b/src/main/webapp/com/fonts/NotoSansKr/NotoSansKR-Bold.otf new file mode 100644 index 00000000..936a25d5 Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSansKR-Bold.otf differ diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSansKR-Bold.woff b/src/main/webapp/com/fonts/NotoSansKr/NotoSansKR-Bold.woff new file mode 100644 index 00000000..5c994eec Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSansKR-Bold.woff differ diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSansKR-Bold.woff2 b/src/main/webapp/com/fonts/NotoSansKr/NotoSansKR-Bold.woff2 new file mode 100644 index 00000000..8075f86c Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSansKR-Bold.woff2 differ diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSansKR-Regular.otf b/src/main/webapp/com/fonts/NotoSansKr/NotoSansKR-Regular.otf new file mode 100644 index 00000000..ce916b31 Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSansKR-Regular.otf differ diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSansKR-Regular.woff b/src/main/webapp/com/fonts/NotoSansKr/NotoSansKR-Regular.woff new file mode 100644 index 00000000..4c409263 Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSansKR-Regular.woff differ diff --git a/src/main/webapp/com/fonts/NotoSansKr/NotoSansKR-Regular.woff2 b/src/main/webapp/com/fonts/NotoSansKr/NotoSansKR-Regular.woff2 new file mode 100644 index 00000000..838b3ce7 Binary files /dev/null and b/src/main/webapp/com/fonts/NotoSansKr/NotoSansKR-Regular.woff2 differ