diff --git a/src/scss/custom.scss b/src/scss/custom.scss index da404a1..e7b67c4 100644 --- a/src/scss/custom.scss +++ b/src/scss/custom.scss @@ -1,33 +1,19 @@ // Custom.scss @import "~@fontsource/orbitron/index.css"; -@import "~@fontsource/open-sans/index.css"; - -@font-face { - font-family: "OpenSans"; - font-display: swap; -} - -@font-face { - font-family: "OpenSansItalic"; - font-display: swap; -} +@import "~@fontsource/open-sans/variable-full.css"; +@import "~fork-awesome/css/fork-awesome.css"; @font-face { font-family: "CSRegular"; src: local('CSRegular'), - url("/fonts/cs_regular.woff2") format("woff2"), - url("/fonts/cs_regular.ttf") format("truetype"); - font-display: swap; -} - -@font-face { - font-family: "Orbitron"; + url("../../public/fonts/cs_regular.woff2") format("woff2"), + url("../../public/fonts/cs_regular.woff2") format("truetype"); font-display: swap; } // Default variable overrides -$font-family-base: 'OpenSans'; +$font-family-base: 'Open Sans'; $body-color: white; $primary: #888f98; @@ -48,8 +34,7 @@ $success: #609926; } // Bootstrap -@import "../../node_modules/bootstrap/scss/bootstrap"; -@import "../../node_modules/fork-awesome/css/fork-awesome.css"; +@import "~bootstrap/scss/bootstrap"; :root { // CSGO COLORS diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index dad0293..109a541 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -148,12 +148,12 @@ table { .main-content { .head { // display jpg - background-image: url("/images/map_screenshots/default.png"); + background-image: url("../../public/images/map_screenshots/default.png"); } .head { // display webp if possible - background-image: url("/images/map_screenshots/default.webp"); + background-image: url("../../public/images/map_screenshots/default.png"); background-repeat: no-repeat; background-size: cover; background-position: center; diff --git a/vue.config.js b/vue.config.js index ba01558..a90d2fd 100644 --- a/vue.config.js +++ b/vue.config.js @@ -6,12 +6,5 @@ module.exports = { plugins: [ new Dotenv() ], - }, - css: { - loaderOptions: { - css: { - url: false - } - } } }