🎨✨ Begin transition to Obsidian 0.16 (incomplete)

ebullient · Sep 1, 2022 · 25184fa · 25184fa
1 parent eb01823
commit 25184fa
Show file tree

Hide file tree

Showing 26 changed files with 2,669 additions and 1,617 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ package-lock.json
 vault
 .DS_Store
 .dev-target.json
+app*.css
diff --git a/gulpfile.js b/gulpfile.js
@@ -16,7 +16,9 @@ gulp.task("css", () => {
         .pipe(
             rename(function (path) {
                 if (path.basename == "ebullientworks") {
-                    path.basename = "obsidian";
+                    path.basename = "theme";
+                } else {
+                    path.basename += "-for-0.16";
                 }
                 path.extname = ".css";
             })

diff --git a/src/ebullientworks.scss b/src/ebullientworks.scss
@@ -16,12 +16,6 @@ https://github.com/ebullient/obsidian-theme-ebullientworks
 name: Ebullientworks theme settings
 id: ebullientworks-theme
 settings:
-  -
-    id: ebullientworks-use-default-list-indent
-    title: Use the default indent for lists
-    description: This theme compresses list indent whitespace by default. Enable this to use the indent spacing from the default theme.
-    type: class-toggle
-    default: false
   -
     id: ebullientworks-nix-checkbox
     title: Suppress/Remove this theme's checkbox styles
@@ -40,12 +34,6 @@ settings:
     description: If true, external links (or the content of markdown links) will be shown in edit mode. External links are hidden by default.
     type: class-toggle
     default: false
-  -
-    id: ebullientworks-hide-inactive-collapse-indicators
-    title: Hide collapse indicators unless hovered or active
-    description: If true, hide collapse indicators in all three modes unless they are hovered over or the line is active.
-    type: class-toggle
-    default: false
   -
     id: ebullientworks-floating-frontmatter
     title: Float front-matter in a box to the right
@@ -67,13 +55,13 @@ settings:
   -
     title: Headings
     description: Font for text headings (h1 to h6); empty will use default text font
-    id: font-header
+    id: ebw-header-font
     type: variable-text
     default: "'Architects Daughter'"
   -
     title: Heading Font Variant
     description: Font variant for text headings (h1 to h6)
-    id: font-header-caps-variant
+    id: ebw-header-font-caps-variant
     type: variable-select
     allowEmpty: false
     default: small-caps
@@ -101,11 +89,11 @@ settings:
   -
     title: Tags
     description: Font for displaying inline tags; empty will use default text font
-    id: font-tags
+    id: ebw-font-tags
     type: variable-text
     default: "'Architects Daughter'"
   -
-    id: font-callout-title
+    id: ebw-font-callout-title
     title: Font for callout/admonition titles
     description: Use the specified font for callout and admonition titles
     type: variable-text
@@ -187,34 +175,28 @@ settings:
         - value: var(--tag-6)
           label: darkest
  */
-:root {
-  --line-height: 1.5em;
-}
 
 @import 'fragments/01-colors.scss';
 @import 'fragments/02-fonts.scss';
 
 @import 'fragments/03-core-theme-dark.scss';
 @import 'fragments/03-core-theme-light.scss';
 @import 'fragments/03a-workspace-layout.scss';
-@import 'fragments/03b-workspace-view.scss';
-@import 'fragments/03b-option-sidebar-hover.scss';
-@import 'fragments/03c-modal-input.scss';
-@import 'fragments/03d-graph-view.scss';
+// @import 'fragments/03b-option-sidebar-hover.scss';
+// @import 'fragments/03c-modal-input.scss';
+// @import 'fragments/03d-graph-view.scss';
 
 @import 'fragments/04-headings-hr.scss';
 @import 'fragments/05-text-links.scss';
 
 @import 'fragments/06-lists-checkboxes.scss';
 @import 'fragments/07-tags.scss';
-@import 'fragments/08-blockquote.scss';
+@import 'fragments/08-blockquote-callouts.scss';
 @import 'fragments/09-codeblocks.scss';
 @import 'fragments/10-images-embeds.scss';
 
-@import 'fragments/11-admonition.scss';
-@import 'fragments/12-calendar-day-planner-tracker.scss';
-@import 'fragments/13-timelines.scss';
+// @import 'fragments/12-calendar-day-planner-tracker.scss';
+// @import 'fragments/13-timelines.scss';
 @import 'fragments/14-frontmatter.scss';
 @import 'fragments/15-table.scss';
-@import 'fragments/16-hide-collapse-indicators.scss';
-@import 'fragments/17-indentation-guide.scss';
+
diff --git a/src/fragments/01-colors.scss b/src/fragments/01-colors.scss
@@ -37,6 +37,7 @@
   --green-1: rgb(194, 209, 198);
   --green-1-rgb: 194, 209, 198;
   --green-2: rgb(169, 190, 174);
+  --green-2-rgb: rgb(169, 190, 174);
   --green-3: rgb(139, 167, 145);
   --green-4: rgb(92, 122, 99);
   --green-4-rgb: 92, 122, 99;

diff --git a/src/fragments/02-fonts.scss b/src/fragments/02-fonts.scss
@@ -3,23 +3,16 @@
 
 :root {
   // style settings baseline
-  --eworks-font-text: 'IBM Plex Sans', Helvetica Neue;
-  --eworks-font-monospace: 'Fira Code', 'Source Code Pro', Jetbrains Mono;
-  --font-header: 'Architects Daughter';
-  --font-header-caps-variant: small-caps;
-  --font-tags: var(--font-header);
-  --font-callout-title: var(--font-header);
+  --ebw-font-text: 'IBM Plex Sans', Helvetica Neue;
+  --ebw-font-monospace: 'Fira Code', 'Source Code Pro', Jetbrains Mono;
+  --ebw-header-font: 'Architects Daughter';
+  --ebw-header-font-caps-variant: small-caps;
+  --ebw-font-tags: var(--ebw-header-font);
+  --ebw-font-callout-title: var(--ebw-header-font);
 }
 
 body {
-  --font-interface-theme: var(--eworks-font-text);
-  --font-text-theme: var(--eworks-font-text);
-  --font-monospace-theme: var(--eworks-font-monospace);
-
-  // Something wrong with Inter font as of 0.14.9 that prevent proper rendering of emoji
-  // A) re-declare font-default to remove Inter
-  // B) re-declare font-text to dis-entangle it from font-interface stack
-  --font-default: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Microsoft YaHei Light", sans-serif;
-  --font-text: var(--font-text-override), var(--font-text-theme), var(--default-font, ""), var(--font-default);
-  --cm-font-monospace: var(--font-monospace);
+  --font-interface-theme: var(--ebw-font-text);
+  --font-text-theme: var(--ebw-font-text);
+  --font-monospace-theme: var(--ebw-font-monospace);
 }
diff --git a/src/fragments/03-core-theme-dark.scss b/src/fragments/03-core-theme-dark.scss
@@ -25,6 +25,8 @@
   --text-error: var(--pink-3);
   --text-error-hover: var(--pink-2);
 
+  --text-success: var(--green-4);
+
   --text-highlight-fg: var(--gray-dark-7);
   --text-highlight-bg: var(--primary-accent-2);
   --text-highlight-bg-active: rgba(255, 216, 99, 0.664);
@@ -42,10 +44,4 @@
   --interactive-accent: var(--secondary-accent-4);         // Workspace Note Title Underline
   --interactive-accent-rgb: var(--secondary-accent-4-rgb); // Publish item select, Resize Handle
   --interactive-accent-hover: var(--primary-accent-4);     // Menu Button Hover
-  --interactive-success: var(--green-4);
-
-  --scrollbar-active-thumb-bg: rgba(255, 255, 255, 0.2);
-  --scrollbar-bg: rgba(255, 255, 255, 0.05);
-  --scrollbar-thumb-bg: rgba(255, 255, 255, 0.1);
-  --highlight-mix-blend-mode: lighten;                 //  Search Highlight Mode
 }
diff --git a/src/fragments/03-core-theme-light.scss b/src/fragments/03-core-theme-light.scss
@@ -7,48 +7,47 @@
     --background-secondary: var(--gray-light-6);               //  Sidebar background
     --background-secondary-alt: var(--gray-light-2);           //  Sidebar title background
 
-    --background-modifier-border: var(--gray-light-1);         //  Border outline of quotes, tables, line breaks
-    --background-modifier-form-field: white;
-    --background-modifier-form-field-highlighted: white;     // Search Bar Active Highlight
-    --background-modifier-box-shadow: rgba(0, 0, 0, 0.1);
-    --background-modifier-success: var(--green-2);      // Publish Upload Success Background
+    // --background-modifier-border: var(--gray-light-1);         //  Border outline of quotes, tables, line breaks
+    // --background-modifier-form-field: white;
+    // --background-modifier-form-field-highlighted: white;     // Search Bar Active Highlight
+    // --background-modifier-box-shadow: rgba(0, 0, 0, 0.1);
+
+    --background-modifier-success:     var(--green-2);      // Publish Upload Success Background
+    --background-modifier-success-rgb: var(--green-2-rgb);      // Publish Upload Success Background
+
     --background-modifier-error: var(--pink-1);           // Delete Screen Button
     --background-modifier-error-rgb: var(--pink-2-rgb); // Ctrl F Search Background
     --background-modifier-error-hover: var(--pink-2);
-    --background-modifier-cover: rgba(158, 158, 158, 0.2);   // Obsidian Title Bar
 
-    --text-accent: var(--primary-accent-4);                  // Links
-    --text-accent-hover: var(--secondary-accent-3);          // Links hover
     --text-normal: var(--gray-dark-5);                   // Text body of note
     --text-muted: var(--gray-dark-4);                    // Text darker for sidebar, toggles, inactive, tags, etc
-    --text-muted-rgb: 33, 33, 33;
     --text-faint: var(--gray-dark-1);                    // Link brackets color
 
+    --text-accent: var(--primary-accent-4);                  // Links
+    --text-accent-hover: var(--secondary-accent-3);          // Links hover
+    --text-muted-rgb: 33, 33, 33;
+
     --text-error: var(--pink-5);
-    --text-error-hover: var(--pink-4);
+    --text-error: var(--green-4);
+
+    // --text-error-hover: var(--pink-4);
 
     --text-highlight-fg: var(--text-dark-2);
     --text-highlight-bg: var(--primary-accent-0);
     --text-highlight-bg-active: rgba(252, 232, 131, 0.6);
 
     --text-selection: var(--secondary-accent-0);
 
-    --indentation-guide: var(--gray-light-3);
-    --indentation-guide-active: var(--pink-2);
+    // --indentation-guide: var(--gray-light-3);
+    // --indentation-guide-active: var(--pink-2);
 
-    /** Text on accent should work as foreground for all interactive elements */
+    // /** Text on accent should work as foreground for all interactive elements */
     --text-on-accent: var(--gray-dark-7);                // Program Title bar text
-    --interactive-normal: var(--secondary-accent-2);            // Button background Color
     --interactive-hover: var(--primary-accent-2);            // Button hover text; pin
+    --interactive-normal: var(--secondary-accent-2);            // Button background Color
     --interactive-accent: var(--secondary-accent-2);             // Workspace Note Title Underline
     --interactive-accent-rgb: var(--secondary-accent-1-rgb);    // Publish item select, Resize Handle
     --interactive-accent-hover: var(--primary-accent-2);      // Menu Button Hover
-    --interactive-success: var(--green-2);
-
-    --scrollbar-active-thumb-bg: rgba(0, 0, 0, 0.08);
-    --scrollbar-bg: rgba(0, 0, 0, 0.03);
-    --scrollbar-thumb-bg: rgba(0, 0, 0, 0.05);
-    --highlight-mix-blend-mode: lighten;                // Search Highlight Mode
 }
 .theme-dark .print,
 .theme-light .print {