CSS #783 #784 (admin)

- CSS Nesting Module を使った実装 #783 - CSS ファイルをまとめる #784 `cat html/user_data/packages/admin/css/reset.css html/user_data/packages/admin/css/admin_contents.css | sass-convert --indent=4 --from=css --to=scss > html/user_data/packag es/admin/css/admin.css`
EC-CUBE · Dec 19, 2024 · f7233b7 · f7233b7
1 parent 679eb3b
commit f7233b7
Show file tree

Hide file tree

Showing 6 changed files with 1,890 additions and 1,715 deletions.
diff --git a/data/Smarty/templates/admin/admin_popup_header.tpl b/data/Smarty/templates/admin/admin_popup_header.tpl
@@ -29,8 +29,7 @@
 <meta http-equiv="content-type" content="application/xhtml+xml; charset=<!--{$smarty.const.CHAR_CODE}-->" />
 <meta http-equiv="content-script-type" content="text/javascript" />
 <meta http-equiv="content-style-type" content="text/css" />
-<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/reset.css" type="text/css" media="all" />
-<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/admin_contents.css" type="text/css" media="all" />
+<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/admin.css" type="text/css" media="all" />
 
 <script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.js"></script>
 <script type="text/javascript" src="<!--{$TPL_URLPATH}-->js/eccube.admin.js"></script>

diff --git a/data/Smarty/templates/admin/login_frame.tpl b/data/Smarty/templates/admin/login_frame.tpl
@@ -29,8 +29,7 @@
 <meta http-equiv="content-script-type" content="text/javascript">
 <meta http-equiv="content-style-type" content="text/css">
 <meta name="robots" content="noindex,nofollow" />
-<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/reset.css" type="text/css" media="all" />
-<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/admin_contents.css" type="text/css" media="all" />
+<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/admin.css" type="text/css" media="all" />
 
 <script src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.js"></script>
 

diff --git a/data/Smarty/templates/admin/main_frame.tpl b/data/Smarty/templates/admin/main_frame.tpl
@@ -29,8 +29,7 @@
 <meta http-equiv="content-script-type" content="text/javascript" />
 <meta http-equiv="content-style-type" content="text/css" />
 <meta name="robots" content="noindex,nofollow" />
-<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/reset.css" type="text/css" media="all" />
-<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/admin_contents.css" type="text/css" media="all" />
+<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/admin.css" type="text/css" media="all" />
 
 <script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.js"></script>