From e54d7118913962bd681614f19ddf843b258ce9d5 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 9 Mar 2024 13:17:58 +0100 Subject: [PATCH] Improve colors. --- resources/assets/sass/app.scss | 30 ------------------------------ resources/assets/v2/sass/app.scss | 6 ++++++ 2 files changed, 6 insertions(+), 30 deletions(-) delete mode 100644 resources/assets/sass/app.scss diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss deleted file mode 100644 index 56ac182329..0000000000 --- a/resources/assets/sass/app.scss +++ /dev/null @@ -1,30 +0,0 @@ -/*! - * app.scss - * Copyright (c) 2019 james@firefly-iii.org - * - * This file is part of Firefly III (https://github.com/firefly-iii). - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -/* TODO REMOVE ME */ -// Variables -//@import "variables"; - -// Bootstrap -//@import "~bootstrap-sass/assets/stylesheets/bootstrap"; - -// Font awesome -//@import "~font-awesome/css/font-awesome"; - diff --git a/resources/assets/v2/sass/app.scss b/resources/assets/v2/sass/app.scss index e943c7bbf7..2d4cbaed8c 100644 --- a/resources/assets/v2/sass/app.scss +++ b/resources/assets/v2/sass/app.scss @@ -20,6 +20,11 @@ $color-mode-type: media-query; $link-decoration: none !default; +$font-family-sans-serif: "Roboto", sans-serif; + +$danger: #CD5029 !default; +$primary: #1E6581 !default; +$success: #64B624 !default; .balance-box { container: sidebar / inline-size; @@ -35,6 +40,7 @@ $link-decoration: none !default; // admin LTE @import "admin-lte/src/scss/adminlte"; + // @import "~bootstrap-sass/assets/stylesheets/bootstrap";