liuxiangqi пре 1 година
родитељ
комит
991ca11828

BIN
src/assets/fonts/V9sHRHS3tq3N.woff


BIN
src/assets/fonts/V9sHRHS3tq3N.woff2


+ 9 - 0
src/assets/fonts/font.css

@@ -0,0 +1,9 @@
+@font-face {
+  font-family: "Title";
+  color: #5e5c5a;
+  /* font-weight: 700; */
+  src: url("V9sHRHS3tq3N.woff") format("woff"),
+  url("V9sHRHS3tq3N.woff2") format("woff2");
+  font-display: swap;
+  font-size: 20px;
+}

BIN
src/assets/fonts/tGXXVfUehw2b.woff


BIN
src/assets/fonts/tGXXVfUehw2b.woff2


+ 27 - 0
src/assets/styles/index.scss

@@ -849,3 +849,30 @@ $border: #ddd;
 .pd10 {
   padding: 10px 0;
 }
+
+.box-card {
+  .el-card__body {
+    height: 370px;
+  }
+}
+/**
+改变边框颜色
+ */
+ .el-table--border, .el-table--group {
+    border: 1px solid #AAAAAA!important;
+}
+/**
+改变表格内竖线颜色
+ */
+ .el-table--border  td, .el-table--border th, .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed {
+    border-right: 1px solid #AAAAAA!important;
+}
+/**
+改变表格内行线颜色
+ */
+ .el-table  td, .el-table th.is-leaf  {
+    border-bottom: 1px solid #AAAAAA!important;
+}
+.el-table thead tr th{
+    border-color: #AAAAAA;
+}

+ 3 - 2
src/layout/components/Sidebar/Logo.vue

@@ -79,8 +79,9 @@ export default {
       font-weight: 600;
       line-height: 50px;
       font-size: 16px;
-      font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
-      vertical-align: middle;
+      // font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
+      vertical-align: middle;
+      font-family: "Title" !important;
     }
   }
 

+ 2 - 1
src/main.js

@@ -3,7 +3,8 @@ import Vue from 'vue'
 import Cookies from 'js-cookie'
 
 import Element from 'element-ui'
-import './assets/styles/element-variables.scss'
+import './assets/styles/element-variables.scss'
+import './assets/fonts/font.css'
 
 import '@/assets/styles/index.scss' // global css
 import '@/assets/styles/ruoyi.scss' // ruoyi css

+ 2 - 1
src/views/login.vue

@@ -222,7 +222,8 @@ export default {
 .login-title {
   margin: 0px auto 30px auto;
   text-align: center;
-  color: #707070;
+  color: #707070;
+  font-family: "Title" !important;
 }
 
 .login-form {

+ 1 - 1
src/views/system/user/profile/index.vue

@@ -45,7 +45,7 @@
             <span>基本资料</span>
           </div>
           <el-tabs v-model="activeTab">
-            <el-tab-pane label="基本资料" name="userinfo">
+            <el-tab-pane label="用户信息" name="userinfo">
               <userInfo :user="user" />
             </el-tab-pane>
             <el-tab-pane label="修改密码" name="resetPwd">