diff --git a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl index 7f880540..16c6e796 100644 --- a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl +++ b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl @@ -238,7 +238,11 @@ that.saveDisabled = true; var data = JSON.parse(JSON.stringify(that.form)); if(data.id&&data.id==data.categoryId){ - that.$message.error('所属栏目不能为自身') + that.$notify({ + title: '提示', + message: '所属栏目不能为自身', + type: 'error' + }); that.saveDisabled = false; return } diff --git a/src/main/webapp/static/ms-admin/4.7.2/css/index.css b/src/main/webapp/static/ms-admin/4.7.2/css/index.css index 8bdffc31..2c77a6d2 100644 --- a/src/main/webapp/static/ms-admin/4.7.2/css/index.css +++ b/src/main/webapp/static/ms-admin/4.7.2/css/index.css @@ -131,10 +131,6 @@ textarea::-webkit-input-placeholder { .ms-header-select > .el-select:nth-of-type(2) { margin: 0 10px; } -.el-submenu .el-menu-item.is-active { - border-radius: 4px; - opacity:1.0; -} .el-card, .el-message { border-radius: 0 !important; @@ -247,7 +243,6 @@ textarea::-webkit-input-placeholder { position: absolute; margin-left: 10px; font-size: 12px; - color:rgba(0,153,255,1); } .ms-admin-logo .iconfont { @@ -286,6 +281,7 @@ textarea::-webkit-input-placeholder { background-color: #0080FF; display: flex; justify-content: center; + align-items: center; cursor: pointer; } .ms-admin-mstore .ms-admin-mstore-icon span { @@ -477,40 +473,40 @@ textarea::-webkit-input-placeholder { border: none !important; } @keyframes rubberBand { - 0 { - -webkit-transform: scale3d(1, 1, 1); - transform: scale3d(1, 1, 1); - } - 10% { - -webkit-transform: scale3d(1.25, 0.75, 1); - transform: scale3d(1.25, 0.75, 1); - } - 20% { - -webkit-transform: scale3d(0.75, 1.25, 1); - transform: scale3d(0.75, 1.25, 1); - } - 30% { - -webkit-transform: scale3d(1.15, 0.85, 1); - transform: scale3d(1.15, 0.85, 1); - } - 40% { - -webkit-transform: scale3d(0.95, 1.05, 1); - transform: scale3d(0.95, 1.05, 1); - } - 50% { - -webkit-transform: scale3d(1.05, 0.95, 1); - transform: scale3d(1.05, 0.95, 1); - } - 51% { - -webkit-transform: scale3d(1, 1, 1); - transform: scale3d(1, 1, 1); - } +0 { + -webkit-transform: scale3d(1, 1, 1); + transform: scale3d(1, 1, 1); +} +10% { + -webkit-transform: scale3d(1.25, 0.75, 1); + transform: scale3d(1.25, 0.75, 1); +} +20% { + -webkit-transform: scale3d(0.75, 1.25, 1); + transform: scale3d(0.75, 1.25, 1); +} +30% { + -webkit-transform: scale3d(1.15, 0.85, 1); + transform: scale3d(1.15, 0.85, 1); +} +40% { + -webkit-transform: scale3d(0.95, 1.05, 1); + transform: scale3d(0.95, 1.05, 1); +} +50% { + -webkit-transform: scale3d(1.05, 0.95, 1); + transform: scale3d(1.05, 0.95, 1); +} +51% { + -webkit-transform: scale3d(1, 1, 1); + transform: scale3d(1, 1, 1); +} } .el-scrollbar__wrap{overflow-x:hidden;} .el-scrollbar { - position: static; + position: static; } [v-cloak] { - display: none; + display: none; } \ No newline at end of file diff --git a/src/main/webapp/static/ms-admin/4.7.2/css/theme.css b/src/main/webapp/static/ms-admin/4.7.2/css/theme.css new file mode 100644 index 00000000..2ec98fdc --- /dev/null +++ b/src/main/webapp/static/ms-admin/4.7.2/css/theme.css @@ -0,0 +1,36 @@ +/*浅色系*/ +.ms-theme-light .ms-admin-logo > div span{ + color: #0080FF; +} +.ms-theme-light .el-menu-vertical-demo, +.ms-theme-light .el-menu-vertical-demo .el-menu, +.ms-theme-light.ms-admin-menu-aside-submenu *{ + background: #0080FF; +} +.ms-theme-light .el-submenu .el-menu-item.is-active, +.ms-theme-light.ms-admin-menu-aside-submenu .el-menu-item.is-active{ + background-color:rgba(255,255,255,0.3) !important; +} +.ms-theme-light .ms-admin-menu-aside .el-submenu__title:hover, +.ms-theme-light .ms-admin-menu-aside .el-menu-item:hover, +.ms-theme-light.ms-admin-menu-aside-submenu .el-menu-item:hover{ + background-color:rgba(255,255,255,0.3) !important; +} +/*深色系*/ +.ms-theme-dark .ms-admin-logo > div span{ + color: rgba(56,58,63,1); +} +.ms-theme-dark .el-menu-vertical-demo, +.ms-theme-dark .el-menu-vertical-demo .el-menu, +.ms-theme-dark.ms-admin-menu-aside-submenu *{ + background:rgba(56,58,63,1); +} +.ms-theme-dark .el-submenu .el-menu-item.is-active, +.ms-theme-dark.ms-admin-menu-aside-submenu .el-menu-item.is-active{ + background-color:#0080FF !important; +} +.ms-theme-dark .ms-admin-menu-aside .el-submenu__title:hover, +.ms-theme-dark .ms-admin-menu-aside .el-menu-item:hover, +.ms-theme-dark.ms-admin-menu-aside-submenu .el-menu-item:hover{ + background-color:#0080FF !important; +} \ No newline at end of file