diff --git a/jshERP-web/src/components/page/GlobalHeader.vue b/jshERP-web/src/components/page/GlobalHeader.vue index a4a0e09a..42b868a9 100644 --- a/jshERP-web/src/components/page/GlobalHeader.vue +++ b/jshERP-web/src/components/page/GlobalHeader.vue @@ -196,7 +196,7 @@ /* dark 样式 */ &.dark { - color: #000000; + color: #ffffff; box-shadow: 0 0 4px rgba(0, 0, 0, 0.2); background-color: white !important; } diff --git a/jshERP-web/src/components/page/GlobalLayout.vue b/jshERP-web/src/components/page/GlobalLayout.vue index d3b847ba..a8072ebf 100644 --- a/jshERP-web/src/components/page/GlobalLayout.vue +++ b/jshERP-web/src/components/page/GlobalLayout.vue @@ -569,10 +569,10 @@ height: 64px; position: relative; line-height: 64px; - padding-left: 24px; + padding-left: 10px; -webkit-transition: all .3s; transition: all .3s; - background: #002140; + background: #ffffff; overflow: hidden; img, h1 { @@ -587,7 +587,7 @@ h1 { color: #fff; font-size: 18px; - margin: 0 0 0 8px; + margin: 0 0 10px 8px; font-family: "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; font-weight: 600; } diff --git a/jshERP-web/src/components/tools/Logo.vue b/jshERP-web/src/components/tools/Logo.vue index 8156d920..e78283be 100644 --- a/jshERP-web/src/components/tools/Logo.vue +++ b/jshERP-web/src/components/tools/Logo.vue @@ -1,12 +1,13 @@ @@ -37,17 +38,22 @@ .sider { box-shadow: none !important; .logo { + color: #ffffff; height: @height !important; line-height: @height !important; box-shadow: none !important; transition: background 300ms; - + h1 { + font-size: 24px; + color: #ffffff; + } a { color: white; &:hover { color: rgba(255, 255, 255, 0.8); } } + } &.light .logo {