Merge pull request #1090 from EC-CUBE/seasoft-css-admin

管理画面CSS改善
EC-CUBE · Dec 20, 2024 · be45d5e · be45d5e
2 parents 110f5ca + 96ed21a
commit be45d5e
Show file tree

Hide file tree

Showing 10 changed files with 1,865 additions and 1,911 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/contents/file_manager.tpl b/data/Smarty/templates/admin/contents/file_manager.tpl
@@ -22,6 +22,22 @@
  */
 *}-->
 
+<style>
+#contents-filemanager-tree {
+    float: left;
+    height: 430px;
+}
+#contents-filemanager-right {
+    width: 720px;
+    float: right;
+}
+#tree {
+    width: 230px;
+    border: 3px solid #ddd;
+    padding: 10px;
+    background-color: #F3F3F3;
+}
+</style>
 <script type="text/javascript">//<![CDATA[
     $(function() {
         var bread_crumbs = <!--{$tpl_now_dir}-->;

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,9 +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_file_manager.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>
 

diff --git a/html/admin/css/common.css b/html/admin/css/common.css
diff --git a/html/admin/css/install.css b/html/admin/css/install.css