From 828ed6f08ad400929380c62f11f907b5aa25261e Mon Sep 17 00:00:00 2001 From: jb-alvarado Date: Mon, 15 Apr 2024 17:39:41 +0200 Subject: [PATCH] dark/light logging colors --- pages/logging.vue | 10 +++++----- pages/player.vue | 8 +++----- tailwind.config.ts | 30 ++++++++---------------------- 3 files changed, 16 insertions(+), 32 deletions(-) diff --git a/pages/logging.vue b/pages/logging.vue index 7b57e9df..9225bd98 100644 --- a/pages/logging.vue +++ b/pages/logging.vue @@ -49,7 +49,7 @@ watch([listDate, configID], () => { }) const calendarFormat = (date: Date) => { - return $dayjs(date).locale(locale.value).format('dddd LL') + return $dayjs(date).locale(locale.value).format('dddd - LL') } async function getLog() { @@ -79,20 +79,20 @@ async function getLog() { } .log-number { - color: #e2c317; + color: var(--my-yellow); } .log-addr { - color: #ad7fa8; + color: var(--my-purple); font-weight: 500; } .log-cmd { - color: #6c95c2; + color: var(--my-blue); } .log-info { - color: #8ae234; + color: var(--my-green); } .log-warning { diff --git a/pages/player.vue b/pages/player.vue index 536a95fa..109b0999 100644 --- a/pages/player.vue +++ b/pages/player.vue @@ -447,9 +447,9 @@ const newSource = ref({ uid: '', } as PlaylistItem) -onMounted(async () => { +onMounted(() => { if (!mediaStore.folderTree.parent) { - await mediaStore.getTree('') + mediaStore.getTree('') } getPlaylist() @@ -474,7 +474,7 @@ function scrollTo(index: number) { } const calendarFormat = (date: Date) => { - return $dayjs(date).locale(locale.value).format('dddd LL') + return $dayjs(date).locale(locale.value).format('dddd - LL') } async function getPlaylist() { @@ -534,8 +534,6 @@ function addClip(event: any) { const n = event.newIndex const uid = genUID() - console.log('---add') - event.item.remove() const storagePath = configStore.configPlayout.storage.path diff --git a/tailwind.config.ts b/tailwind.config.ts index d8a25964..7efdf040 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -10,14 +10,6 @@ module.exports = { }, colors: { 'my-gray': 'var(--my-gray)', - 'my-gray-text': 'var(--my-gray-text)', - 'my-text': 'var(--my-text)', - 'my-shadow': 'var(--my-shadow)', - 'my-shadow-dark': 'var(--my-shadow-dark)', - 'my-black': '#141414', - 'link-hover': 'var(--link-hover)', - 'light-accent': 'var(--light-accent)', - 'base-100-odd': 'var(--base-100-odd)', }, fontFamily: { sans: ['Source Sans Pro', 'Segoe UI', 'Helvetica Neue', 'Arial', 'sans-serif'], @@ -62,15 +54,12 @@ module.exports = { '--base-100': '#ffffff', '--base-200': '#F2F5F7', '--base-300': '#E5E6E6', - '--base-100-odd': '#ececec', '--my-accent': '#f28c1b', - '--link-hover': '#f4ae61', '--my-gray': '#888888', - '--my-gray-text': '#6a6a6a', - '--my-text': '#141414', - '--my-shadow': '#e6e6e6', - '--my-shadow-dark': '#9f9f9f', - '--light-accent': '#9c6a0c', + '--my-purple': '#701a75', + '--my-yellow': '#bea203', + '--my-blue': '#436e9c', + '--my-green': '#68b31e', }, dark: { 'color-scheme': 'dark', @@ -90,15 +79,12 @@ module.exports = { '--base-100': '#313131', '--base-200': '#222222', '--base-300': '#1c1c1c', - '--base-100-odd': '#3d3d3d', '--my-accent': '#f28c1b', - '--link-hover': '#f4ae61', '--my-gray': '#919191', - '--my-gray-text': '#bababa', - '--my-text': '#eeeeee', - '--my-shadow': '#111', - '--my-shadow-dark': '#000', - '--light-accent': '#f1a312', + '--my-purple': '#ad7fa8;', + '--my-yellow': '#e2c317', + '--my-blue': '#6c95c2', + '--my-green': '#8ae234', }, }, ],