From 8794ffc7154ef266d34c1f6b1a67486c68d8b4d5 Mon Sep 17 00:00:00 2001 From: ro Date: Thu, 21 Mar 2024 14:51:24 -0600 Subject: [PATCH] Color Adjustments The colors just needed to be tweaked a bit for the sake on better contrast and readability. Still some trouble spots but will adjust as needed --- .../fipamo-default-v2/assets/css/color.css | 4 ++-- .../fipamo-default-v2/assets/css/frame.css | 8 ++++---- public/assets/css/dash/book.css | 4 ++-- public/assets/css/dash/colors.css | 6 +++--- public/assets/css/dash/forms.css | 8 ++++---- public/assets/css/dash/frame.css | 10 +++++----- public/assets/css/dash/index.css | 2 +- public/assets/css/dash/init.css | 2 +- public/assets/css/dash/navigation.css | 2 +- public/assets/css/dash/notifications.css | 2 +- public/assets/css/dash/page-editor.css | 16 +++++++--------- public/assets/css/dash/settings.css | 8 ++++---- resources/views/back/book.blade.php | 2 +- resources/views/back/page.blade.php | 3 +-- resources/views/back/start.blade.php | 2 +- 15 files changed, 38 insertions(+), 41 deletions(-) diff --git a/content/themes/fipamo-default-v2/assets/css/color.css b/content/themes/fipamo-default-v2/assets/css/color.css index 8719c4f..fe1970b 100644 --- a/content/themes/fipamo-default-v2/assets/css/color.css +++ b/content/themes/fipamo-default-v2/assets/css/color.css @@ -2,8 +2,8 @@ :root { --primary: #1d3040; --secondary: #fc6399; - --tertiary: #f5ab35; - --highlight: #63fcc6ff; + --primary-highlight: #f5ab35; + --secondary-highlight: #63fcc6ff; --white: #ebe5d4; --black: #32302f; } diff --git a/content/themes/fipamo-default-v2/assets/css/frame.css b/content/themes/fipamo-default-v2/assets/css/frame.css index a4e5743..98aee6e 100644 --- a/content/themes/fipamo-default-v2/assets/css/frame.css +++ b/content/themes/fipamo-default-v2/assets/css/frame.css @@ -29,7 +29,7 @@ a { } a:hover { - border-bottom: 1px solid var(--highlight); + border-bottom: 1px solid var(--secondary-highlight); } sup { @@ -42,7 +42,7 @@ sup { pre, code { background: var(--black); - color: var(--highlight); + color: var(--secondary-highlight); border-radius: 3px; padding: 3px; } @@ -171,7 +171,7 @@ main > section[role="page-meta"] > div a { /* FOOTER */ footer { - background: var(--highlight); + background: var(--secondary-highlight); padding: 30px 15%; color: var(--primary); } @@ -188,7 +188,7 @@ footer { } footer { - background: var(--highlight); + background: var(--secondary-highlight); padding: 30px 10%; } } diff --git a/public/assets/css/dash/book.css b/public/assets/css/dash/book.css index 04c61bd..8d4fc76 100644 --- a/public/assets/css/dash/book.css +++ b/public/assets/css/dash/book.css @@ -80,7 +80,7 @@ section[role="book-index-pages"] hr { section[role="book-index-pages"] button[data-active="true"] { background: var(--primary); - color: var(--tertiary); + color: var(--primary-highlight); } section[role="book-index-pages"] button[data-active="false"] { @@ -91,7 +91,7 @@ section[role="book-index-pages"] > div[role="paginate"] { width: fit-content; margin: 0 auto; font-size: 1.5em; - color: var(--highlight); + color: var(--secondary-highlight); } section[role="book-index-pages"] > div[role="paginate"] i { diff --git a/public/assets/css/dash/colors.css b/public/assets/css/dash/colors.css index ea01601..4fc0cb3 100644 --- a/public/assets/css/dash/colors.css +++ b/public/assets/css/dash/colors.css @@ -1,9 +1,9 @@ :root { /* BASE COLORS */ --primary: #1d3040; - --secondary: #b2cce5; - --tertiary: #f5ab35; - --highlight: #fc6399; + --secondary: #f3ebd2; + --primary-highlight: #f5ab35; + --secondary-highlight: #b54b6f; --white: #efebe3; --grey: #abb7b7; --black: #32302f; diff --git a/public/assets/css/dash/forms.css b/public/assets/css/dash/forms.css index 222abfe..733ed18 100644 --- a/public/assets/css/dash/forms.css +++ b/public/assets/css/dash/forms.css @@ -3,7 +3,7 @@ a { } p { - background: var(--tertiary); + background: var(--primary-highlight); color: var(--primary); padding: 5px; display: block; @@ -18,7 +18,7 @@ input[type="text"] { border-radius: 5px; font: 18px var(--base-type); display: inline-block; - background: var(--white); + background: var(--secondary); color: var(--primary); } @@ -26,12 +26,12 @@ textarea { border: 0; border-radius: 3px; color: var(--primary); - background: var(--white); + background: var(--secondary); } button, input[type="submit"] { - background: var(--highlight); + background: var(--secondary-highlight); color: var(--primary); font: 20px var(--base-type); border-radius: 5px; diff --git a/public/assets/css/dash/frame.css b/public/assets/css/dash/frame.css index 51bfa96..1271283 100644 --- a/public/assets/css/dash/frame.css +++ b/public/assets/css/dash/frame.css @@ -32,7 +32,7 @@ sup { } ::selection { - background: var(--highlight); + background: var(--secondary-highlight); color: var(--white); } @@ -44,14 +44,14 @@ sup { pre, code { background: var(--black); - color: var(--highlight); + color: var(--secondary-highlight); border-radius: 3px; padding: 3px; } svg[role="icon"] { transition: all 0.3s linear; - fill: var(--white); + fill: var(--secondary); width: 25px; height: 25px; padding-top: 5px; @@ -129,11 +129,11 @@ button[data-render="true"] { } button[data-render="true"] svg { - fill: var(--highlight); + fill: var(--primary-highlight); } button[data-render="false"] svg { - fill: var(--white); + fill: var(--secondary); } /* RESPONSIVE */ diff --git a/public/assets/css/dash/index.css b/public/assets/css/dash/index.css index 81d4c13..f41efe4 100644 --- a/public/assets/css/dash/index.css +++ b/public/assets/css/dash/index.css @@ -81,7 +81,7 @@ button[data-active="false"] svg { } button[data-active="true"] svg { - fill: var(--highlight); + fill: var(--primary-highlight); } section[class="index-recent-pages"] aside { diff --git a/public/assets/css/dash/init.css b/public/assets/css/dash/init.css index 5d23f4d..da98fcb 100644 --- a/public/assets/css/dash/init.css +++ b/public/assets/css/dash/init.css @@ -38,7 +38,7 @@ section.login form a { width: 10%; height: 20px; display: inline-block; - background: var(--tertiary); + background: var(--primary-highlight); vertical-align: top; text-align: center; margin: 0 0 0 10px; diff --git a/public/assets/css/dash/navigation.css b/public/assets/css/dash/navigation.css index fa5e0d6..48d513d 100644 --- a/public/assets/css/dash/navigation.css +++ b/public/assets/css/dash/navigation.css @@ -9,7 +9,7 @@ article[role="navigation"] > section > div.nav-item { width: 98%; background: var(--white); border-radius: 3px; - color: var(--highlight); + color: var(--secondary-highlight); margin: 0 0 10px; font-size: 1.5em; cursor: move; diff --git a/public/assets/css/dash/notifications.css b/public/assets/css/dash/notifications.css index 8481c20..edf00ce 100644 --- a/public/assets/css/dash/notifications.css +++ b/public/assets/css/dash/notifications.css @@ -4,7 +4,7 @@ header > nav.top-nav { grid-template-columns: 50px auto auto; height: 100%; position: relative; - background: var(--white); + background: var(--secondary); border-radius: 3px; transform-style: preserve-3d; transform-origin: 100% 50%; diff --git a/public/assets/css/dash/page-editor.css b/public/assets/css/dash/page-editor.css index db05dfa..f00f3ee 100644 --- a/public/assets/css/dash/page-editor.css +++ b/public/assets/css/dash/page-editor.css @@ -1,7 +1,7 @@ /* FILE MANAGER */ main > section[role="file-manager"] { width: 100%; - background: var(--tertiary); + background: var(--primary-highlight); padding: 20px 0; margin-top: 75px; } @@ -153,7 +153,7 @@ main main > section[role="page-meta"] { width: 100%; - background: var(--highlight); + background: var(--secondary-highlight); } main > section[role="page-meta"] > div[role="page-meta-wrapper"] { @@ -162,12 +162,11 @@ main > section[role="page-meta"] > div[role="page-meta-wrapper"] { gap: 20px; width: 100%; max-width: 900px; - margin: 10px auto; - color: var(--white); + margin: 0 auto; + color: var(--secondary); } main section[role="page-meta"] textarea#post-title-text { - background: var(--white); font-family: var(--base-type); width: 100%; height: 80px; @@ -176,7 +175,6 @@ main section[role="page-meta"] textarea#post-title-text { } main section[role="page-meta"] textarea#post-tags { - background: var(--white); font-family: var(--base-type); width: 100%; height: 80px; @@ -244,7 +242,7 @@ main main > section[role="text-editor"] { width: 100%; max-width: 900px; - margin: 0 auto; + margin: 10px auto; } main section[role="text-editor"] .icon-hide { @@ -274,7 +272,7 @@ main > section[role="text-editor"] > div[role="edit-post-wrapper"] { main > section[role="text-editor"] > div[role="edit-post-wrapper"] textarea:focus { outline: none; - border-color: var(--highlight); + border-color: var(--secondary-highlight); } main section[role="text-editor"] div[role="edit-post-wrapper"] #edit, @@ -307,7 +305,7 @@ main > section[role="text-editor"] > div[role="edit-post-wrapper"] > #edit { z-index: 1; background: transparent; color: transparent; - caret-color: var(--highlight); + caret-color: var(--secondary-highlight); } main > section[role="text-editor"] > div[role="edit-post-wrapper"] > #highlight { diff --git a/public/assets/css/dash/settings.css b/public/assets/css/dash/settings.css index b4c3fbb..c90e6e0 100644 --- a/public/assets/css/dash/settings.css +++ b/public/assets/css/dash/settings.css @@ -47,7 +47,7 @@ section[class="member-settings"] > div:nth-child(4) { section[class="member-settings"] > div:nth-child(4) a { font-weight: bold; text-decoration: underline; - color: var(--tertiary); + color: var(--primary-highlight); } section[class="member-settings"] > div:nth-child(5) { @@ -122,7 +122,7 @@ section[class="member-settings"] > div[class="theme"] button[data-enabled="true"] { color: var(--white); - background: var(--highlight); + background: var(--secondary-highlight); display: block; border-radius: 3px; padding: 3px; @@ -148,9 +148,9 @@ section[class="member-settings"] > div[class="mail"] a { } section[class="member-settings"] > div[class="mail"] a[data-enabled="true"] { - color: var(--tertiary); + color: var(--primary-highlight); font-weight: bold; - border-top: var(--highlight) 1px solid; + border-top: var(--secondary-highlight) 1px solid; } section[class="member-settings"] > div[class="mail"] div[data-enabled="false"] { diff --git a/resources/views/back/book.blade.php b/resources/views/back/book.blade.php index 5d805f5..6d71d76 100644 --- a/resources/views/back/book.blade.php +++ b/resources/views/back/book.blade.php @@ -51,7 +51,7 @@ @else -
+
@include('includes.recent-meta')
diff --git a/resources/views/back/page.blade.php b/resources/views/back/page.blade.php index f7c98b5..3715dfa 100644 --- a/resources/views/back/page.blade.php +++ b/resources/views/back/page.blade.php @@ -137,8 +137,7 @@
@endif - -
+
TITLE diff --git a/resources/views/back/start.blade.php b/resources/views/back/start.blade.php index 6850f3f..2f41949 100644 --- a/resources/views/back/start.blade.php +++ b/resources/views/back/start.blade.php @@ -27,7 +27,7 @@ @else - + @include('includes.recent-meta') @endif