diff --git a/public/favicon.ico b/public/favicon.ico index d186dd7..cf48032 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/img/logo.png b/public/img/logo.png index 466be22..cf48032 100644 Binary files a/public/img/logo.png and b/public/img/logo.png differ diff --git a/public/img/logo1.png b/public/img/logo1.png deleted file mode 100644 index d186dd7..0000000 Binary files a/public/img/logo1.png and /dev/null differ diff --git a/public/index.html b/public/index.html index ac39b66..e2de8b5 100644 --- a/public/index.html +++ b/public/index.html @@ -26,7 +26,7 @@
<%= VUE_APP_TITLE %>
diff --git a/src/style/app.scss b/src/style/app.scss index d61a2f9..ac16f91 100644 --- a/src/style/app.scss +++ b/src/style/app.scss @@ -29,7 +29,7 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo .adminui-header-right {display: flex;align-items: center;} .adminui-header .logo-bar {font-size: 18px;font-weight: bold;display: flex;align-items: center;justify-content: center;width: 180px;height: 100%;border-right: 1px solid #f2f2f2;} .adminui-header .isCollapse{width: 65px;} -.adminui-header .logo-bar .logo {height: 42px;} +.adminui-header .logo-bar .logo {width: 90%;} .adminui-header .logo-bar>span{display: flex;align-items: center;justify-content: center;} .adminui-header-left .adminui-side-bottom{margin: 0 15px 0 20px;} .adminui-header .nav {display: flex;height: 100%;margin-left: 40px;} diff --git a/src/style/pages.scss b/src/style/pages.scss index 65ee0be..c098dac 100644 --- a/src/style/pages.scss +++ b/src/style/pages.scss @@ -27,7 +27,7 @@ .pageHeader{box-shadow: 0 1px 10px rgba(0,0,0,0.14);margin-bottom: 10px;} .common-header-left {display: flex;align-items: center;} .common-header-logo {display: flex;align-items: center;} -.common-header-logo img {height:40px;margin-right: 10px;vertical-align: bottom;} +.common-header-logo img {margin-right: 10px;vertical-align: bottom;} .common-header-logo label {font-size: 20px;} .common-header-title {font-size: 16px;border-left: 1px solid var(--el-border-color-light);margin-left: 15px;padding-left: 15px;} .common-header-right {display: flex;align-items: center;} diff --git a/src/views/login/index.vue b/src/views/login/index.vue index c4cfdc2..bd1fb2c 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -280,10 +280,10 @@ align-items: center; } h2{ - height: 36px; + height: 28px; display: flex; align-items: flex-start; - font-size: 24px; + font-size: 22px; position: relative; padding-left: 18px; color: #3F4244; @@ -301,7 +301,7 @@ } } .logo{ - height: 60px; + height: 30px; } }