orgin/master #1

Merged
uniccoo merged 257 commits from orgin/master into master 2024-06-18 15:49:12 +00:00
6 changed files with 14 additions and 43 deletions
Showing only changes of commit 16b9aeb45c - Show all commits

View File

@ -1,29 +1,6 @@
$fa-font-path : "./webfonts" !default;
$fa-font-display : block !default;
/* import fontawesome icon */
@font-face {
font-family: 'Font Awesome 6 Free';
font-style: normal;
font-weight: 400;
font-display: $fa-font-display;
src: url('#{$fa-font-path}/fa-regular-400.woff2') format('woff2'),
url('#{$fa-font-path}/fa-regular-400.ttf') format('truetype');
}
@font-face {
font-family: 'Font Awesome 6 Brands';
font-style: normal;
font-weight: 400;
font-display: $fa-font-display;
src: url('#{$fa-font-path}/fa-brands-400.woff2') format('woff2'),
url('#{$fa-font-path}/fa-brands-400.ttf') format('truetype');
}
@font-face {
font-family: 'Font Awesome 6 Free';
font-style: normal;
font-weight: 900;
font-display: $fa-font-display;
src: url('#{$fa-font-path}/fa-solid-900.woff2') format('woff2'),
url('#{$fa-font-path}/fa-solid-900.ttf') format('truetype');
}
@import "scss/fontawesome";
@import "scss/brands";
@import "scss/solid";
@import "scss/regular";

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
@import 'auxiliary';
@import 'mixin';
@import 'flex';
/* #ifndef H5 */
//@import "./font_awesome/fontawesome";
/* #endif */
/* import fontawesome icon */
@import 'font_awesome/fontawesome';

View File

@ -3,12 +3,6 @@ import App from './App.vue';
import { setupStore } from '@/state';
import '@/assets/style/main.scss';
/* import fontawesome icon */
import '@fortawesome/fontawesome-free/scss/fontawesome.scss';
import '@fortawesome/fontawesome-free/scss/brands.scss';
import '@fortawesome/fontawesome-free/scss/solid.scss';
import '@fortawesome/fontawesome-free/scss/regular.scss';
export function createApp() {
const app = createSSRApp(App);