From 5ae06a867a3323804635b41c6865a3273665ac40 Mon Sep 17 00:00:00 2001 From: a123456 <1209165801@qq.com> Date: Sat, 26 Jan 2019 09:58:19 +0800 Subject: [PATCH] Signed-off-by: a123456 <1209165801@qq.com> --- src/main/webapp/WEB-INF/manager/.project | 28 ----- .../webapp/WEB-INF/manager/mweixin/head.ftl | 0 .../WEB-INF/manager/mweixin/material-list.ftl | 14 ++- src/main/webapp/static/mweixin/.project | 28 ----- .../static/mweixin/css/material-list.css | 101 ++++++++++++++++++ .../static/mweixin/less/material-list.less | 5 + 6 files changed, 116 insertions(+), 60 deletions(-) delete mode 100644 src/main/webapp/WEB-INF/manager/.project delete mode 100644 src/main/webapp/WEB-INF/manager/mweixin/head.ftl delete mode 100644 src/main/webapp/static/mweixin/.project create mode 100644 src/main/webapp/static/mweixin/css/material-list.css create mode 100644 src/main/webapp/static/mweixin/less/material-list.less diff --git a/src/main/webapp/WEB-INF/manager/.project b/src/main/webapp/WEB-INF/manager/.project deleted file mode 100644 index ffb8508b..00000000 --- a/src/main/webapp/WEB-INF/manager/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - manager - - - - - - com.aptana.ide.core.unifiedBuilder - - - - - - com.aptana.projects.webnature - - - - 1548465241018 - - 26 - - org.eclipse.ui.ide.multiFilter - 1.0-name-matches-false-false-node_modules - - - - diff --git a/src/main/webapp/WEB-INF/manager/mweixin/head.ftl b/src/main/webapp/WEB-INF/manager/mweixin/head.ftl deleted file mode 100644 index e69de29b..00000000 diff --git a/src/main/webapp/WEB-INF/manager/mweixin/material-list.ftl b/src/main/webapp/WEB-INF/manager/mweixin/material-list.ftl index 54e35dd5..69d749dc 100644 --- a/src/main/webapp/WEB-INF/manager/mweixin/material-list.ftl +++ b/src/main/webapp/WEB-INF/manager/mweixin/material-list.ftl @@ -16,11 +16,17 @@ - - + + + 保存 + 更新 + 返回 + - - + +
+ +
diff --git a/src/main/webapp/static/mweixin/.project b/src/main/webapp/static/mweixin/.project deleted file mode 100644 index b91f3b44..00000000 --- a/src/main/webapp/static/mweixin/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - mweixin - - - - - - com.aptana.ide.core.unifiedBuilder - - - - - - com.aptana.projects.webnature - - - - 1548465267988 - - 26 - - org.eclipse.ui.ide.multiFilter - 1.0-name-matches-false-false-node_modules - - - - diff --git a/src/main/webapp/static/mweixin/css/material-list.css b/src/main/webapp/static/mweixin/css/material-list.css new file mode 100644 index 00000000..82f6bda4 --- /dev/null +++ b/src/main/webapp/static/mweixin/css/material-list.css @@ -0,0 +1,101 @@ +/* +*这里的值严格按照UI设计图标注值来进行设置 +*/ +/* +*颜色 +*/ +/* +*页面的边距 +*/ +/* +*字体 +*/ +/* +*头像 +*/ +/* + * 按钮 + */ +/* +*对常见的多行样式进行了方法封装,方便调用,加快开发效率 +*/ +html, +body { + min-height: 100vh; + background-color: #eee; + margin: 0; + font-weight: initial !important; + font-size: 14px !important; + color: #333 !important; +} +html *, +body * { + text-decoration: none !important; + font-family: Verdana, Arial, Helvetica, sans-serif; + box-sizing: border-box; +} +.ms-ellipsis { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + display: block; +} +.ms-align-center { + display: flex; + align-items: center; +} +input::-webkit-input-placeholder, +textarea::-webkit-input-placeholder { + font-weight: initial; + font-size: 12px; + color: #999; + resize: none; +} +*::-webkit-scrollbar { + width: 8px; + height: 8px; +} +/*定义滚动条轨道 内阴影+圆角*/ +*::-webkit-scrollbar-track { + border-radius: 10px; + /*滚动条的背景区域的圆角*/ + background-color: #eee; + /*滚动条的背景颜色*/ +} +/*定义滑块 内阴影+圆角*/ +*::-webkit-scrollbar-thumb { + border-radius: 10px; + /*滚动条的圆角*/ + background-color: #ddd; + /*滚动条的背景颜色*/ +} +.ms-container { + margin: 12px; + height: 100%; + padding: 14px 14px 0 14px; + background: #fff; +} +.ms-header { + padding: 10px; + margin: 0; + border-bottom: 1px solid #ddd; + background: #fff; + height: 50px; +} +.ms-pagination { + padding: 20px 0; + text-align: right; +} +.ms-fr { + float: right; +} +.ms-tr { + text-align: right; +} +.el-button + .el-button { + margin-left: 0; +} +.ms-admin-material-list { + margin: 15px; + padding: 10px; +} diff --git a/src/main/webapp/static/mweixin/less/material-list.less b/src/main/webapp/static/mweixin/less/material-list.less new file mode 100644 index 00000000..0423c5fb --- /dev/null +++ b/src/main/webapp/static/mweixin/less/material-list.less @@ -0,0 +1,5 @@ +@import "../../ms-admin/4.7.0/less/app.less"; + +.ms-admin-material-list { + .ms-margin-padding(15px, 10px); +} \ No newline at end of file