Skip to content

Commit 10a5390

Browse files
committed
全局css
1 parent d04acfd commit 10a5390

File tree

5 files changed

+184
-4
lines changed

5 files changed

+184
-4
lines changed

web/src/style/main.scss

Lines changed: 178 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,6 +621,9 @@ li {
621621
padding: 0 15px;
622622
border-left: 1px solid #ebeef5;
623623
border-right: 1px solid #ebeef5;
624+
.demo-form-inline{
625+
margin-bottom: 10px;
626+
}
624627
}
625628

626629
// table
@@ -662,6 +665,7 @@ li {
662665
border-radius: 4px;
663666
}
664667
}
668+
padding: 20px 0!important;
665669
}
666670

667671

@@ -845,4 +849,177 @@ li {
845849
}
846850
}
847851

848-
// 导航*****
852+
// 导航*****
853+
854+
855+
856+
// add 5.13
857+
.el-container{
858+
.admin-box{
859+
padding: 24px 24px 40px 24px;
860+
margin: 115px 24px;
861+
border-radius: 2px;
862+
.button-box{
863+
border: none;
864+
padding: 0 0 10px 0px;
865+
}
866+
.el-table--border{
867+
border-radius: 4px;
868+
margin-bottom: 15px;
869+
}
870+
.el-table--border {
871+
th{
872+
border-left: 1px solid #e8e8e8;
873+
}
874+
}
875+
876+
.el-table{
877+
th{
878+
padding: 5px 0;
879+
.cell{
880+
min-height: 34px;
881+
line-height: 34px;
882+
883+
}
884+
}
885+
td{
886+
padding: 8px 0;
887+
}
888+
td,
889+
th.is-leaf{
890+
border-bottom: 1px solid #e8e8e8;
891+
}
892+
}
893+
894+
.el-table__body-wrapper{
895+
tr{
896+
td{
897+
padding: 5px 0;
898+
.cell{
899+
height: 34px;
900+
line-height: 34px;
901+
overflow: hidden;
902+
}
903+
}
904+
905+
}
906+
.el-cascader{
907+
line-height: 34px;
908+
}
909+
}
910+
.upload{
911+
.el-table__body-wrapper{
912+
tr{
913+
td{
914+
padding: 5px 0;
915+
.cell{
916+
height: auto;
917+
918+
}
919+
}
920+
}
921+
}
922+
}
923+
.search-term{
924+
border-left: none;
925+
border-right: none;
926+
padding: 0 5px;
927+
.el-form-item{
928+
margin-bottom: 10px;
929+
}
930+
}
931+
.el-pagination{
932+
padding: 20px 0 0 0;
933+
}
934+
.upload-demo, .upload{
935+
padding: 0;
936+
}
937+
.system{
938+
padding: 0;
939+
}
940+
.el-form.el-form--inline{
941+
.el-form-item:last-child{
942+
margin-bottom: 0;
943+
}
944+
}
945+
.edit_container,
946+
.edit{
947+
padding: 0;
948+
}
949+
}
950+
.admin-box:after,
951+
.admin-box:before {
952+
content: "";
953+
display: block;
954+
clear: both;
955+
}
956+
.tips{
957+
margin-top: 10px;
958+
font-size: 14px;
959+
font-weight: 400;
960+
color: #606266;
961+
}
962+
}
963+
.el-container.layout-cont{
964+
.header-cont,.breadcrumb{
965+
height: 40px !important;
966+
line-height: 40px !important;
967+
}
968+
.main-cont.el-main{
969+
background-color: #f0f2f5;
970+
.menu-total{
971+
font-size: 22px;
972+
color: #838383;
973+
margin-top: 7px;
974+
}
975+
// background-color: #f0f2f5;
976+
}
977+
}
978+
979+
.el-container.layout-cont{
980+
.main-cont{
981+
.router-history{
982+
padding-bottom: 8px;
983+
padding-top: 5px;
984+
border-color: #f9f9f9;
985+
box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
986+
.el-tabs__header{
987+
margin: 0px 0 0 0 ;
988+
.el-tabs__item{
989+
line-height: 35px;
990+
height: 35px;
991+
}
992+
}
993+
}
994+
}
995+
996+
}
997+
998+
.el-table__row{
999+
.el-button.el-button--text.el-button--small{
1000+
position:relative;
1001+
}
1002+
.el-button.el-button--text.el-button--small::after{
1003+
content: '';
1004+
position: absolute;
1005+
width: 1px;
1006+
height: 50%;
1007+
top: 5px;
1008+
margin-left: 15px;
1009+
background-color: #e8e8e8;
1010+
}
1011+
.cell{
1012+
button:last-child::after{
1013+
content: ''!important;
1014+
position: absolute!important;
1015+
width: 0px!important;
1016+
}
1017+
}
1018+
}
1019+
1020+
.clear:after,
1021+
.clear:before {
1022+
content: "";
1023+
display: block;
1024+
clear: both;
1025+
}

web/src/view/dashboard/index.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,8 @@ export default {
168168

169169
<style lang="scss" scoped>
170170
.big{
171+
margin:100px 0 0 0;
172+
padding-top: 0;
171173
background-color: rgb(243,243,243);;
172174
.top{
173175
width: 98%;

web/src/view/example/breakpoint/breakpoint.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<!-- <span
2323
v-if="this.file"
2424
>{{Math.floor(((this.formDataList.length-this.waitNum)/this.formDataList.length)*100)}}%</span> -->
25-
<h2 class="tips">此版本为先行体验功能测试版,样式美化和性能优化正在进行中,上传切片文件和合成的完整文件分别再QMPlusserver目录的breakpointDir文件夹和fileDir文件夹</h2>
25+
<div class="tips">此版本为先行体验功能测试版,样式美化和性能优化正在进行中,上传切片文件和合成的完整文件分别再QMPlusserver目录的breakpointDir文件夹和fileDir文件夹</div>
2626
</div>
2727
</template>
2828
<script>

web/src/view/example/customer/customer.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@
6161
<el-button @click="closeDialog">取 消</el-button>
6262
<el-button @click="enterDialog" type="primary">确 定</el-button>
6363
</div>
64-
</el-dialog>在资源权限中将此角色的资源权限清空 或者不包含创建者的角色 即可屏蔽此客户资源的显示
64+
</el-dialog>
65+
<div class="tips"> 在资源权限中将此角色的资源权限清空 或者不包含创建者的角色 即可屏蔽此客户资源的显示</div>
6566
</div>
6667
</template>
6768

web/src/view/superAdmin/user/user.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<el-table-column label="头像" min-width="50">
88
<template slot-scope="scope">
99
<div :style="{'textAlign':'center'}">
10-
<img :src="scope.row.headerImg" height="50" width="50" />
10+
<img :src="scope.row.headerImg" height="35" width="35" />
1111
</div>
1212
</template>
1313
</el-table-column>

0 commit comments

Comments
 (0)