style: 选项卡样式优化

GuangxingSun · Jun 22, 2019 · 6f5d918 · 6f5d918
1 parent 17ef6a3
commit 6f5d918
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 17 deletions.
diff --git a/ruoyi-admin/src/main/resources/static/css/skins.css b/ruoyi-admin/src/main/resources/static/css/skins.css
@@ -170,7 +170,7 @@
 }
 
 .skin-blue .content-tabs {
-	border-bottom: solid 2px #e7eaec;
+	border-bottom: 1px solid #e5e5e5;
 }
 
 .skin-blue.layout-top-nav>.logo {
@@ -189,7 +189,7 @@
 }
 
 .skin-green .content-tabs {
-	border-bottom: solid 2px #e7eaec;
+	border-bottom: 1px solid #e5e5e5;
 }
 
 .skin-green .navbar .nav>li>a {
@@ -436,7 +436,7 @@
 }
 
 .skin-red .content-tabs {
-	border-bottom: solid 2px #e7eaec;
+	border-bottom: 1px solid #e5e5e5;
 }
 
 .skin-red .nav>li>.treeview-menu {
@@ -595,8 +595,7 @@
 }
 
 .skin-yellow .content-tabs {
-
-	 border-bottom: solid 2px #e7eaec;
+	 border-bottom: 1px solid #e5e5e5;
 }
 
 .skin-yellow .nav>li>.treeview-menu {
@@ -755,8 +754,7 @@
 }
 
 .skin-purple .content-tabs {
-
-	 border-bottom: solid 2px #e7eaec;
+	 border-bottom: 1px solid #e5e5e5;
 }
 
 .skin-purple .nav>li>.treeview-menu {

diff --git a/ruoyi-admin/src/main/resources/static/css/style.css b/ruoyi-admin/src/main/resources/static/css/style.css
@@ -3247,15 +3247,15 @@ body.body-small .footer.fixed {
 /*CONTENTTABS*/
 .content-tabs {
     position: relative;
-    height: 42px;
+    height: 39px;
     background: #fafafa;
-    line-height: 40px;
+    line-height: 38px;
 }
 
 .content-tabs .roll-nav, .page-tabs-list {
     position: absolute;
-    width: 40px;
-    height: 40px;
+    width: 30px;
+    height: 38px;
     text-align: center;
     color: #999;
     z-index: 2;
@@ -3285,9 +3285,9 @@ body.body-small .footer.fixed {
 }
 
 nav.page-tabs {
-    margin-left: 40px;
+    margin-left: 30px;
     width: 100000px;
-    height: 40px;
+    height: 38px;
     overflow: hidden;
 }
 
@@ -3328,7 +3328,7 @@ nav.page-tabs .page-tabs-content {
 
 .roll-right.tabReload {
     background: #fff;
-    height: 40px;
+    height: 38px;
     width: 60px;
     outline: none;
 }
@@ -3338,7 +3338,7 @@ nav.page-tabs .page-tabs-content {
 }
 
 #content-main {
-    height: calc(100% - 140px);
+    height: calc(100% - 127px);
     overflow: hidden;
 }
 

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
@@ -146,6 +146,12 @@
 	margin-right: 5px
 }
 
+.nav-tabs-custom>.nav-tabs>li.header {
+	padding-left: 5px;
+	font-size: 16px;
+	line-height: 30px;
+}
+
 .nav-tabs-custom>.nav-tabs>li.disabled>a {
 	color: #777
 }
@@ -578,7 +584,7 @@ label {
 }
 
 .container-div {
-	padding: 10px 35px;
+	padding: 0px 28px;
 	height: 100%;
 }
 
@@ -827,7 +833,7 @@ label {
 .bootstrap-tree-table .treetable-table thead, .treetable-table tbody tr {display:table;width:100%;table-layout:fixed;}
 .bootstrap-tree-table .treetable-thead th{line-height:24px;border: 0 !important;border-radius: 4px;border-left:0px solid #e7eaec !important;border-bottom:1px solid #ccc!important;text-align: left;}
 .bootstrap-tree-table .treetable-thead tr :first-child{border-left:0 !important}
-.bootstrap-tree-table .treetable-tbody td{border: 0 !important;border-left:0px solid #e7eaec !important;border-bottom:1px solid #e7eaec!important;white-space: nowrap; text-overflow: ellipsis;}
+.bootstrap-tree-table .treetable-tbody td{overflow:hidden;border: 0 !important;border-left:0px solid #e7eaec !important;border-bottom:1px solid #e7eaec!important;white-space: nowrap; text-overflow: ellipsis;}
 .bootstrap-tree-table .treetable-tbody tr :first-child{border-left:0 !important}
 .bootstrap-tree-table .treetable-bars .tool-left, .bootstrap-tree-table .treetable-bars .tool-right{margin-top: 10px; margin-bottom: 10px;}
 .bootstrap-tree-table .treetable-bars .tool-left{float: left;}
@@ -911,4 +917,12 @@ label {
     height: 32px;
     display: block;
     float:left;
+}
+
+/** 表格拖拽样式 **/
+.reorder_rows_onDragClass td {
+    color:yellow!important;
+	background-color:#999!important;
+	text-shadow:0 0 10px black,0 0 10px black,0 0 8px black,0 0 6px black,0 0 6px black;
+	box-shadow:0 12px 14px -12px #111 inset,0 -2px 2px -1px #333 inset
 }