Update 2.3.2

kinmury · Sep 20, 2023 · 2aece6a · 2aece6a
1 parent 67e35ad
commit 2aece6a
Show file tree

Hide file tree

Showing 17 changed files with 924 additions and 587 deletions.
diff --git a/manifest.json b/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Ukiyo",
-  "version": "2.2.0",
+  "version": "2.3.2",
   "minAppVersion": "1.0.0",
   "author": "kinmury",
   "authorURI": "https://github.com/kinmury/obsidian-ukiyo"

diff --git a/src/_global-variables.scss b/src/_global-variables.scss
@@ -39,10 +39,11 @@ body {
   }
 }
 
+// BUG - Templater suggester-containers don't show up if you use this
 // Blur while floating-elements present
-.app-container:has(~ .modal-container) {
-  filter: blur(1.25px);
-}
+// .app-container:has(~ .modal-container) {
+//   filter: blur(0.5px);
+// }
 
 // Animation
 // Author of the original animation: [Akifyss](obsidian-bordertheme)

diff --git a/src/_info/commands.md b/src/_info/commands.md
@@ -12,5 +12,5 @@ csso ../dev.css --output ../theme.css
 ```bash
 sass --no-source-map "./src/main.scss" "./prod.css"
 csso ./prod.css --output ./theme.css
-DEL ./prod.css
+DEL prod.css
 ```
diff --git a/src/custom/_callouts.scss b/src/custom/_callouts.scss
@@ -4,32 +4,36 @@
     box-shadow: none;
     border: none;
 
