Browse Source

全局css

1319612909 4 years ago
parent
commit
82f05537ee

+ 178 - 1
web/src/style/main.scss

@@ -621,6 +621,9 @@ li {
     padding: 0 15px;
     border-left: 1px solid #ebeef5;
     border-right: 1px solid #ebeef5;
+    .demo-form-inline{
+        margin-bottom: 10px;
+    }
 }
 
 // table
@@ -662,6 +665,7 @@ li {
             border-radius: 4px;
         }
     }
+    padding: 20px 0!important;
 }
 
 
@@ -845,4 +849,177 @@ li {
     }
 }
 
-// 导航*****
+// 导航*****
+
+
+
+// add 5.13
+.el-container{
+    .admin-box{
+        padding: 24px 24px 40px 24px;
+        margin: 115px 24px;
+        border-radius: 2px;
+        .button-box{
+            border: none;
+            padding: 0 0 10px 0px;
+        }
+        .el-table--border{
+            border-radius: 4px;
+            margin-bottom: 15px;
+        }
+        .el-table--border {
+            th{
+                border-left: 1px solid #e8e8e8;
+            }
+        }
+        
+        .el-table{
+            th{
+                padding: 5px 0;
+                .cell{
+                    min-height: 34px;
+                    line-height: 34px;
+                   
+                }
+            }
+            td{
+                padding: 8px 0;
+            }
+            td,
+            th.is-leaf{
+                border-bottom: 1px solid #e8e8e8;
+            }
+        }
+       
+        .el-table__body-wrapper{
+            tr{
+                td{
+                    padding: 5px 0;
+                    .cell{
+                        height: 34px;
+                        line-height: 34px;
+                        overflow: hidden;
+                    }
+                }
+                
+            }
+            .el-cascader{
+                line-height: 34px;
+            }
+        }
+        .upload{
+            .el-table__body-wrapper{
+                tr{
+                    td{
+                        padding: 5px 0;
+                        .cell{
+                            height: auto;
+                           
+                        }
+                    }
+                }
+            }
+        }
+        .search-term{
+            border-left: none;
+            border-right: none;
+            padding: 0 5px;
+            .el-form-item{
+                margin-bottom: 10px;
+            }
+        }
+        .el-pagination{
+            padding: 20px 0 0 0;
+        }
+        .upload-demo, .upload{
+            padding: 0;
+        }
+        .system{
+            padding: 0;
+        }
+        .el-form.el-form--inline{
+         .el-form-item:last-child{
+             margin-bottom: 0;
+         }   
+        }
+        .edit_container,
+        .edit{
+            padding: 0;
+        }
+    }
+    .admin-box:after,
+    .admin-box:before {
+        content: "";
+        display: block;
+        clear: both;
+    }
+    .tips{
+        margin-top: 10px;
+        font-size: 14px;
+        font-weight: 400;
+        color: #606266;
+      }
+}
+.el-container.layout-cont{
+    .header-cont,.breadcrumb{
+        height: 40px !important;
+        line-height: 40px !important;
+    }
+    .main-cont.el-main{
+        background-color: #f0f2f5;
+        .menu-total{
+            font-size: 22px;
+            color: #838383;
+            margin-top: 7px;
+        }
+            // background-color: #f0f2f5;
+        }
+} 
+
+.el-container.layout-cont{
+    .main-cont{
+        .router-history{
+            padding-bottom: 8px;
+            padding-top: 5px;
+            border-color: #f9f9f9;
+            box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
+            .el-tabs__header{
+                margin: 0px 0 0 0 ;
+                .el-tabs__item{
+                    line-height: 35px;
+                    height: 35px;
+                }
+            }
+        }
+    }
+    
+}  
+
+.el-table__row{
+    .el-button.el-button--text.el-button--small{
+        position:relative;
+    }
+    .el-button.el-button--text.el-button--small::after{
+        content: '';
+        position: absolute;
+        width: 1px;
+        height: 50%;
+        top: 5px;
+        margin-left: 15px;
+        background-color: #e8e8e8;
+    }
+    .cell{
+         button:last-child::after{
+            content: ''!important;
+             position: absolute!important;
+            width: 0px!important;
+         }
+    } 
+}
+
+  .clear:after,
+  .clear:before {
+      content: "";
+      display: block;
+      clear: both;
+  }

+ 2 - 0
web/src/view/dashboard/index.vue

@@ -168,6 +168,8 @@ export default {
 
 <style lang="scss" scoped>
     .big{
+        margin:100px 0 0 0;
+        padding-top: 0;
         background-color: rgb(243,243,243);;
         .top{
             width: 98%;

+ 1 - 1
web/src/view/example/breakpoint/breakpoint.vue

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

+ 2 - 1
web/src/view/example/customer/customer.vue

@@ -61,7 +61,8 @@
         <el-button @click="closeDialog">取 消</el-button>
         <el-button @click="enterDialog" type="primary">确 定</el-button>
       </div>
-    </el-dialog>在资源权限中将此角色的资源权限清空 或者不包含创建者的角色 即可屏蔽此客户资源的显示
+    </el-dialog>
+    <div class="tips"> 在资源权限中将此角色的资源权限清空 或者不包含创建者的角色 即可屏蔽此客户资源的显示</div>
   </div>
 </template>
 

+ 1 - 1
web/src/view/superAdmin/user/user.vue

@@ -7,7 +7,7 @@
       <el-table-column label="头像" min-width="50">
         <template slot-scope="scope">
           <div :style="{'textAlign':'center'}">
-            <img :src="scope.row.headerImg" height="50" width="50" />
+            <img :src="scope.row.headerImg" height="35" width="35" />
           </div>
         </template>
       </el-table-column>