yvan/Study
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'gva-vue3-fedev' into last

Browse Source
This commit is contained in:
奇淼（piexlmax
2021-09-21 16:34:53 +08:00
committed by GitHub
parent d69243d720 c3480b3c49
commit cd576a1e02
42 changed files with 700 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/style/basics.scss
+3 -3
View File
@@ -1,6 +1,6 @@
// basice
$font-size: 14px;
$icon-size:17px;
$icon-size:18px;
$active-color:#1890ff;
$bg-main:#f0f2f5;
$border-color: #f4f4f4;
@@ -11,7 +11,7 @@ $el-icon-mini:24px;
$width-aside:220px;
$width-hideside-aside:54px;
$width-mobile-aside:210px;
$color-aside:rgba(255, 255, 255,.9);
$color-aside:rgba(255, 255, 255, .9);
$icon-arrow-size-aside:12px;
$width-submenu-aside:55px;
$bg-aside:#191a23;
@@ -34,4 +34,4 @@ $color-table-thead:#262626;
$height-car:68px;
// mobile
$padding-xs: 5px;
$margin-xs: 5px;
$margin-xs: 5px;
web/src/style/main.scss
+72 -56
View File
@@ -735,17 +735,15 @@ li {
.cell {
color: rgba($color: #000000, $alpha: 0.85);
font-size: 14px;
line-height: 40px;
min-height: 40px;
display: flex;
align-items: center;
}
}
td {
padding: 6px 0;
.cell {
min-height: 40px;
display: flex;
align-items: center;
line-height: 40px;
color: rgba($color: #000000, $alpha: 0.65);
}
}
@@ -763,11 +761,6 @@ li {
.upload {
padding: 0;
}
.el-form.el-form--inline {
.el-form-item:last-child {
margin-bottom: 0;
}
}
.edit_container,
.edit {
padding: 0;
@@ -776,13 +769,13 @@ li {
.el-input__suffix {
margin-top: -3px;
}
&.is-disabled{
&.is-disabled {
.el-input__suffix {
margin-top: 0px;
}
}
}
.el-cascader{
.el-cascader {
.el-input {
.el-input__suffix {
margin-top: 0px;
@@ -984,8 +977,8 @@ li {
background-color: $bg-main;
.menu-total {
cursor: pointer;
font-size: 22px;
color: #838383;
font-size: 24px;
color: #000000;
margin-top: 16px;
}
// background-color: #f0f2f5;
@@ -1112,11 +1105,9 @@ $mainHight: 100vh;
.layout-cont {
.right-box {
height: $height-header;
line-height: $height-header;
text-align: center;
vertical-align: middle;
margin-right: 10px;
display: flex;
justify-content: flex-end;
align-items: center;
img {
vertical-align: middle;
border: 1px solid #ccc;
@@ -1133,8 +1124,19 @@ $mainHight: 100vh;
height: $height-header;
line-height: $height-header;
display: inline-block;
background-color: #fff;
padding: 0;
margin-left: 46px;
font-size: 16px;
.el-breadcrumb__item {
.el-breadcrumb__inner {
color: rgba($color: #000000, $alpha: 0.45);
}
}
.el-breadcrumb__item:nth-last-child(1) {
.el-breadcrumb__inner {
color: rgba($color: #000000, $alpha: 0.65);
}
}
}
&.el-main {
overflow: auto;
@@ -1199,10 +1201,6 @@ $mainHight: 100vh;
}
}
.screenfull {
display: inline-block;
}
.header-avatar {
display: flex;
justify-content: center;
@@ -1210,10 +1208,8 @@ $mainHight: 100vh;
}
.search-component {
display: inline-block;
display: inline-flex;
overflow: hidden;
height: 60px;
width: 120px;
text-align: center;
.el-input__inner {
border: none;
@@ -1224,27 +1220,31 @@ $mainHight: 100vh;
}
.search-icon {
font-size: $icon-size;
margin-right: 14px;
display: inline-block;
vertical-align: middle;
box-sizing: border-box;
color: #606266;
color: rgba($color: #000000, $alpha: 0.65);
}
.dropdown-group {
min-width: 100px;
}
.user-box {
cursor: pointer;
margin-right: 24px;
color: rgba($color: #000000, $alpha: 0.65);
}
}
.transition-box {
overflow: hidden;
width: 120px;
margin-right: 32px;
text-align: center;
}
.screenfull {
overflow: hidden;
width: 40px;
text-align: center;
color: rgba($color: #000000, $alpha: 0.65);
}
.el-dropdown {
@@ -1414,11 +1414,29 @@ $mainHight: 100vh;
}
.gva-search-box {
.el-collapse {
border: none;
.el-collapse-item__header,
.el-collapse-item__wrap {
border-bottom: none;
}
}
padding: 24px;
padding-bottom: 2px;
background-color: #fff;
border-radius: 2px;
margin-bottom: 12px;
.el-form {
.el-form-item {
padding-right: 28px;
}
}
}
.gva-form-box {
padding: 24px;
background-color: #fff;
border-radius: 2px;
}
.gva-table-box {
@@ -1430,38 +1448,38 @@ $mainHight: 100vh;
.gva-pagination {
display: flex;
justify-content: flex-end;
.el-pagination__editor{
.el-input__inner{
.el-pagination__editor {
.el-input__inner {
height: 32px;
}
}
.el-pagination__total{
line-height: 32px !important;
.el-pagination__total {
line-height: 32px !important;
}
.btn-prev{
padding-right:6px;
.btn-prev {
padding-right: 6px;
display: inline-flex;
justify-content: center;
align-items: center;
width: 32px;
height: 32px;
}
.number{
.number {
display: inline-flex;
justify-content: center;
align-items: center;
width: 32px;
height: 32px;
}
.btn-quicknext{
.btn-quicknext {
display: inline-flex;
justify-content: center;
align-items: center;
width: 32px;
height: 32px;
}
.btn-next{
padding-left:6px;
.btn-next {
padding-left: 6px;
width: 32px;
height: 32px;
display: inline-flex;
@@ -1473,20 +1491,18 @@ $mainHight: 100vh;
border-radius: 2px;
color: #ffffff !important;
}
.el-pager li.active+li{
.el-pager li.active+li {
border-left: 1px solid #ddd !important;
}
.el-pagination__sizes{
.el-input{
.el-pagination__sizes {
.el-input {
.el-input__suffix {
margin-top: 2px;
}
}
}
.el-pagination__jump{
.el-pagination__editor{
}
.el-pagination__jump {
.el-pagination__editor {}
}
}
@@ -1504,29 +1520,29 @@ $mainHight: 100vh;
.el-dialog {
padding: 12px;
.el-dialog__body{
.el-dialog__body {
padding: 12px 6px;
}
.el-dialog__header{
.el-dialog__title{
.el-dialog__header {
.el-dialog__title {
font-size: 14px;
font-weight: 500;
}
padding: 2px 20px 12px 20px;
border-bottom: 1px solid #E4E4E4;
}
.el-dialog__headerbtn{
top:16px;
.el-dialog__headerbtn {
top: 16px;
}
.el-dialog__footer{
.el-dialog__footer {
margin-top: -12px;
padding: 0 0 16px 0;
.dialog-footer{
.el-button{
.dialog-footer {
.el-button {
padding-left: 24px;
padding-right: 24px;
}
.el-button+.el-button{
.el-button+.el-button {
margin-left: 30px;
}
}
web/src/style/mobile.scss
+66 -78
View File
@@ -1,89 +1,77 @@
@import '@/style/basics.scss';
@media screen and (min-width: 320px)and (max-width: 750px){
.el-header{
padding: 0 $padding-xs;
@media screen and (min-width: 320px)and (max-width: 750px) {
.el-header {
padding: 0 $padding-xs;
}
.layout-cont {
.main-cont {
.breadcrumb {
padding: 0 $padding-xs;
}
}
.layout-cont {
.main-cont{
.breadcrumb{
padding: 0 $padding-xs;
}
.layout-cont {
.right-box {
margin-right: $margin-xs;
}
}
.el-main {
.admin-box {
margin-left: 0;
margin-right: 0;
}
.big.admin-box {
padding: 0;
}
.big {
.bottom {
.chart-player {
height: auto!important;
margin-bottom: 15px;
}
.todoapp {
background-color: #fff;
padding-bottom: 10px;
}
}
}
.layout-cont{
.right-box{
margin-right: $margin-xs;
}
}
.search-component{
width: 30px;
}
.screenfull{
width: 26px;
text-align: center;
}
.el-main{
.admin-box{
margin-left: 0;
margin-right: 0;
}
.big.admin-box{
padding: 0;
}
.big {
.bottom {
.chart-player{
height: auto!important;
margin-bottom: 15px;
}
.todoapp{
background-color: #fff;
padding-bottom: 10px;
}
}
}
}
.card .car-left,
.card .car-right{
}
.card .car-left,
.card .car-right {
width: 100%;
height: 100%;
}
.card {
padding-left: $padding-xs;
padding-right: $padding-xs;
}
.card {
.text {
width: 100%;
height: 100%;
}
.card{
padding-left: $padding-xs;
padding-right: $padding-xs;
}
.card {
.text{
width: 100%;
h4{
white-space: break-spaces;
}
h4 {
white-space: break-spaces;
}
}
.shadow{
margin-left: 4px;
margin-right: 4px;
.grid-content{
margin-bottom: 10px;
padding: 0;
}
}
.shadow {
margin-left: 4px;
margin-right: 4px;
.grid-content {
margin-bottom: 10px;
padding: 0;
}
.el-dialog{
width: 90%;
}
.el-dialog {
width: 90%;
}
.el-transfer {
.el-transfer-panel {
width: 40%;
display: inline-block;
}
.el-transfer{
.el-transfer-panel{
width: 40%;
display: inline-block;
}
.el-transfer__buttons{
padding: 0 5px;
display: inline-block;
}
.el-transfer__buttons {
padding: 0 5px;
display: inline-block;
}
}
}
}