Skip to content

Commit

Permalink
Merge pull request #123 from Richardsl/dev
Browse files Browse the repository at this point in the history
merge Dev into Master, ready for realse 0.7.0
  • Loading branch information
Richardsl authored Jun 4, 2024
2 parents 53a1a9d + 8f8d9dc commit 2eac839
Show file tree
Hide file tree
Showing 25 changed files with 231 additions and 236 deletions.
18 changes: 14 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
# npm
node_modules

# ignore .obsidian folder in root directory of repo. it sometimes gets created by mistake.
.obsidian
!EXAMPLE_VAULT/.obsidian

# Don't include the compiled main.js file in the repo.
# They should be uploaded to GitHub releases instead.
/main.js
Expand All @@ -21,10 +25,16 @@ data.json
# Exclude macOS Finder (System Explorer) View States
.DS_Store

# example vault files
EXAMPLE_VAULT/.obsidian/plugins/*
# exclude workspace.json, as it clutters up the git log as its contents change frequently
EXAMPLE_VAULT/.obsidian/workspace.json

# exclude plugin contents
EXAMPLE_VAULT/.obsidian/plugins/*
!EXAMPLE_VAULT/.obsidian/plugins/hot-reload
# include heatmap-calendar plugin folder, but ignore contents except for .hotreload file
!EXAMPLE_VAULT/.obsidian/plugins/heatmap-calendar
EXAMPLE_VAULT/.obsidian/plugins/heatmap-calendar/*
!EXAMPLE_VAULT/.obsidian/plugins/heatmap-calendar/.hotreload



# exclude workspace.json
EXAMPLE_VAULT/.obsidian/workspace.json
1 change: 0 additions & 1 deletion .obsidian/app.json

This file was deleted.

3 changes: 0 additions & 3 deletions .obsidian/appearance.json

This file was deleted.

29 changes: 0 additions & 29 deletions .obsidian/core-plugins-migration.json

This file was deleted.

20 changes: 0 additions & 20 deletions .obsidian/core-plugins.json

This file was deleted.

1 change: 0 additions & 1 deletion .obsidian/hotkeys.json

This file was deleted.

143 changes: 0 additions & 143 deletions .obsidian/workspace.json

This file was deleted.

4 changes: 3 additions & 1 deletion EXAMPLE_VAULT/.obsidian/appearance.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
"theme": "system",
"translucency": false,
"accentColor": "",
"enabledCssSnippets": []
"enabledCssSnippets": [
"heatmap_styleAlternatingMonths"
]
}
4 changes: 3 additions & 1 deletion EXAMPLE_VAULT/.obsidian/core-plugins-migration.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,7 @@
"file-recovery": false,
"publish": false,
"sync": false,
"canvas": true
"canvas": true,
"properties": false,
"bookmarks": true
}
2 changes: 1 addition & 1 deletion EXAMPLE_VAULT/.obsidian/core-plugins.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"daily-notes",
"command-palette",
"editor-status",
"starred",
"bookmarks",
"workspaces"
]
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*
* Enable snippet in Settings -> Appearance -> CSS snippets
*/


/*------ Alters the colors of every alternating month -------*/

/* Light mode */
.heatmap-calendar-boxes .month-feb.isEmpty,
.heatmap-calendar-boxes .month-apr.isEmpty,
.heatmap-calendar-boxes .month-jun.isEmpty,
.heatmap-calendar-boxes .month-aug.isEmpty,
.heatmap-calendar-boxes .month-oct.isEmpty,
.heatmap-calendar-boxes .month-dec.isEmpty {
background: #e2e2e2 !important;
/* border: 1px solid #e2e2e2;*/
}

/* Dark mode */
.theme-dark .heatmap-calendar-boxes .month-feb.isEmpty,
.theme-dark .heatmap-calendar-boxes .month-apr.isEmpty,
.theme-dark .heatmap-calendar-boxes .month-jun.isEmpty,
.theme-dark .heatmap-calendar-boxes .month-aug.isEmpty,
.theme-dark .heatmap-calendar-boxes .month-oct.isEmpty,
.theme-dark .heatmap-calendar-boxes .month-dec.isEmpty {
background: #424242 !important;
/* border: 1px solid #414141;*/
}


/* -------------------------------------------------------- */
2 changes: 1 addition & 1 deletion EXAMPLE_VAULT/Overview extended.md
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ dv.span("**🔗Writing **- Dont break the chain! 🔗🔗🔗🔗")
const calendarData = {
year: 2022,
colors: {
white: ["#fff","#fff","#fff","#fff333","#fff"],
transparent: ["transparent"],
},
entries: []
}
Expand Down
3 changes: 2 additions & 1 deletion EXAMPLE_VAULT/Overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ dv.span("**🔗 Writing **- Dont break the chain! 🔗🔗🔗🔗")
const calendarData = {
year: 2022, // optional, remove this line to autoswitch year
colors: {
white: ["#fff","#fff","#fff","#fff","#fff"],
//white: ["#fff","#fff","#fff","#fff","#fff"],
transparent: ["transparent"],
},
entries: []
}
Expand Down
Loading

0 comments on commit 2eac839

Please sign in to comment.