From 5a3714e9bcc8675c4eab263648d3285e27689fd9 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 27 Aug 2022 11:54:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A8=AA=E5=90=91=E8=8F=9C?=
=?UTF-8?q?=E5=8D=95=E4=B8=8B=E6=BF=80=E6=B4=BB=E8=8F=9C=E5=8D=95=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/resources/static/ruoyi/css/ry-ui.css | 20 +++++++++----------
.../resources/templates/index-topnav.html | 1 +
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
index b418d346..611afee9 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
@@ -508,7 +508,7 @@ div.ztree-border {
left: calc(100% - 20px);
background-color: #33cabb
}
-
+
.toggle-switch.switch-solid span {
height: 20px;
}
@@ -843,7 +843,7 @@ label {
.table-bordered table>thead>tr>th:first-child, .table-bordered table>tbody>tr>td:first-child {
border-left: 1px solid #ddd;
}
-
+
.table-bordered table>thead>tr>th:last-child, .table-bordered table>tbody>tr>td:last-child {
border-right: 1px solid #ddd;
}
@@ -872,7 +872,7 @@ label {
background-color: #eff3f8;
}
-.fixed-table-container thead th >.both{
+.fixed-table-container thead th >.both{
display: inline-block
}
@@ -1040,12 +1040,12 @@ table.rc-table-resizing thead > th > a {
}
/** 表格列拖拽样式 **/
-.dragtable-sortable {
+.dragtable-sortable {
list-style-type: none; margin: 0; padding: 0; -moz-user-select: none;
}
.dragtable-sortable li {
- margin: 0; padding: 0; float: left; font-size: 1em; background: white;
+ margin: 0; padding: 0; float: left; font-size: 1em; background: white;
}
.dragtable-sortable th, .dragtable-sortable td{
@@ -1053,26 +1053,26 @@ table.rc-table-resizing thead > th > a {
}
.dragtable-sortable li:first-child th, .dragtable-sortable li:first-child td {
- border-left: 1px solid #CCC;
+ border-left: 1px solid #CCC;
}
.ui-sortable-helper {
opacity: 0.7;filter: alpha(opacity=70);
}
-.ui-sortable-placeholder {
+.ui-sortable-placeholder {
-moz-box-shadow: 4px 5px 4px #C6C6C6 inset;
-webkit-box-shadow: 4px 5px 4px #C6C6C6 inset;
box-shadow: 4px 5px 4px #C6C6C6 inset;
border-bottom: 1px solid #CCCCCC;
border-top: 1px solid #CCCCCC;
visibility: visible !important;
- background: #EFEFEF !important;
+ background: #EFEFEF !important;
visibility: visible !important;
}
-.ui-sortable-placeholder * {
- opacity: 0.0; visibility: hidden;
+.ui-sortable-placeholder * {
+ opacity: 0.0; visibility: hidden;
}
/** 表格选中样式 **/
diff --git a/ruoyi-admin/src/main/resources/templates/index-topnav.html b/ruoyi-admin/src/main/resources/templates/index-topnav.html
index 608dd60c..b90922ff 100644
--- a/ruoyi-admin/src/main/resources/templates/index-topnav.html
+++ b/ruoyi-admin/src/main/resources/templates/index-topnav.html
@@ -15,6 +15,7 @@
<link th:href="@{/css/style.min.css}" rel="stylesheet"/>
<link th:href="@{/css/skins.css?v=20200902}" rel="stylesheet"/>
<link th:href="@{/ruoyi/css/ry-ui.css?v=4.7.4}" rel="stylesheet"/>
+ <style type="text/css">.fixed-sidebar .nav:not(.navbar-toolbar)>li.active{border-left:0px!important;</style>
</head>
<body class="fixed-sidebar full-height-layout gray-bg" th:classappend="${isMobile} ? 'canvas-menu'" style="overflow: hidden">
<div id="wrapper">