-    .callout-title,
-    .callout-content {
+    & > .callout-title,
+    & > .callout-content {
       background-color: transparent;
     }
   }
 
   &[data-callout-metadata*="!icon"] {
-    .callout-icon {
-      display: none;
+    & > .callout-title {
+      .callout-icon {
+        display: none;
+      }
     }
   }
 
   &[data-callout-metadata*="!bold"] {
-    .callout-title-inner {
-      font-weight: normal;
+    & > .callout-title {
+      .callout-title-inner {
+        font-weight: normal;
+      }
     }
   }
 
   &[data-callout-metadata*="!color"] {
-    .callout-title {
+    & > .callout-title {
       color: var(--text-normal);
     }
   }
 
   &[data-callout-metadata*="!title"] {
-    .callout-title {
+    & > .callout-title {
       display: none;
     }
   }
@@ -41,8 +45,10 @@
   }
 
   &[data-callout-metadata*="title-center"] {
-    .callout-title-inner {
-      margin: auto;
+    & > .callout-title {
+      .callout-title-inner {
+        margin: auto;
+      }
     }
   }
 
@@ -150,7 +156,7 @@
 
     width: calc(var(--file-line-width) / 2);
 
-    .callout-title {
+    & > .callout-title {
       background-color: var(--in-between-background);
     }
 

diff --git a/src/custom/_style-settings.scss b/src/custom/_style-settings.scss
@@ -135,6 +135,62 @@ settings:
             -
                 label: Custom
                 value: color-scheme-custom
+    -
+        id: separate-color-scheme
+        title: Customize each mode
+        description: Select a color scheme for each mode
+        type: class-toggle
+        default: false
+    -
+        id: dark-mode-color-scheme-selector
+        title: Dark mode
+        type: class-select
+        allowEmpty: false
+        default: dm-color-scheme-default
+        options:
+            -
+                label: Cozy typewritter
+                value: dm-color-scheme-default
+            -
+                label: Ukiyo
+                value: dm-color-scheme-ukiyo
+            -
+                label: Golden Coffee
+                value: dm-color-scheme-golden-coffee
+            -
+                label: Golden Book
+                value: dm-color-scheme-golden-book
+            -
+                label: Alchemy
+                value: dm-color-scheme-alchemy
+            -
+                label: Rose Shadow
+                value: dm-color-scheme-rose-shadow
+            -
+                label: Custom
+                value: dm-color-scheme-custom
+    -
+        id: light-mode-color-scheme-selector
+        title: Light mode
+        type: class-select
+        allowEmpty: false
+        default: lm-color-scheme-default
+        options:
+            -
+                label: Cozy typewritter
+                value: lm-color-scheme-default
+            -
+                label: Ukiyo
+                value: lm-color-scheme-ukiyo
+            -
+                label: Golden Coffee
+                value: lm-color-scheme-golden-coffee
+            -
+                label: Alchemy
+                value: lm-color-scheme-alchemy
+            -
+                label: Custom
+                value: lm-color-scheme-custom
     -
         id: color-scheme-custom-container
         title: Custom Color Scheme
@@ -372,6 +428,22 @@ body:not(.color-scheme-custom) {
   }
 }
 
+body:not(.separate-color-scheme) {
+  .setting-item[data-id*="dark-mode-color-scheme-selector"],
+  .setting-item[data-id*="light-mode-color-scheme-selector"] {
+    display: none;
+  }
+}
+
+.separate-color-scheme {
+  .setting-item[data-id="separate-color-scheme"] {
+    border-top: none;
+  }
+  .setting-item[data-id="color-scheme-selector"] {
+    display: none;
+  }
+}
+
 .themed-color-wrapper {
   display: flex;
 

diff --git a/src/custom/color-schemes/_alchemy.scss b/src/custom/color-schemes/_alchemy.scss
@@ -1,81 +1,104 @@
-.color-scheme-alchemy {
-  &.theme-dark {
-    --color-base-00: #171717;
-    --color-base-05: var(--color-base-30);
-    --color-base-10: #282523;
-    --color-base-20: #1a1a1a;
-    --color-base-25: #232323;
-    --color-base-30: #292929;
-    --color-base-35: var(--color-base-30);
-    --color-base-40: #373738;
-    --color-base-50: #8c7c6d;
-    --color-base-70: #9e9184;
-    --color-base-100: #c0bcb5;
+@mixin alchemy-dark-mode {
+  --color-base-00: #171717;
+  --color-base-05: var(--color-base-30);
+  --color-base-10: #282523;
+  --color-base-20: #1a1a1a;
+  --color-base-25: #232323;
+  --color-base-30: #292929;
+  --color-base-35: var(--color-base-30);
+  --color-base-40: #373738;
+  --color-base-50: #8c7c6d;
+  --color-base-70: #9e9184;
+  --color-base-100: #c0bcb5;
 
-    --background-modifier-message: #000000;
+  --background-modifier-message: #000000;
 
-    --color-accent: #978159;
-    --color-accent-1: #978159;
-    --color-accent-2: #b1996c;
+  --color-accent: #978159;
+  --color-accent-1: #978159;
+  --color-accent-2: #b1996c;
 
-    --activeline: #242424bf;
-    --text-selection: #474747a2;
+  --activeline: #242424bf;
+  --text-selection: #474747a2;
 
-    --color-bold: #7b9cac;
-    --color-italic: #a07f6c;
+  --color-bold: #7b9cac;
+  --color-italic: #a07f6c;
 
-    --text-highlight-bg: #a0632666;
+  --text-highlight-bg: #a0632666;
 
-    --heading-formatting-color: #8f2d2d;
+  --heading-formatting-color: #8f2d2d;
 
-    --in-between-background: #101010;
+  --in-between-background: #101010;
 
-    // Theme Extras
-    --background-modifier-form-field: var(--color-base-25);
+  // Theme Extras
+  --background-modifier-form-field: var(--color-base-25);
 
-    --interactive-normal: var(--color-base-30);
-    --interactive-hover: var(--color-base-35);
+  --interactive-normal: var(--color-base-30);
+  --interactive-hover: var(--color-base-35);
 
-    --text-highlight-bg-active: var(--text-highlight-bg);
-  }
+  --text-highlight-bg-active: var(--text-highlight-bg);
+}
 
-  &.theme-light {
-    --color-base-00: #0f1d1a;
-    --color-base-05: var(--color-base-30);
-    --color-base-10: #0b1614;
-    --color-base-20: #10201d;
-    --color-base-25: #1e332f;
-    --color-base-30: #253a35;
-    --color-base-35: var(--color-base-30);
-    --color-base-40: #253a35;
-    --color-base-50: #a08d57;
-    --color-base-70: #ad9962;
-    --color-base-100: #cabbab;
+@mixin alchemy-light-mode {
+  --color-base-00: #0f1d1a;
+  --color-base-05: var(--color-base-30);
+  --code-background: #122a25;
+  --color-base-10: #0b1614;
+  --color-base-20: #10201d;
+  --color-base-25: #1e332f;
+  --color-base-30: #253a35;
+  --color-base-35: var(--color-base-30);
+  --color-base-40: #253a35;
+  --color-base-50: #a08d57;
+  --color-base-70: #ad9962;
+  --color-base-100: #cabbab;
 
-    --background-modifier-message: #12312b;
+  --background-modifier-message: #12312b;
 
-    --color-accent: #b49967;
-    --color-accent-1: #b49967;
-    --color-accent-2: #c9ab73;
+  --color-accent: #b49967;
+  --color-accent-1: #b49967;
+  --color-accent-2: #c9ab73;
 
-    --activeline: #22373270;
-    --text-selection: #334b45b5;
+  --activeline: #22373270;
+  --text-selection: #334b45b5;
 
-    --color-bold: #359e87;
-    --color-italic: #1cacb4;
+  --color-bold: #359e87;
+  --color-italic: #1cacb4;
 
-    --text-highlight-bg: #a0632666;
+  --text-highlight-bg: #a0632666;
 
-    --heading-formatting-color: #a83d3d;
+  --heading-formatting-color: #a83d3d;
 
-    --in-between-background: #0c1815;
+  --in-between-background: #0c1815;
 
-    // Theme Extras
-    --background-modifier-form-field: var(--color-base-25);
+  // Theme Extras
+  --background-modifier-form-field: var(--color-base-25);
 
-    --interactive-normal: var(--color-base-30);
-    --interactive-hover: var(--color-base-35);
+  --interactive-normal: var(--color-base-30);
+  --interactive-hover: var(--color-base-35);
+
+  --text-highlight-bg-active: var(--text-highlight-bg);
+}
+
+.color-scheme-alchemy:not(.separate-color-scheme) {
+  &.theme-dark {
+    @include alchemy-dark-mode;
+  }
+
+  &.theme-light {
+    @include alchemy-light-mode;
+  }
+}
+
+.separate-color-scheme {
+  &.dm-color-scheme-alchemy {
+    &.theme-dark {
+      @include alchemy-dark-mode;
+    }
+  }
 
-    --text-highlight-bg-active: var(--text-highlight-bg);
+  &.lm-color-scheme-alchemy {
+    &.theme-light {
+      @include alchemy-light-mode;
+    }
   }
 }