From 16deee9e4ed7333914b654f7c58266c0ac7ceec8 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Wed, 11 Oct 2023 11:43:58 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A6=81=E6=9C=9B=E5=AF=BE=E5=BF=9C=20?= =?UTF-8?q?NEWDWH2021-1266=20=E3=82=B3=E3=83=BC=E3=83=9D=E3=83=AC=E3=83=BC?= =?UTF-8?q?=E3=83=88=E3=82=AB=E3=83=A9=E3=83=BC=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-webapp/src/static/css/bioStyle.css | 2 -- ecs/jskult-webapp/src/static/css/main_theme.css | 5 +++++ ecs/jskult-webapp/src/static/css/masterMainte.css | 5 ----- ecs/jskult-webapp/src/static/css/menuStyle.css | 2 -- ecs/jskult-webapp/src/static/css/pagenation.css | 2 +- ecs/jskult-webapp/src/static/css/ultStyle.css | 2 -- ecs/jskult-webapp/src/templates/_header.html | 1 + 7 files changed, 7 insertions(+), 12 deletions(-) create mode 100644 ecs/jskult-webapp/src/static/css/main_theme.css diff --git a/ecs/jskult-webapp/src/static/css/bioStyle.css b/ecs/jskult-webapp/src/static/css/bioStyle.css index 51325f55..4b158b38 100644 --- a/ecs/jskult-webapp/src/static/css/bioStyle.css +++ b/ecs/jskult-webapp/src/static/css/bioStyle.css @@ -6,8 +6,6 @@ body { white-space: nowrap; - background-color: LightCyan; - font-family: "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "メイリオ", Meiryo, Osaka, "ＭＳ Ｐゴシック", "MS PGothic", sans-serif; } h1 { diff --git a/ecs/jskult-webapp/src/static/css/main_theme.css b/ecs/jskult-webapp/src/static/css/main_theme.css new file mode 100644 index 00000000..a6057540 --- /dev/null +++ b/ecs/jskult-webapp/src/static/css/main_theme.css @@ -0,0 +1,5 @@ +body { + /* Merck Sensitive Green */ + background-color: #B4DC96; + font-family: "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "メイリオ", Meiryo, Osaka, "ＭＳ Ｐゴシック", "MS PGothic", sans-serif; +} diff --git a/ecs/jskult-webapp/src/static/css/masterMainte.css b/ecs/jskult-webapp/src/static/css/masterMainte.css index c6d7be7d..dd760425 100644 --- a/ecs/jskult-webapp/src/static/css/masterMainte.css +++ b/ecs/jskult-webapp/src/static/css/masterMainte.css @@ -4,11 +4,6 @@ table { box-sizing: initial; } -body{ - background-color: LightCyan; - font-family : "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "メイリオ", Meiryo, Osaka, "ＭＳ Ｐゴシック", "MS PGothic", sans-serif; -} - h1{ margin-left : 1%; font-weight: 700; diff --git a/ecs/jskult-webapp/src/static/css/menuStyle.css b/ecs/jskult-webapp/src/static/css/menuStyle.css index cabd5197..4d2f9c46 100644 --- a/ecs/jskult-webapp/src/static/css/menuStyle.css +++ b/ecs/jskult-webapp/src/static/css/menuStyle.css @@ -1,7 +1,5 @@ body{ - background-color: LightCyan; background-size: 220%,220%; - font-family: "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "メイリオ", Meiryo, Osaka, "ＭＳ Ｐゴシック", "MS PGothic", sans-serif; } .background{ diff --git a/ecs/jskult-webapp/src/static/css/pagenation.css b/ecs/jskult-webapp/src/static/css/pagenation.css index 72e4aecc..5af4353d 100644 --- a/ecs/jskult-webapp/src/static/css/pagenation.css +++ b/ecs/jskult-webapp/src/static/css/pagenation.css @@ -67,7 +67,7 @@ div.paginationjs-pages ul { } .paginationjs-pages > ul > li.paginationjs-ellipsis.disabled > a { border: none; - background-color: LightCyan; + background-color: inherit; color: black; margin: 0 4px; padding: 0; diff --git a/ecs/jskult-webapp/src/static/css/ultStyle.css b/ecs/jskult-webapp/src/static/css/ultStyle.css index c1ace1d4..843a796b 100644 --- a/ecs/jskult-webapp/src/static/css/ultStyle.css +++ b/ecs/jskult-webapp/src/static/css/ultStyle.css @@ -6,8 +6,6 @@ body { margin: 8px; - background-color: LightCyan; - font-family: "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "メイリオ", Meiryo, Osaka, "ＭＳ Ｐゴシック", "MS PGothic", sans-serif; } h1 { diff --git a/ecs/jskult-webapp/src/templates/_header.html b/ecs/jskult-webapp/src/templates/_header.html index c2476734..a0e90606 100644 --- a/ecs/jskult-webapp/src/templates/_header.html +++ b/ecs/jskult-webapp/src/templates/_header.html @@ -6,6 +6,7 @@ +