From 3d86f859c6331e3c495ff068bc42e6919bf7d8e9 Mon Sep 17 00:00:00 2001 From: James Collins Date: Wed, 3 May 2023 21:49:55 +1000 Subject: [PATCH] darkmode support and new variables --- resources/css/variables.scss | 13 +++++++++++++ resources/js/components/SMEditor.vue | 9 ++------- resources/js/components/SMNavbar.vue | 2 +- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/resources/css/variables.scss b/resources/css/variables.scss index 4df0799..7056daf 100644 --- a/resources/css/variables.scss +++ b/resources/css/variables.scss @@ -113,6 +113,8 @@ $spacing: ( // Input --input-clear-icon-color: var(--base-color-dark); --input-clear-icon-color-hover: var(--base-color-light); + --input-color: var(--base-color-light); + --input-color-border: var(--base-color-darker); // Pagination --pagination-color: var(--base-color-light); @@ -143,6 +145,7 @@ $spacing: ( // SKIP BELOW --navbar-color: var(--base-color-light); --navbar-color-dropdown: var(--base-color-light); + --navbar-shadow: 0 0 4px rgba(0, 0, 0, 0.2); --card-color: var(--base-color-light); @@ -159,6 +162,10 @@ $spacing: ( --banner-red-color-text: #fff; --banner-purple-color: #707; --banner-purple-color-text: #fff; + + // Editor + --editor-shadow: 0 0 4px rgba(0, 0, 0, 0.2); + --editor-backdrop: rgba(255, 255, 255, 0.75); } // --primary-color-hover: #f1fdff; @@ -175,6 +182,8 @@ $spacing: ( --base-color-dark: #666; --base-color-darker: #999; + // --base-shadow: 0 0 4px rgba(255, 255, 255, 0.2); + --button-color: var(--base-color-lighter); --button-color-text: var(--base-color-background); --button-primary-color-text: var(--base-color-background); @@ -186,5 +195,9 @@ $spacing: ( // Accents --accent-2-color: #063954; --accent-2-color-text: #cce8fb; + + // Editor + --editor-shadow: 0 0 4px rgba(255, 255, 255, 0.2); + --editor-backdrop: rgba(0, 0, 0, 0.75); } } diff --git a/resources/js/components/SMEditor.vue b/resources/js/components/SMEditor.vue index f514395..4234d39 100644 --- a/resources/js/components/SMEditor.vue +++ b/resources/js/components/SMEditor.vue @@ -72,7 +72,6 @@ const props = defineProps({ }, }); -const useDarkMode = false; // window.matchMedia("(prefers-color-scheme: dark)").matches; const tinyeditor = ref(null); tinymce.PluginManager.add("gallery", function (editor) { @@ -218,12 +217,8 @@ const init = { // template_cdate_format: "[Date Created (CDATE): %m/%d/%Y : %H:%M:%S]", // template_mdate_format: "[Date Modified (MDATE): %m/%d/%Y : %H:%M:%S]", relative_urls: false, - skin_url: useDarkMode - ? "/tinymce/skins/ui/oxide-dark" - : "/tinymce/skins/ui/oxide", - content_css: useDarkMode - ? "/tinymce/skins/content/default/dark.min.css" - : "/tinymce/skins/content/default/content.min.css", + skin_url: "/tinymce/skins/ui/stemmech", + content_css: "/tinymce/skins/ui/stemmech/content.min.css", height: 600, plugins: [ "link", diff --git a/resources/js/components/SMNavbar.vue b/resources/js/components/SMNavbar.vue index 718987e..57ad54a 100644 --- a/resources/js/components/SMNavbar.vue +++ b/resources/js/components/SMNavbar.vue @@ -174,7 +174,7 @@ onUnmounted(() => { -webkit-backdrop-filter: blur(4px); backdrop-filter: blur(4px); background-color: var(--navbar-color); - box-shadow: var(--base-shadow); + box-shadow: var(--navbar-shadow); &.nav-active { background-color: var(--navbar-color) !important;