diff --git a/satellite/admin/back-office/ui/src/main.js b/satellite/admin/back-office/ui/src/main.js index e1ced383a7b6..981acaffaa75 100644 --- a/satellite/admin/back-office/ui/src/main.js +++ b/satellite/admin/back-office/ui/src/main.js @@ -13,10 +13,6 @@ import App from './App.vue' // Composables import { createApp } from 'vue' -// Styles -import './styles/settings.scss' -// import './styles/styles.scss' - // Plugins import { registerPlugins } from '@/plugins' diff --git a/satellite/admin/back-office/ui/src/plugins/vuetify.js b/satellite/admin/back-office/ui/src/plugins/vuetify.js index d6cd97be6c06..e77705827a03 100644 --- a/satellite/admin/back-office/ui/src/plugins/vuetify.js +++ b/satellite/admin/back-office/ui/src/plugins/vuetify.js @@ -9,7 +9,7 @@ // Styles import '@mdi/font/css/materialdesignicons.css' -// import 'vuetify/styles' +import 'vuetify/styles' // Inter Font using FontSource import '@fontsource-variable/inter'; diff --git a/satellite/admin/back-office/ui/src/styles/settings.scss b/satellite/admin/back-office/ui/src/styles/settings.scss index fc3a8597b1ab..64950d91e76a 100644 --- a/satellite/admin/back-office/ui/src/styles/settings.scss +++ b/satellite/admin/back-office/ui/src/styles/settings.scss @@ -1,31 +1,15 @@ +// Copyright (C) 2023 Storj Labs, Inc. +// See LICENSE for copying information. + /** * src/styles/settings.scss * * Configures SASS variables and Vuetify overwrites */ - -// Warning -// Duplicated CSS -// Placing actual styles or importing a regular stylesheet -// into the settings file will cause them to be -// duplicated everywhere the file is imported. - -// Only put variables, mixins, and functions in the settings file, -// styles should be placed in the main stylesheet or loaded another way. - - -// Use SASS https://vuetifyjs.com/en/features/sass-variables/ - -// @use 'vuetify' with ( -// // $utilities: false, -// $color-pack: false, -// $body-font-family: 'Inter', -// ); +$font-family: 'Inter Variable', sans-serif; -// To obtain settings from Vuetify, you must forward its variables from within your local stylesheet -@forward 'vuetify' with ( - // $utilities: false, +@use 'vuetify/settings' with ( $color-pack: false, - $body-font-family: 'Inter Variable', + $body-font-family: $font-family, ); \ No newline at end of file diff --git a/satellite/admin/back-office/ui/src/styles/styles.scss b/satellite/admin/back-office/ui/src/styles/styles.scss index f7c4f0cf4c72..07ff9db79259 100644 --- a/satellite/admin/back-office/ui/src/styles/styles.scss +++ b/satellite/admin/back-office/ui/src/styles/styles.scss @@ -6,8 +6,6 @@ * */ -@use './settings'; - // Light Theme .v-theme--light { --v-border-color: 0, 0, 0;