Skip to content
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.

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

fix(#225): prevent callout icons from repeating #229

Open
wants to merge 54 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
f3d9420
fix(#225): prevent callout icons from repeating
antoKeinanen Feb 7, 2024
7b3a33b
build: use webpack instead of es build
antoKeinanen Apr 13, 2024
568ad6a
ci: add prettier config
antoKeinanen Apr 13, 2024
e245832
chore: format code
antoKeinanen Apr 13, 2024
30c3ff4
ref: move dependencies to development dependencies
antoKeinanen Apr 13, 2024
82e50f5
ci: add style linting
antoKeinanen Apr 13, 2024
84d20b0
chore: fix linting issues
antoKeinanen Apr 13, 2024
75eb6b6
ci: add husky bindings
antoKeinanen Apr 13, 2024
ca16c0e
ref: remove empty style sheet
antoKeinanen Apr 13, 2024
510d667
fix(#227): add money icon to custom checkboxes
antoKeinanen Apr 13, 2024
f3242ee
ref: use more expressive telephone icon
antoKeinanen Apr 13, 2024
b5346da
ref: use filled person icon
antoKeinanen Apr 13, 2024
43aa137
docs: update documentation to reflect changed icons
antoKeinanen Apr 13, 2024
adab3b4
docs: update icons image
antoKeinanen Apr 13, 2024
16596b2
Merge pull request #1 from antoKeinanen/fix/anto/money-icon-not-showing
antoKeinanen Apr 13, 2024
a304aba
fix(#226): remove padding form active line highlighting
antoKeinanen Apr 13, 2024
0735e06
Merge pull request #3 from antoKeinanen/fix/anto/incorrect-indenting-…
antoKeinanen Apr 13, 2024
5983929
ref: revert color functions automatic lint as it broke a lot of color…
antoKeinanen Apr 14, 2024
74d0a54
fix(#217): display aside callout titles
antoKeinanen Apr 14, 2024
e96d8b8
Merge pull request #4 from antoKeinanen/fix/FireIsGood/nested-aside-t…
antoKeinanen Apr 14, 2024
638b603
fix(#222): style new kanban cart form
antoKeinanen Apr 14, 2024
3d83018
Merge pull request #5 from antoKeinanen/fix/Anto/kanban-add-input-bor…
antoKeinanen Apr 14, 2024
adb90ae
docs: add fork disclaimer to readme
antoKeinanen Apr 14, 2024
bb221c4
feat(#224): style document properties
antoKeinanen Apr 14, 2024
956a3f1
Merge pull request #6 from antoKeinanen/feat/Anto/style-document-prop…
antoKeinanen Apr 14, 2024
40b17ef
fix: adapt kanban lane add button's text color to theme
antoKeinanen Apr 14, 2024
5b3c6f2
fix(#220): let kanban card form take up all the available height
antoKeinanen Apr 14, 2024
750bcfd
Merge pull request #7 from antoKeinanen/fix/Anto/kanban-add-card-disp…
antoKeinanen Apr 14, 2024
163271e
feat(#218): add option to disable image desaturation
antoKeinanen Apr 14, 2024
513d9ef
Merge pull request #8 from antoKeinanen/feat/Anto/add-image-desaturat…
antoKeinanen Apr 14, 2024
0e13f0c
fix(#202): fix highlights
antoKeinanen Apr 14, 2024
d2aa5c1
Merge pull request #9 from antoKeinanen/fix/Anto/highlights
antoKeinanen Apr 14, 2024
e7ce82f
fix(#213): make inline codeblock text pink in all modes
antoKeinanen Apr 14, 2024
f3a8d4f
Merge pull request #10 from antoKeinanen/fix/Anto/inconsistent-inline…
antoKeinanen Apr 14, 2024
f1d08a5
docs: add new showcase images
antoKeinanen Apr 14, 2024
66853e8
docs: fix incorrect image
antoKeinanen Apr 14, 2024
de53cb5
docs: update readme.md
antoKeinanen Apr 14, 2024
a64cd2a
chore: add myself as a maintainer
antoKeinanen Apr 14, 2024
aaee514
format readme
antoKeinanen Apr 14, 2024
9423f36
chore: bump version
antoKeinanen Apr 27, 2024
79ee899
ci: ignore released theme in lint and format
antoKeinanen Apr 27, 2024
e3bb7fb
release: 1.3.0
antoKeinanen Apr 27, 2024
e05c9a1
fix(ci): allow empty inputs for lint
antoKeinanen Apr 27, 2024
38376fd
fix: revert last 3 commits
antoKeinanen Apr 27, 2024
5013c7a
add: theme.css file
antoKeinanen Apr 27, 2024
e63f6e7
fix(#12): change text color for certain buttons in light mode
antoKeinanen Aug 4, 2024
47f9590
Merge pull request #13 from antoKeinanen/fix/buttons-in-light-theme
antoKeinanen Aug 4, 2024
ffa51c9
feat: add rule, law, and proof callouts
antoKeinanen Oct 16, 2024
5a9d908
Merge pull request #16 from antoKeinanen/feat/add-more-callouts
antoKeinanen Oct 16, 2024
8f32b4e
feat(#15): add alternative checkboxes toggle
antoKeinanen Oct 17, 2024
69550d2
Merge pull request #17 from antoKeinanen/feat/add-alternative-checkbo…
antoKeinanen Oct 17, 2024
b2ba0c2
feat(#14): add custom accent colors
antoKeinanen Oct 17, 2024
e9fbf52
Merge pull request #18 from antoKeinanen/feat/add-custom-accent-colors
antoKeinanen Oct 17, 2024
46e2503
chore: bump version
antoKeinanen Oct 17, 2024
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
6 changes: 3 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ root = true
charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = tab
indent_size = 4
tab_width = 4
indent_style = space
indent_size = 2
tab_width = 2
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# These are supported funding model platforms

ko_fi: jdanielmourao
custom: ['https://paypal.me/jdanielmourao']
custom: ["https://paypal.me/jdanielmourao"]
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ node_modules
# Exclude .env file
.env
.ENV

# build output
dist/
1 change: 1 addition & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pnpm run pre-commit
4 changes: 4 additions & 0 deletions .lintstagedrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"*.scss": ["prettier --check", "stylelint --allow-empty-input"],
"*.css": ["prettier --check", "stylelint --allow-empty-input"]
}
8 changes: 8 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
node_modules
.husky
dist
.prettierignore
.stylelintignore
.eslintignore
pnpm-lock.yaml
theme.css
5 changes: 5 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"singleQuote": false,
"tabWidth": 2,
"useTabs": false
}
3 changes: 3 additions & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
src/css/*
dist/*
theme.css
12 changes: 12 additions & 0 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"extends": [
"stylelint-config-standard-scss",
"stylelint-config-prettier-scss"
],
"rules": {
"selector-class-pattern": null,
"no-descending-specificity": null,
"color-function-notation": null,
"no-duplicate-selectors": null
}
}
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2021-2022 José Daniel Mourão (jdanielmourao)
Copyright (c) 2021-2024 José Daniel Mourão (jdanielmourao) & Anto Keinänen (antoKeinanen)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
80 changes: 39 additions & 41 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,29 +1,23 @@
## Sanctum 1.0 for Obsidian 0.16
# Sanctum Reborn

### Disclaimer for Sanctum Users
- The sidenote syntax has changed (they are now callouts. Example: `>[!aside|left]` will give a left aligned callout. If you want to make it go further left, you can add up to 5 `+` next to the `left` information (for example: `>[!aside|left +++++]` will push the sidenote to the margin, so it doesn't mess with text);
- Images work similarly to asides, but they also get a `-` syntax, as well as sizing options (`-xs`, `-s`, `-m`, `-l`(regular size), `-xl`, `xxl`, as well as a `center`/`centre` option;
- Custom checkboxes have been expanded: `*`,`a`,`f`,`S`,`-`,`>`,`<`,`l`,`B`,`X`,`n`,`p`,`c`,`w`,`b`,`I`,`!`,`?`,`i`,`/`,`u`,`d`,`F`,`r`,`m`,`M`,`L`,`t`,`T`,`P`. They should mostly match the one's in Primary;
- there are TONS of new style settings options, and more to come;
- Work on the UI is at its beginning stages. The theme has been completely rewritten from scratch (no exaggeration there), so expect regular changes in the foreseeable future!



![sanctum-readme-title](https://user-images.githubusercontent.com/91087143/136701698-2464f5d0-30d5-4ee5-9261-4cca96448192.png)
> [!NOTE]
> This is a fork from [jdanielmourao/obsidian-sanctum](https://github.com/jdanielmourao/obsidian-sanctum) as the original maintainer has gone inactive.

Sanctum’s a minimalist theme for creating a serene space of retreat, for thought and uninterrupted work.

![sanctum-readme-title](https://user-images.githubusercontent.com/91087143/136701698-2464f5d0-30d5-4ee5-9261-4cca96448192.png)

## Installation
Inside obsidian, go to `Settings ➞ Appearance ➞ Manage`, and look for `Sanctum`.

You can also manually install Sanctum by:

1. Downloading the CSS file and moving it into the folder `.obsidian/themes/` located in your vault folder;
2. Rename the css file to `Sanctum.css`;
3. In Obsidian, go to `Settings ➞ Appearance ➞ Themes ➞ Reload themes`, and select `Sanctum`.

## Disclaimer
The following theme significantly alters Obsidian's original css, and so is prone to breaking upon new Obsidian updates, as well as being incompatible with custom css snippets, which might require specific adjustments.

The following theme significantly alters Obsidian's original css, and so is prone to breaking upon new Obsidian updates, as well as being incompatible with custom css snippets, which might require specific adjustments. If you have any issues feel free to open a issue.

## Recommended Plugins

Expand All @@ -34,39 +28,47 @@ The following theme significantly alters Obsidian's original css, and so is pron
## Design Principles

**Intentional**
- This theme was made with the intent of clarifying Obsidian's UI, reducing the unnecessary clutter and keeping what's essential for an enjoyable and intuitive experience;
- Greyscale palette is the same both for light as well as dark theme;
- Colour is also used for contrast when hovering and activating elements.

- This theme was made with the intent of clarifying Obsidian's UI, reducing the unnecessary clutter and keeping what's essential for an enjoyable and intuitive experience;
- Greyscale palette is the same both for light as well as dark theme;
- Colour is also used for contrast when hovering and activating elements.

**Consistent**
- Every element is styled according to a predetermined grid, scale, animations (based on IBM's Carbon Design System) and colours - this conveys consistency throughout the theme;
- The theme was created with the intention of using only one workhorse font family, used everywhere, but styled differently. Thus the theme comes with only 1 font family - IBM Plex
- Offer a similar enjoyable experience, independently of screen size or device.

- Every element is styled according to a predetermined grid, scale, animations (based on IBM's Carbon Design System) and colours - this conveys consistency throughout the theme;
- The theme was created with the intention of using only one workhorse font family, used everywhere, but styled differently. Thus the theme comes with only 1 font family - IBM Plex
- Offer a similar enjoyable experience, independently of screen size or device.

**Clean**
- Use of calming colours, only used either to convey importance, or in the note file itself;
- The background colour is the same in every element, to reduce visual noise and give a more calming atmosphere;
- Elements are related to each other using the rules of visual *gestalt*. This means that they're grouped by proximity, in a common region or as a focal point.

## Showcase (outdated)
###### Preview Mode
![preview-showcase](https://user-images.githubusercontent.com/91087143/136707215-fb674834-e1e0-4665-b8ba-089c869a74cc.jpg)
- Use of calming colours, only used either to convey importance, or in the note file itself;
- The background colour is the same in every element, to reduce visual noise and give a more calming atmosphere;
- Elements are related to each other using the rules of visual _gestalt_. This means that they're grouped by proximity, in a common region or as a focal point.

###### Edit Mode
![edit-showcase](https://user-images.githubusercontent.com/91087143/136707216-e0957565-bfe9-49f6-bb32-16eb775d6c74.jpg)
## Showcase

###### Modal
![modal-showcase](https://user-images.githubusercontent.com/91087143/136707218-32acaa9e-4b30-46ec-b3f9-73ce2d22e301.jpg)
### Edit mode

###### Prompt
![prompt-showcase](https://user-images.githubusercontent.com/91087143/136707222-cc2ee9cf-adc9-4bab-a06f-f927d964eb57.jpg)
![](https://github.com/antoKeinanen/obsidian-sanctum-reborn/blob/main/assets/edit-dark.png?raw=true)
![](https://github.com/antoKeinanen/obsidian-sanctum-reborn/blob/main/assets/edit-light.png?raw=true)

###### Resize Handles
- Resize Handles are understated, until hovered.
### Preview mode

<img src="https://user-images.githubusercontent.com/91087143/136707350-c28ca674-fd4b-42e3-acf4-fa71a380ebf9.gif" width="200" />
![](https://github.com/antoKeinanen/obsidian-sanctum-reborn/blob/main/assets/preview-dark.png?raw=true)
![](https://github.com/antoKeinanen/obsidian-sanctum-reborn/blob/main/assets/preview-light.png?raw=true)

### Modals

![](https://github.com/antoKeinanen/obsidian-sanctum-reborn/blob/main/assets/modal-dark.png?raw=true)
![](https://github.com/antoKeinanen/obsidian-sanctum-reborn/blob/main/assets/modal-light.png?raw=true)

### Prompt

![](https://github.com/antoKeinanen/obsidian-sanctum-reborn/blob/main/assets/prompt-dark.png?raw=true)
![](https://github.com/antoKeinanen/obsidian-sanctum-reborn/blob/main/assets/prompt-light.png?raw=true)

## Features

- Custom icons (as well as custom file icons!);
- Sidenotes (credit @SlRvb);
- Multi-Color Highlights (credit @Atlas);
Expand All @@ -78,6 +80,7 @@ The following theme significantly alters Obsidian's original css, and so is pron
(for a more <u>comprehensive</u> walkthrough of Sanctum's features, check out the [Theme Guide](documentation/Theme_Guide.md))

## Plugin Support

- Advanced Tables
- Block Reference Counter
- Breadcrumbs
Expand All @@ -98,12 +101,7 @@ The following theme significantly alters Obsidian's original css, and so is pron
(for plugin support requests & issues, refer to Feedback & Contributions)

## Feedback & Contributions
If you encounter an issue, or would like to contribute to this theme, don't hesitate to submit an issue or raise a PR. You can also message me on [Discord](https://discord.com/invite/veuWUTm) @jdaniel or on the [Obsidian Forums](https://forum.obsidian.md/u/jdanielmourao/summary).

## Support
If you enjoy my work and would like to support it, you may click the icons below, or the links on the right side of this repository.

<a href="https://paypal.me/jdanielmourao"><img src="assets/PayPal.svg"></a>

[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/X8X56R5Q1)
If you encounter an issue, or would like to contribute to this theme, don't hesitate to submit an issue or raise a PR.

You can also message the current maintainer on [Discord](https://discord.com/invite/veuWUTm) `@anto.k`. Or the original author on [Discord](https://discord.com/invite/veuWUTm) `@jdaniel` or on the [Obsidian Forums](https://forum.obsidian.md/u/jdanielmourao/summary).
15 changes: 0 additions & 15 deletions assets/PayPal.svg

This file was deleted.

Binary file added assets/edit-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/edit-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/highlight-demo.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/icons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/kanban-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/kanban-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/modal-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/modal-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/preview-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/preview-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/prompt-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/prompt-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading