Skip to content

Development #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mbeckrich wants to merge 20 commits into
base: main
Choose a base branch
from
Draft

Development #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2cc5897
First commit of 1.0.0 rewrite
mbeckrich Sep 4, 2023
6451c69
Add further color implementation and tweaks
mbeckrich Sep 16, 2023
66dd1ac
Add Style Settings css
mbeckrich Sep 20, 2023
2dcfb50
Fix setting buttons, various tweaks
mbeckrich Oct 19, 2023
dd79ed8
Feedback time?
mbeckrich Oct 26, 2023
f8ae3b9
Fix inconsistent active element colors
mbeckrich Dec 1, 2023
1c7a9a1
Add changes to shadows, colors, etc.
mbeckrich Dec 22, 2023
1ebf984
Add improved(?) palette generation mixin
mbeckrich Dec 23, 2023
a56ce4c
Fix search bar button appearance
mbeckrich Dec 23, 2023
c031976
Fix inconsistent search highlights in settings
mbeckrich Dec 23, 2023
ddccc59
Add old plugin css back in
mbeckrich Dec 23, 2023
4637e5d
Add font css
mbeckrich Dec 23, 2023
c986768
Add commented excalidraw basics
mbeckrich Dec 28, 2023
4012b25
Add light theme
mbeckrich Dec 28, 2023
f816e28
Change pills to blue to match style guide
mbeckrich Jan 4, 2024
1f588f3
Change pill bg back and color to blue
mbeckrich Jan 4, 2024
4ce87bd
Compile sass
mbeckrich Jan 4, 2024
7ee9226
Fix: #102, disclaimer position in settings
mbeckrich Dec 19, 2024
4c09b03
Fix: #102, disclaimer position in settings
mbeckrich Dec 19, 2024
3cfbdf9
Fix: #104 duplicate ctp-peach
mbeckrich Jan 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .stylelintrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ rules:
- true
- ignoreProperties:
- "/^mask-/"
string-quotes: single

4 changes: 4 additions & 0 deletions HISTORY.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
+ update ./scss/base/_app-variables.scss with any changes to app.css
+ rewrite theme

## [1.0.0] - 2023-9-3
### Adds
+ The first phase of the rewrite of the theme. Everything is currently barebones, but the basics should all work and look a bit nicer than they do on the main branch (properties in particular are broken on main right now).

## [0.4.17] - 2023-8-14
### Adds
+ Transition effects now exist on button/dropdown hovers
Expand Down
2 changes: 1 addition & 1 deletion manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Catppuccin",
"version": "0.4.17",
"version": "2.0.0",
"minAppVersion": "1.0.0",
"author": "Marshall Beckrich",
"authorUrl": "https://github.com/catppuccin/obsidian"
Expand Down
2,652 changes: 0 additions & 2,652 deletions obsidian.css
View file
Open in desktop

This file was deleted.

1,603 changes: 154 additions & 1,449 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
},
"homepage": "https://github.com/catppuccin/obsidian#readme",
"volta": {
"node": "18.12.1",
"npm": "9.2.0"
"node": "21.2.0",
"npm": "10.2.4"
},
"dependencies": {
"stylelint": "^14.16.1",
Expand All @@ -30,3 +30,4 @@
"stylelint-order": "^6.0.0"
}
}

329 changes: 0 additions & 329 deletions scss/base/_ctp-style-settings.scss → scss/_style-settings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,332 +768,3 @@ settings:
collapsed: false
description: 💎 View and contribute to the port at github.com/catppuccin/obsidian
*/

