Browse Source

font-size: 13px 引用 @font-size-base

Yahoo 4 năm trước cách đây
mục cha
commit
da7d2e29ed

+ 1 - 1
src/components/ContentHeader/ContentHeader.vue

@@ -36,7 +36,7 @@ export default {
   margin-bottom: 20px;
   .widget-title {
     position: relative;
-    font-size: 15px;
+    font-size: 14px;
     &::before {
       content: '';
       position: absolute;

+ 2 - 2
src/components/GlobalFooter/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <global-footer class="footer custom-render">
+  <global-footer v-if="visibility" class="footer custom-render">
     <template v-slot:links>
       <!-- <a href="https://www.github.com/vueComponent/pro-layout" target="_blank">Pro Layout</a>
       <a href="https://www.github.com/vueComponent/ant-design-vue-pro" target="_blank">Github</a>
@@ -21,8 +21,8 @@ export default {
     GlobalFooter
   },
   data () {
-    // 注:未经官方授权不得修改版权信息
     return {
+      visibility: false,
       copyright: 'Copyright © 2021 萤火科技 |',
       link: {
         text: 'YIOVO.COM',

+ 1 - 1
src/components/GlobalHeader/AvatarDropdown.vue

@@ -68,7 +68,7 @@ export default {
   /deep/ .ant-dropdown-menu-item {
     min-width: 130px;
     padding-left: 20px;
-    font-size: 13px;
+     font-size: @font-size-base;
   }
 }
 </style>

+ 1 - 1
src/components/Modal/AreasModal/AreasModal.vue

@@ -313,7 +313,7 @@ export default {
     padding: 0 10px;
   }
   .areas-title {
-    font-size: 14px;
+    font-size: @font-size-base;
     width: 95%;
     .areas-flip {
       margin-right: 17px;

+ 137 - 103
src/components/SettingDrawer/SettingDrawer.vue

@@ -10,31 +10,32 @@
       style="position: absolute"
     >
       <div class="setting-drawer-index-content">
-
         <div :style="{ marginBottom: '24px' }">
           <h3 class="setting-drawer-index-title">整体风格设置</h3>
 
           <div class="setting-drawer-index-blockChecbox">
             <a-tooltip>
-              <template slot="title">
-                暗色菜单风格
-              </template>
+              <template slot="title">暗色菜单风格</template>
               <div class="setting-drawer-index-item" @click="handleMenuTheme('dark')">
-                <img src="https://gw.alipayobjects.com/zos/rmsportal/LCkqqYNmvBEbokSDscrm.svg" alt="dark">
+                <img
+                  src="https://gw.alipayobjects.com/zos/rmsportal/LCkqqYNmvBEbokSDscrm.svg"
+                  alt="dark"
+                />
                 <div class="setting-drawer-index-selectIcon" v-if="navTheme === 'dark'">
-                  <a-icon type="check"/>
+                  <a-icon type="check" />
                 </div>
               </div>
             </a-tooltip>
 
             <a-tooltip>
-              <template slot="title">
-                亮色菜单风格
-              </template>
+              <template slot="title">亮色菜单风格</template>
               <div class="setting-drawer-index-item" @click="handleMenuTheme('light')">
-                <img src="https://gw.alipayobjects.com/zos/rmsportal/jpRkZQMyYRryryPNtyIC.svg" alt="light">
+                <img
+                  src="https://gw.alipayobjects.com/zos/rmsportal/jpRkZQMyYRryryPNtyIC.svg"
+                  alt="light"
+                />
                 <div class="setting-drawer-index-selectIcon" v-if="navTheme !== 'dark'">
-                  <a-icon type="check"/>
+                  <a-icon type="check" />
                 </div>
               </div>
             </a-tooltip>
@@ -45,15 +46,16 @@
           <h3 class="setting-drawer-index-title">主题色</h3>
 
           <div style="height: 20px">
-            <a-tooltip class="setting-drawer-theme-color-colorBlock" v-for="(item, index) in colorList" :key="index">
-              <template slot="title">
-                {{ item.key }}
-              </template>
+            <a-tooltip
+              class="setting-drawer-theme-color-colorBlock"
+              v-for="(item, index) in colorList"
+              :key="index"
+            >
+              <template slot="title">{{ item.key }}</template>
               <a-tag :color="item.color" @click="changeColor(item.color)">
                 <a-icon type="check" v-if="item.color === primaryColor"></a-icon>
               </a-tag>
             </a-tooltip>
-
           </div>
         </div>
         <a-divider />
@@ -63,25 +65,27 @@
 
           <div class="setting-drawer-index-blockChecbox">
             <a-tooltip>
-              <template slot="title">
-                侧边栏导航
-              </template>
+              <template slot="title">侧边栏导航</template>
               <div class="setting-drawer-index-item" @click="handleLayout('sidemenu')">
-                <img src="https://gw.alipayobjects.com/zos/rmsportal/JopDzEhOqwOjeNTXkoje.svg" alt="sidemenu">
+                <img
+                  src="https://gw.alipayobjects.com/zos/rmsportal/JopDzEhOqwOjeNTXkoje.svg"
+                  alt="sidemenu"
+                />
                 <div class="setting-drawer-index-selectIcon" v-if="layoutMode === 'sidemenu'">
-                  <a-icon type="check"/>
+                  <a-icon type="check" />
                 </div>
               </div>
             </a-tooltip>
 
             <a-tooltip>
-              <template slot="title">
-                顶部栏导航
-              </template>
+              <template slot="title">顶部栏导航</template>
               <div class="setting-drawer-index-item" @click="handleLayout('topmenu')">
-                <img src="https://gw.alipayobjects.com/zos/rmsportal/KDNDBbriJhLwuqMoxcAr.svg" alt="topmenu">
+                <img
+                  src="https://gw.alipayobjects.com/zos/rmsportal/KDNDBbriJhLwuqMoxcAr.svg"
+                  alt="topmenu"
+                />
                 <div class="setting-drawer-index-selectIcon" v-if="layoutMode !== 'sidemenu'">
-                  <a-icon type="check"/>
+                  <a-icon type="check" />
                 </div>
               </div>
             </a-tooltip>
@@ -90,10 +94,13 @@
             <a-list :split="false">
               <a-list-item>
                 <a-tooltip slot="actions">
-                  <template slot="title">
-                    该设定仅 [顶部栏导航] 时有效
-                  </template>
-                  <a-select size="small" style="width: 80px;" :defaultValue="contentWidth" @change="handleContentWidthChange">
+                  <template slot="title">该设定仅 [顶部栏导航] 时有效</template>
+                  <a-select
+                    size="small"
+                    style="width: 80px;"
+                    :defaultValue="contentWidth"
+                    @change="handleContentWidthChange"
+                  >
                     <a-select-option value="Fixed">固定</a-select-option>
                     <a-select-option value="Fluid" v-if="layoutMode !== 'sidemenu'">流式</a-select-option>
                   </a-select>
@@ -103,13 +110,24 @@
                 </a-list-item-meta>
               </a-list-item>
               <a-list-item>
-                <a-switch slot="actions" size="small" :defaultChecked="fixedHeader" @change="handleFixedHeader" />
+                <a-switch
+                  slot="actions"
+                  size="small"
+                  :defaultChecked="fixedHeader"
+                  @change="handleFixedHeader"
+                />
                 <a-list-item-meta>
                   <div slot="title">固定 Header</div>
                 </a-list-item-meta>
               </a-list-item>
               <a-list-item>
-                <a-switch slot="actions" size="small" :disabled="!fixedHeader" :defaultChecked="autoHideHeader" @change="handleFixedHeaderHidden" />
+                <a-switch
+                  slot="actions"
+                  size="small"
+                  :disabled="!fixedHeader"
+                  :defaultChecked="autoHideHeader"
+                  @change="handleFixedHeaderHidden"
+                />
                 <a-list-item-meta>
                   <a-tooltip slot="title" placement="left">
                     <template slot="title">固定 Header 时可配置</template>
@@ -117,10 +135,19 @@
                   </a-tooltip>
                 </a-list-item-meta>
               </a-list-item>
-              <a-list-item >
-                <a-switch slot="actions" size="small" :disabled="(layoutMode === 'topmenu')" :defaultChecked="fixSiderbar" @change="handleFixSiderbar" />
+              <a-list-item>
+                <a-switch
+                  slot="actions"
+                  size="small"
+                  :disabled="(layoutMode === 'topmenu')"
+                  :defaultChecked="fixSiderbar"
+                  @change="handleFixSiderbar"
+                />
                 <a-list-item-meta>
-                  <div slot="title" :style="{ textDecoration: layoutMode === 'topmenu' ? 'line-through' : 'unset' }">固定侧边菜单</div>
+                  <div
+                    slot="title"
+                    :style="{ textDecoration: layoutMode === 'topmenu' ? 'line-through' : 'unset' }"
+                  >固定侧边菜单</div>
                 </a-list-item-meta>
               </a-list-item>
             </a-list>
@@ -133,13 +160,23 @@
           <div>
             <a-list :split="false">
               <a-list-item>
-                <a-switch slot="actions" size="small" :defaultChecked="colorWeak" @change="onColorWeak" />
+                <a-switch
+                  slot="actions"
+                  size="small"
+                  :defaultChecked="colorWeak"
+                  @change="onColorWeak"
+                />
                 <a-list-item-meta>
                   <div slot="title">色弱模式</div>
                 </a-list-item-meta>
               </a-list-item>
               <a-list-item>
-                <a-switch slot="actions" size="small" :defaultChecked="multiTab" @change="onMultiTab" />
+                <a-switch
+                  slot="actions"
+                  size="small"
+                  :defaultChecked="multiTab"
+                  @change="onMultiTab"
+                />
                 <a-list-item-meta>
                   <div slot="title">多页签模式</div>
                 </a-list-item-meta>
@@ -149,22 +186,21 @@
         </div>
         <a-divider />
         <div :style="{ marginBottom: '24px' }">
-          <a-button
-            @click="doCopy"
-            icon="copy"
-            block
-          >拷贝设置</a-button>
+          <a-button @click="doCopy" icon="copy" block>拷贝设置</a-button>
           <a-alert type="warning" :style="{ marginTop: '24px' }">
             <span slot="message">
               配置栏只在开发环境用于预览,生产环境不会展现,请手动修改配置文件。修改配置文件后,需要清空本地缓存和LocalStorage
-              <a href="https://github.com/sendya/ant-design-pro-vue/blob/master/src/config/defaultSettings.js" target="_blank">src/config/defaultSettings.js</a>
+              <a
+                href="https://github.com/sendya/ant-design-pro-vue/blob/master/src/config/defaultSettings.js"
+                target="_blank"
+              >src/config/defaultSettings.js</a>
             </span>
           </a-alert>
         </div>
       </div>
       <div class="setting-drawer-index-handle" @click="toggle" slot="handle">
-        <a-icon type="setting" v-if="!visible"/>
-        <a-icon type="close" v-else/>
+        <a-icon type="setting" v-if="!visible" />
+        <a-icon type="close" v-else />
       </div>
     </a-drawer>
   </div>
@@ -269,75 +305,73 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.setting-drawer-index-content {
+  .setting-drawer-index-blockChecbox {
+    display: flex;
 
-  .setting-drawer-index-content {
-
-    .setting-drawer-index-blockChecbox {
-      display: flex;
-
-      .setting-drawer-index-item {
-        margin-right: 16px;
-        position: relative;
-        border-radius: 4px;
-        cursor: pointer;
-
-        img {
-          width: 48px;
-        }
+    .setting-drawer-index-item {
+      margin-right: 16px;
+      position: relative;
+      border-radius: 4px;
+      cursor: pointer;
 
-        .setting-drawer-index-selectIcon {
-          position: absolute;
-          top: 0;
-          right: 0;
-          width: 100%;
-          padding-top: 15px;
-          padding-left: 24px;
-          height: 100%;
-          color: #1890ff;
-          font-size: 14px;
-          font-weight: 700;
-        }
+      img {
+        width: 48px;
       }
-    }
-    .setting-drawer-theme-color-colorBlock {
-      width: 20px;
-      height: 20px;
-      border-radius: 2px;
-      float: left;
-      cursor: pointer;
-      margin-right: 8px;
-      padding-left: 0px;
-      padding-right: 0px;
-      text-align: center;
-      color: #fff;
-      font-weight: 700;
 
-      i {
-        font-size: 14px;
+      .setting-drawer-index-selectIcon {
+        position: absolute;
+        top: 0;
+        right: 0;
+        width: 100%;
+        padding-top: 15px;
+        padding-left: 24px;
+        height: 100%;
+        color: #1890ff;
+        font-size: @font-size-base;
+        font-weight: 700;
       }
     }
   }
-
-  .setting-drawer-index-handle {
-    position: absolute;
-    top: 240px;
-    background: #1890ff;
-    width: 48px;
-    height: 48px;
-    right: 300px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
+  .setting-drawer-theme-color-colorBlock {
+    width: 20px;
+    height: 20px;
+    border-radius: 2px;
+    float: left;
     cursor: pointer;
-    pointer-events: auto;
-    z-index: 1001;
+    margin-right: 8px;
+    padding-left: 0px;
+    padding-right: 0px;
     text-align: center;
-    font-size: 16px;
-    border-radius: 4px 0 0 4px;
+    color: #fff;
+    font-weight: 700;
 
     i {
-      color: rgb(255, 255, 255);
-      font-size: 20px;
+      font-size: @font-size-base;
     }
   }
+}
+
+.setting-drawer-index-handle {
+  position: absolute;
+  top: 240px;
+  background: #1890ff;
+  width: 48px;
+  height: 48px;
+  right: 300px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  cursor: pointer;
+  pointer-events: auto;
+  z-index: 1001;
+  text-align: center;
+  font-size: 16px;
+  border-radius: 4px 0 0 4px;
+
+  i {
+    color: rgb(255, 255, 255);
+    font-size: 20px;
+  }
+}
 </style>

+ 9 - 11
src/components/SettingDrawer/SettingItem.vue

@@ -2,7 +2,7 @@
   <div class="setting-drawer-index-item">
     <h3 class="setting-drawer-index-title">{{ title }}</h3>
     <slot></slot>
-    <a-divider v-if="divider"/>
+    <a-divider v-if="divider" />
   </div>
 </template>
 
@@ -23,16 +23,14 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.setting-drawer-index-item {
+  margin-bottom: 24px;
 
-  .setting-drawer-index-item {
-    margin-bottom: 24px;
-
-    .setting-drawer-index-title {
-      font-size: 14px;
-      color: rgba(0, 0, 0, .85);
-      line-height: 22px;
-      margin-bottom: 12px;
-    }
-
+  .setting-drawer-index-title {
+    font-size: @font-size-base;
+    color: rgba(0, 0, 0, 0.85);
+    line-height: 22px;
+    margin-bottom: 12px;
   }
+}
 </style>

+ 1 - 1
src/components/Table/GoodsItem/GoodsItem.vue

@@ -76,7 +76,7 @@ export default {
     width: 200px;
     height: @size;
     .title {
-      font-size: 13px;
+      font-size: @font-size-base;
       margin-bottom: 5px;
     }
     .subtitle {

+ 1 - 1
src/components/tree/style/index.less

@@ -92,7 +92,7 @@
               width    : 24px;
               height   : @tree-title-height;
               color    : @primary-color;
-              font-size: 14px;
+              font-size: @font-size-base;
               transform: none;
 
               svg {

+ 28 - 31
src/global.less

@@ -1,7 +1,6 @@
 @import '~ant-design-vue/es/style/themes/default.less';
 @import './utils/utils.less';
 
-@test: 13px;
 
 // 滚动条样式
 ::-webkit-scrollbar {
@@ -22,13 +21,29 @@ body,
   height: 100%;
 }
 
+body {
+  text-rendering: optimizeLegibility;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
 iframe {
   border: 0;
 }
 
+ul,
+ol {
+  list-style: none;
+}
+
 p {
   // margin: 0 !important
-  margin: 0
+  margin: 0;
+  margin-bottom: 0 !important;
+}
+
+canvas {
+  display: block;
 }
 
 .colorWeak {
@@ -40,21 +55,6 @@ p {
   min-height: 100vh;
 }
 
-canvas {
-  display: block;
-}
-
-body {
-  text-rendering: optimizeLegibility;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-ul,
-ol {
-  list-style: none;
-}
-
 // 数据列表 样式
 .table-alert {
   margin-bottom: 16px;
@@ -106,8 +106,8 @@ ol {
 
 // 内容页card组件标题
 .card-title {
-  font-size: 16px;
-  margin-bottom: 16px;
+  font-size: 14.5px;
+  margin-bottom: 18px;
   color: rgba(0, 0, 0, 0.75);
 }
 
@@ -142,7 +142,7 @@ ol {
 
   .ant-form-explain,
   .ant-form-extra {
-    font-size: 13px;
+    font-size: 12.5px;
   }
 
   .form-item-help {
@@ -151,7 +151,7 @@ ol {
     line-height: 1.5;
     padding-top: 4px;
     min-height: 22px;
-    margin-top: -2px;
+    // margin-top: -2px;
     transition: color 0.3s cubic-bezier(0.215, 0.61, 0.355, 1);
 
     a {
@@ -161,11 +161,11 @@ ol {
     .extra,
     small {
       color: rgba(0, 0, 0, 0.45);
-      font-size: 13px !important;
+      font-size: 12.5px !important;
     }
 
     .extra {
-      margin-bottom: 5px;
+      margin-bottom: 4px !important;
     }
   }
 }
@@ -180,7 +180,7 @@ ol {
   margin: 30px 0 !important;
 
   .ant-divider-inner-text {
-    font-size: 13px;
+    font-size: @font-size-base;
     color: rgba(0, 0, 0, 0.61);
   }
 }
@@ -298,7 +298,7 @@ ol {
   padding-left: 40px;
 
   .ant-alert-message {
-    font-size: 13px;
+    font-size: @font-size-base;
   }
 
   // 黄色警告
@@ -318,20 +318,17 @@ ol {
     }
 
     .ant-alert-message {
-      font-size: 14px;
+      font-size: @font-size-base;
       margin-bottom: 6px;
-      // margin-bottom: 0;
     }
 
     .ant-alert-description {
       font-size: 12.3px;
     }
   }
+
 }
 
 span.ant-radio+* {
   color: rgba(0, 0, 0, .5)
-}
-
-
-@font-size-base: 13px;
+}

+ 2 - 2
src/layouts/ProLayout/components/SecondMenu/index.less

@@ -11,7 +11,7 @@
   a {
     display  : block;
     color    : #333;
-    font-size: 13px;
+    font-size: 12.6px;
 
     &:hover {
       background: #f5f5f5;
@@ -23,7 +23,7 @@
     height      : 50px;
     line-height : 55px;
     padding-left: 26px;
-    font-size   : 14px;
+    font-size   : @font-size-base;
     color       : #333;
   }
 

+ 30 - 6
src/views/page/modules/editor/style.less

@@ -8,7 +8,7 @@
 
   // 标题
   &-title {
-    font-size: 14px;
+    font-size: @font-size-base;
     font-weight: 600;
     color: #595961;
     margin-top: 5px;
@@ -23,7 +23,7 @@
   // 副标题
   .sub-title {
     text-align: center;
-    font-size: 14px;
+    font-size: @font-size-base;
     color: #9797a1;
     margin-bottom: 15px;
     line-height: 20px;
@@ -53,16 +53,20 @@
 
   .tips-wrap {
     flex: 1;
-    color: #9797a1;
+    color: #a7a7b1;
   }
 
   // 区块
   .block-box {
     border-radius: 4px;
-    padding: 10px 10px 10px 10px;
+    padding: 12px 11px;
     background: #f0f2f5;
     margin: 0 auto 10px;
 
+    &:last-child {
+      margin-bottom: 0;
+    }
+
     &.drag {
       .block-title {
         cursor: move;
@@ -72,11 +76,14 @@
     .block-title {
       line-height: 30px;
       font-weight: 700;
-      font-size: 14px;
+      font-size: @font-size-base;
       margin-bottom: 10px;
       display: flex;
       justify-content: space-between;
 
+      &:last-child {
+        margin-bottom: 0;
+      }
 
       .link,
       .tips {
@@ -98,6 +105,11 @@
       justify-content: space-between;
       margin-bottom: 15px;
 
+      &:last-child {
+        margin-bottom: 0;
+      }
+
+
       .tips {
         margin-top: 5px;
         font-size: 12px;
@@ -127,7 +139,6 @@
 }
 
 // 颜色选择器
-
 .item-colorPicker {
   display: flex;
 
@@ -165,6 +176,8 @@
 
 // 多选框
 .item-checkbox {
+  margin-right: -10px;
+
   .ant-checkbox-wrapper {
     margin: 0 10px 0 0;
     line-height: 28px;
@@ -216,6 +229,17 @@
   }
 }
 
+// 文字描述
+.text-describe {
+  padding: 5px;
+  font-size: @font-size-base;
+  line-height: 25px;
+
+  .empty {
+    height: 10px;
+  }
+}
+
 // 覆盖默认样式
 a {
   user-select: none;

+ 1 - 1
src/views/page/style.less

@@ -31,7 +31,7 @@
 
   button {
     height: 30px;
-    font-size: 13px;
+    font-size: @font-size-base;
     margin-right: 15px;
   }
 }

+ 1 - 1
src/views/setting/delivery/template/Create.vue

@@ -285,7 +285,7 @@ export default {
   .operation {
     text-align: right;
     a {
-      font-size: 13px;
+      font-size: @font-size-base;
       margin-left: 6px;
     }
   }

+ 1 - 1
src/views/setting/delivery/template/Update.vue

@@ -323,7 +323,7 @@ export default {
   .operation {
     text-align: right;
     a {
-      font-size: 13px;
+      font-size: @font-size-base;
       margin-left: 6px;
     }
   }

+ 2 - 2
src/views/statistics/Index.vue

@@ -358,7 +358,7 @@ export default {
 </script>
 <style lang="less" scoped>
 .card-title {
-  font-size: 15px;
+  font-size: 14px;
   font-weight: bold;
   margin-bottom: 15px;
 }
@@ -407,7 +407,7 @@ export default {
 
   .col-right {
     .name {
-      font-size: 14px;
+      font-size: @font-size-base;
       color: #666;
     }