Merge branch '20210714' into 'master'

20210714

See merge request vue-project/basic!2

runner @ fd7fc1d9

-Subproject commit d295deac16c7024d3df80eabf415f5080f83fdfa
+Subproject commit fd7fc1d9b5f208d456799083dd39d5d01dfd7a26

src/App.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import { refreshScale } from 'runner/public/utils/refreshSize'
+import { refreshScale } from 'runner/common/utils/refreshSize'
 
 export default {
     name: 'app',

src/assets/fonts/fonts.less

-/* 数字字体包 */
-@font-face {
-    font-family: "CenturyGothic";
-    src: url('./CenturyGothic.TTF');
-    font-weight: normal;
-    font-style: normal;
-}
-/* UI文字字体包 */
-@font-face {
-    font-family: "Alibaba PuHuiTi35";
-    src: url('./AlibabaPuHuiTi-2-35-Thin.TTF');
-    font-weight: normal;
-    font-style: normal;
-}
-@font-face {
-    font-family: "Alibaba PuHuiTi45";
-    src: url('./AlibabaPuHuiTi-2-45-Light.TTF');
-    font-weight: normal;
-    font-style: normal;
-}
-@font-face {
-    font-family: "Alibaba PuHuiTi55";
-    src: url('./AlibabaPuHuiTi-2-55-Regular.TTF');
-    font-weight: normal;
-    font-style: normal;
-}
-@font-face {
-    font-family: "Alibaba PuHuiTi65";
-    src: url('./AlibabaPuHuiTi-2-65-Medium.TTF');
-    font-weight: normal;
-    font-style: normal;
-}
-@font-face {
-    font-family: "Alibaba PuHuiTi75";
-    src: url('./AlibabaPuHuiTi-2-75-SemiBold.TTF');
-    font-weight: normal;
-    font-style: normal;
-}
-@font-face {
-    font-family: "DS-Digital-B";
-    src: url('./DS-DIGIB-2.TTF');
-    font-weight: normal;
-    font-style: normal;
-}
-@font-face {
-    font-family: "DS-Digital-I";
-    src: url('./DS-DIGII-3.TTF');
-    font-weight: normal;
-    font-style: normal;
-}
-@font-face {
-    font-family: "DS-Digital-T";
-    src: url('./DS-DIGIT-4.TTF');
-    font-weight: normal;
-    font-style: normal;
-}

src/assets/styles/less/common.less

-/**
- * common.less 通用less
- */
-@import "../reset.css";
-@import './Less-mixins.less';
-@import '../../fonts/fonts.less';
-
-@headerHeight: 67px;
-
-.clearfix {
-    .clearfix();
-}
-
-.img-responsive {
-    .img-responsive();
-}

src/assets/styles/less/layout.less

-
-@leftSize: 530px;
-@rightSize: 530px;
-
-.layout-main {
-    // height: ~"calc(100% - 90px)";
-
-    .center, .left, .right {
-        float: left;
-        height: 100%;
-    }
-
-    .left {
-        position: relative;
-        width: @leftSize;
-        margin-left: -100%;
-        padding-left: 30px;
-        box-sizing: border-box;
-        padding-right: 30px;
-    }
-
-    .right {
-        position: relative;
-        padding-right: 30px;
-        padding-left: 20px;
-        width: @rightSize;
-        margin-left: -@rightSize;
-        font-size: 16px;
-        box-sizing: border-box;
-        padding-right: 30px;
-        box-sizing: border-box;
-    }
-
-    .center {
-        width: 100%;
-        box-sizing: border-box;
-
-        .content {
-            position: relative;
-            height: 100%;
-            margin-left: @leftSize;
-            margin-right: @rightSize;
-            box-sizing: border-box;
-        }
-    }
-}

src/assets/styles/reset.css

-/**
- * Eric Meyer's Reset CSS v2.0 (http://meyerweb.com/eric/tools/css/reset/)
- * http://cssreset.com
- */
- html, body, div, span, applet, object, iframe,
- h1, h2, h3, h4, h5, h6, p, blockquote, pre,
- a, abbr, acronym, address, big, cite, code,
- del, dfn, em, img, ins, kbd, q, s, samp,
- small, strike, strong, sub, sup, tt, var,
- b, u, i, center,
- dl, dt, dd, ol, ul, li,
- fieldset, form, label, legend,
- table, caption, tbody, tfoot, thead, tr, th, td,
- article, aside, canvas, details, embed,
- figure, figcaption, footer, header,
- menu, nav, output, ruby, section, summary,
- time, mark, audio, video, input {
-     margin: 0;
-     padding: 0;
-     border: 0;
-     font-size: 100%;
-     font-weight: 400;
-     vertical-align: baseline;
-     outline: none;
-     font-style:normal
- }
-
- /* HTML5 display-role reset for older browsers */
- article, aside, details, figcaption, figure,
- footer, header, menu, nav, section {
-     display: block;
- }
-
- body {
-     -webkit-font-smoothing: antialiased;
-     line-height: 1;
-     font-family: Arial, "Microsoft Yahei";
-     -webkit-text-size-adjust: none;
-     -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
- }
-
- blockquote, q {
-     quotes: none;
- }
-
- blockquote:before, blockquote:after,
- q:before, q:after {
-     content: none;
- }
-
- a {
-     text-decoration: none;
-     -webkit-backface-visibility: hidden;
- }
-
- li {
-     list-style: none;
- }
-
- input {
-     outline: none;
-     -webkit-tap-highlight-color: rgba(255, 255, 255, 0);
-     -webkit-appearance: none;
- }
-
- input:-webkit-autofill {
-     -webkit-box-shadow: 0 0 0px 100px white inset;
- }
-
- html, body {
-     width: 100%;
-     height: 100%;
-     scroll-behavior: smooth;
- }
- input, textarea {
-     user-select: text;
- }
-
- * {
-     -webkit-tap-highlight-color: transparent;
-     outline: none;
- }
-
- *:not(input,textarea) {
-     -webkit-touch-callout: none;
-     -webkit-user-select: none;
-     box-sizing: border-box;
- }

src/index.js

@@ -5,7 +5,7 @@ import App from './App.vue'
 import createStore from './store' // Vuex
 import createRouter from './router/router'
 import axiosServer from 'runner/request'
-import UsePlugin from 'runner/public/plugins'
+import UsePlugin from 'runner/common/plugins'
 import customPlugin from './public/plugins'
 import utils from 'utils'