.theme-light,
.theme-light.ctp-latte {
--ctp-rosewater: 220, 138, 120;
--ctp-flamingo: 221, 120, 120;
--ctp-pink: 234, 118, 203;
--ctp-mauve: 136, 57, 239;
--ctp-red: 210, 15, 57;
--ctp-maroon: 230, 69, 83;
--ctp-peach: 254, 100, 11;
--ctp-yellow: 223, 142, 29;
--ctp-green: 64, 160, 43;
--ctp-teal: 23, 146, 153;
--ctp-sky: 4, 165, 229;
--ctp-sapphire: 32, 159, 181;
--ctp-blue: 30, 102, 245;
--ctp-lavender: 114, 135, 253;
--ctp-text: 76, 79, 105;
--ctp-subtext1: 92, 95, 119;
--ctp-subtext0: 108, 111, 133;
--ctp-overlay2: 124, 127, 147;
--ctp-overlay1: 140, 143, 161;
--ctp-overlay0: 156, 160, 176;
--ctp-surface2: 172, 176, 190;
--ctp-surface1: 188, 192, 204;
--ctp-surface0: 204, 208, 218;
--ctp-base: 239, 241, 245;
--ctp-mantle: 230, 233, 239;
--ctp-crust: 220, 224, 232;
--hex-pink: #ea76cb;
--hex-mauve: #8839ef;
--hex-red: #d20f39;
--hex-peach: #fe640b;
--hex-yellow: #df8e1d;
--hex-green: #40a02b;
--hex-teal: #179299;
--hex-sky: #04a5e5;
--hex-sapphire: #209fb5;
--hex-blue: #1e66f5;
--hex-lavender: #7287fd;
}

.theme-dark.ctp-frappe {
--ctp-rosewater: 242, 213, 207;
--ctp-flamingo: 238, 190, 190;
--ctp-pink: 244, 184, 228;
--ctp-mauve: 202, 158, 230;
--ctp-red: 231, 130, 132;
--ctp-maroon: 234, 153, 156;
--ctp-peach: 239, 159, 118;
--ctp-yellow: 229, 200, 144;
--ctp-green: 166, 209, 137;
--ctp-teal: 129, 200, 190;
--ctp-sky: 153, 209, 219;
--ctp-sapphire: 133, 193, 220;
--ctp-blue: 140, 170, 238;
--ctp-lavender: 186, 187, 241;
--ctp-text: 198, 208, 245;
--ctp-subtext1: 181, 191, 226;
--ctp-subtext0: 165, 173, 206;
--ctp-overlay2: 148, 156, 187;
--ctp-overlay1: 131, 139, 167;
--ctp-overlay0: 115, 121, 148;
--ctp-surface2: 98, 104, 128;
--ctp-surface1: 81, 87, 109;
--ctp-surface0: 65, 69, 89;
--ctp-base: 48, 52, 70;
--ctp-mantle: 41, 44, 60;
--ctp-crust: 35, 38, 52;
--hex-pink: #f4b8e4;
--hex-mauve: #ca9ee6;
--hex-red: #e78284;
--hex-peach: #ef9f76;
--hex-yellow: #e5c890;
--hex-green: #a6d189;
--hex-teal: #81c8be;
--hex-sky: #99d1db;
--hex-sapphire: #85c1dc;
--hex-blue: #8caaee;
--hex-lavender: #babbf1;
}

.theme-dark.ctp-macchiato {
--ctp-rosewater: 244, 219, 214;
--ctp-flamingo: 240, 198, 198;
--ctp-pink: 245, 189, 230;
--ctp-mauve: 198, 160, 246;
--ctp-red: 237, 135, 150;
--ctp-maroon: 238, 153, 160;
--ctp-peach: 245, 169, 127;
--ctp-yellow: 238, 212, 159;
--ctp-green: 166, 218, 149;
--ctp-teal: 139, 213, 202;
--ctp-sky: 145, 215, 227;
--ctp-sapphire: 125, 196, 228;
--ctp-blue: 138, 173, 244;
--ctp-lavender: 183, 189, 248;
--ctp-text: 202, 211, 245;
--ctp-subtext1: 184, 192, 224;
--ctp-subtext0: 165, 173, 203;
--ctp-overlay2: 147, 154, 183;
--ctp-overlay1: 128, 135, 162;
--ctp-overlay0: 110, 115, 141;
--ctp-surface2: 91, 96, 120;
--ctp-surface1: 73, 77, 100;
--ctp-surface0: 54, 58, 79;
--ctp-base: 36, 39, 58;
--ctp-mantle: 30, 32, 48;
--ctp-crust: 24, 25, 38;
--hex-pink: #f5bde6;
--hex-mauve: #c6a0f6;
--hex-red: #ed8796;
--hex-peach: #f5a97f;
--hex-yellow: #eed49f;
--hex-green: #a6da95;
--hex-teal: #8bd5ca;
--hex-sky: #91d7e3;
--hex-sapphire: #7dc4e4;
--hex-blue: #8aadf4;
--hex-lavender: #b7bdf8;
}

