root/base_lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/admin' into acs_v1.0.0

Browse Source
This commit is contained in:
liyongde
2024-05-28 15:57:56 +08:00
parent e535909cf8 e388b3debe
commit 59d742dbd4
4 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nladmin-system/nlsso-server/src/main/java/org/nl/TEST333.java
View File

@@ -1,4 +0,0 @@
package org.nl;
public class TEST333 {
}

16
nladmin-ui/src/assets/styles/eladmin.scss
View File

@@ -1,5 +1,8 @@
.head-container { .head-container {
padding-bottom: 10px; padding-top: 4px;
padding-bottom: 6px;
background-color: #ffffff;
border-radius: 4px;
.filter-item { .filter-item {
display: inline-block; display: inline-block;
@@ -188,7 +191,7 @@ input[type="number"]::-webkit-outer-spin-button {
.el-table__fixed-header-wrapper { .el-table__fixed-header-wrapper {
th { th {
word-break: break-word; word-break: break-word;
background-color: #f8f8f9; background-color: #f5f5f5;
color: #515a6e; color: #515a6e;
height: 35px; height: 35px;
font-size: 13px; font-size: 13px;
@@ -215,4 +218,13 @@ input[type="number"]::-webkit-outer-spin-button {
.el-table--scrollable-y .el-table__body-wrapper { .el-table--scrollable-y .el-table__body-wrapper {
overflow-y: overlay !important; overflow-y: overlay !important;
} }
//左侧边框不显示start https://blog.csdn.net/m0_37922443/article/details/126487240
.el-table__row td:not(.is-hidden):last-child {
right: -1px;
}
thead th:not(.is-hidden):last-child {
right: -1px;
}
//左侧边框不显示end

5
nladmin-ui/src/assets/styles/index.scss
View File

@@ -21,6 +21,7 @@ label {
html { html {
height: 100%; height: 100%;
box-sizing: border-box; box-sizing: border-box;
//background-color: #eeeeee;
} }
#app { #app {
@@ -98,7 +99,7 @@ div:focus {
} }
aside { aside {
background: #eef1f6; background: #d40c70;
padding: 8px 24px; padding: 8px 24px;
margin-bottom: 20px; margin-bottom: 20px;
border-radius: 2px; border-radius: 2px;
@@ -122,7 +123,7 @@ aside {
//main-container全局样式 //main-container全局样式
.app-container { .app-container {
padding: 20px 20px 45px 20px; padding: 10px 20px 45px 10px;
} }
.components-container { .components-container {

14
nladmin-ui/src/assets/styles/variables.scss
View File

@@ -13,17 +13,17 @@ $base-logo-light-title-color: #001529;
$base-menu-light-background:#ffffff; $base-menu-light-background:#ffffff;
// sidebar // sidebar
$menuText:#bfcbd9; $menuText: #ffffff;
$menuActiveText:#409EFF; $menuActiveText:#409EFF;
$subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951 $subMenuActiveText: #ffffff; // https://github.com/ElemeFE/element/issues/12951
$menuBg:#304156; //https://cloud.tencent.com/developer/article/1753773 $menuBg: #001529; //https://cloud.tencent.com/developer/article/1753773
$menuHover:#263445; $menuHover:#4e5465;
$base-menu-light-color:rgba(0,0,0,.70); $base-menu-light-color:rgba(0,0,0,.70);
$subMenuBg:#1f2d3d; $subMenuBg:#000c17;
$subMenuHover:#001528; $subMenuHover:#4e5465;
$sideBarWidth: 205px; $sideBarWidth: 205px;
@@ -45,4 +45,4 @@ $sideBarWidth: 205px;
logoLightTitleColor: $base-logo-light-title-color logoLightTitleColor: $base-logo-light-title-color
} }
$base-sidebar-width: 200px; $base-sidebar-width: 2010px;