From 3e1bd8e3bc6c94ed5fc39ee7955a1aef97c68d97 Mon Sep 17 00:00:00 2001 From: fungleo <web@fengcms.com> Date: 星期二, 21 七月 2020 10:18:56 +0800 Subject: [PATCH] 修复 utils/index.js 中不包含 parseTime 函数的 bug --- ruoyi-ui/src/assets/styles/ruoyi.scss | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss index 77307e5..18dff3a 100644 --- a/ruoyi-ui/src/assets/styles/ruoyi.scss +++ b/ruoyi-ui/src/assets/styles/ruoyi.scss @@ -53,16 +53,20 @@ margin-left: 20px; } -.el-dialog { +.el-dialog:not(.is-fullscreen){ margin-top: 6vh !important; } -.el-table .el-table__header-wrapper th { - word-break: break-word; - background-color: #f8f8f9; - color: #515a6e; - height: 40px; - font-size: 13px; +.el-table { + .el-table__header-wrapper, .el-table__fixed-header-wrapper { + th { + word-break: break-word; + background-color: #f8f8f9; + color: #515a6e; + height: 40px; + font-size: 13px; + } + } } /** 表单布局 **/ @@ -187,4 +191,11 @@ border-radius: 50%; box-shadow: 0 0 4px #ccc; overflow: hidden; +} + +/* 拖拽列样式 */ +.sortable-ghost{ + opacity: .8; + color: #fff!important; + background: #42b983!important; } \ No newline at end of file -- Gitblit v1.9.2