.theme-dark,
.theme-dark.ctp-mocha {
--ctp-rosewater: 245, 224, 220;
--ctp-flamingo: 242, 205, 205;
--ctp-pink: 245, 194, 231;
--ctp-mauve: 203, 166, 247;
--ctp-red: 243, 139, 168;
--ctp-maroon: 235, 160, 172;
--ctp-peach: 250, 179, 135;
--ctp-yellow: 249, 226, 175;
--ctp-green: 166, 227, 161;
--ctp-teal: 148, 226, 213;
--ctp-sky: 137, 220, 235;
--ctp-sapphire: 116, 199, 236;
--ctp-blue: 137, 180, 250;
--ctp-lavender: 180, 190, 254;
--ctp-text: 205, 214, 244;
--ctp-subtext1: 186, 194, 222;
--ctp-subtext0: 166, 173, 200;
--ctp-overlay2: 147, 153, 178;
--ctp-overlay1: 127, 132, 156;
--ctp-overlay0: 108, 112, 134;
--ctp-surface2: 88, 91, 112;
--ctp-surface1: 69, 71, 90;
--ctp-surface0: 49, 50, 68;
--ctp-base: 30, 30, 46;
--ctp-mantle: 24, 24, 37;
--ctp-crust: 17, 17, 27;
--hex-pink: #f5c2e7;
--hex-mauve: #cba6f7;
--hex-red: #f38ba8;
--hex-peach: #fab387;
--hex-yellow: #f9e2af;
--hex-green: #a6e3a1;
--hex-teal: #94e2d5;
--hex-sky: #89dceb;
--hex-sapphire: #74c7ec;
--hex-blue: #89b4fa;
--hex-lavender: #b4befe;
}

.theme-light,
.theme-dark {
--color-red-rgb: var(--ctp-red);
--color-red: var(--hex-red);
--color-orange-rgb: var(--ctp-peach);
--color-orange: var(--hex-peach);
--color-yellow-rgb: var(--ctp-yellow);
--color-yellow: var(--hex-yellow);
--color-green-rgb: var(--ctp-green);
--color-green: var(--hex-green);
--color-cyan-rgb: var(--ctp-sapphire);
--color-cyan: var(--hex-sapphire);
--color-blue-rgb: var(--ctp-blue);
--color-blue: var(--hex-blue);
--color-purple-rgb: var(--ctp-mauve);
--color-purple: var(--hex-mauve);
--color-pink-rgb: var(--ctp-pink);
--color-pink: var(--hex-pink);
}

/* ------------------Selecting Accents------------------- */

.ctp-full-palette {
--ctp-accent: var(--ctp-lavender);
}

.ctp-accent-rosewater {
--ctp-accent: var(--ctp-rosewater);
}

.ctp-accent-flamingo {
--ctp-accent: var(--ctp-flamingo);
}

.ctp-accent-pink {
--ctp-accent: var(--ctp-pink);
}

.ctp-accent-mauve {
--ctp-accent: var(--ctp-mauve);
}

.ctp-accent-red {
--ctp-accent: var(--ctp-red);
}

.ctp-accent-maroon {
--ctp-accent: var(--ctp-maroon);
}

.ctp-accent-peach {
--ctp-accent: var(--ctp-peach);
}

.ctp-accent-yellow {
--ctp-accent: var(--ctp-yellow);
}

.ctp-accent-green {
--ctp-accent: var(--ctp-green);
}

.ctp-accent-teal {
--ctp-accent: var(--ctp-teal);
}

.ctp-accent-sky {
--ctp-accent: var(--ctp-sky);
}

.ctp-accent-sapphire {
--ctp-accent: var(--ctp-sapphire);
}

.ctp-accent-blue {
--ctp-accent: var(--ctp-blue);
}

.ctp-accent-lavender {
--ctp-accent: var(--ctp-lavender);
}

/* ------------------Actual Configs-------------------- */
.theme-dark,
.theme-light {
--background-primary: rgb(var(--ctp-base));
--background-primary-rgb: var(--ctp-base);
--background-primary-alt: rgb(var(--ctp-mantle));
--background-secondary: rgb(var(--ctp-mantle));
--background-secondary-alt: rgb(var(--ctp-crust));
--background-modifier-border: rgb(var(--ctp-surface0));
--background-modifier-form-field: rgb(var(--ctp-crust), 30%);
--background-modifier-form-field-highlighted: rgb(var(--ctp-crust), 22%);
--background-modifier-box-shadow: rgb(var(--ctp-crust), 30%);
--background-modifier-success: rgb(var(--ctp-green), 90%);
--background-modifier-success-rgb: var(--ctp-green);
--background-modifier-error: rgb(var(--ctp-red), 90%);
--background-modifier-error-rgb: var(--ctp-red);
--background-modifier-error-hover: rgb(var(--ctp-red), 100%);
--background-modifier-cover: rgb(var(--ctp-crust), 90%);
--color-accent: rgb(var(--ctp-accent));
--color-accent-1: rgb(var(--ctp-accent));
--color-accent-2: rgb(var(--ctp-accent), 90%);
--text-accent: rgb(var(--ctp-accent));
--text-accent-hover: rgb(var(--ctp-accent));
--text-normal: rgb(var(--ctp-text));
--text-muted: rgb(var(--ctp-subtext0));
--text-muted-rgb: var(--ctp-subtext0);
--text-faint: rgb(var(--ctp-surface1));
--text-error: rgb(var(--ctp-red));
--text-error-hover: rgb(var(--ctp-red), 80%);
--text-highlight-bg: rgb(var(--ctp-rosewater), 100%);
--text-highlight-bg-active: rgb(var(--ctp-rosewater), 100%);
--text-selection: rgb(var(--ctp-rosewater), 100%);
--text-on-accent: rgb(var(--ctp-base));
--interactive-normal: rgb(var(--ctp-surface0));
--interactive-hover: rgb(var(--ctp-surface1));
--interactive-accent: rgb(var(--ctp-accent));
--interactive-accent-rgb: var(--ctp-accent);
--interactive-accent-hover: rgb(var(--ctp-accent));
--interactive-success: rgb(var(--ctp-green));
--scrollbar-active-thumb-bg: rgb(var(--ctp-text), 20%);
--scrollbar-bg: rgb(var(--ctp-text), 5%);
--scrollbar-thumb-bg: rgb(var(--ctp-text), 10%);
--mono-rgb-0: var(--ctp-crust);
--mono-rgb-100: var(--ctp-text);
--color-red-rgb: var(--ctp-red);
--color-red: rgb(var(--ctp-red));
--color-green-rgb: var(--ctp-green);
--color-green: rgb(var(--ctp-green));
--color-orange: rgb(var(--ctp-peach));
--color-yellow: rgb(var(--ctp-yellow));
--color-cyan: rgb(var(--ctp-sky));
--color-blue: rgb(var(--ctp-blue));
--color-purple: rgb(var(--ctp-lavender));
--color-pink: rgb(var(--ctp-pink));
--color-base-00: rgb(var(--ctp-crust));
--color-base-10: rgb(var(--ctp-mantle));
--color-base-20: rgb(var(--ctp-base));
--color-base-25: rgb(var(--ctp-surface0));
--color-base-30: rgb(var(--ctp-surface1));
--color-base-35: rgb(var(--ctp-surface2));
--color-base-40: rgb(var(--ctp-overlay0));
--color-base-50: rgb(var(--ctp-overlay1));
--color-base-60: rgb(var(--ctp-overlay2));
--color-base-70: rgb(var(--ctp-subtext0));
--color-base-100: rgb(var(--ctp-text));
}

.theme-dark {
color-scheme: dark;

--highlight-mix-blend-mode: lighten;
}

.theme-light {
color-scheme: light;

--highlight-mix-blend-mode: darken;
}

/* ------------------CSS Snippets------------------ */

.ctp-bold-folder-title .nav-folder-title-content {
font-weight: var(--font-bold);
}
Loading