initial

.obsidian/community-plugins.json

@@ -1,10 +1,10 @@
 [
-  "obsidian-git",
   "omnisearch",
   "pdf-plus",
   "obsidian-excel-to-markdown-table",
   "excel",
   "drawio-obsidian",
   "d2-obsidian",
-  "obsidian-plantuml"
+  "obsidian-plantuml",
+  "obsidian-git"
 ]

.obsidian/plugins/obsidian-git/data.json

@@ -1,68 +0,0 @@
-{
-  "commitMessage": "vault backup: {{date}}",
-  "autoCommitMessage": "vault backup: {{date}}",
-  "commitMessageScript": "",
-  "commitDateFormat": "YYYY-MM-DD HH:mm:ss",
-  "autoSaveInterval": 5,
-  "autoPushInterval": 0,
-  "autoPullInterval": 0,
-  "autoPullOnBoot": true,
-  "autoCommitOnlyStaged": false,
-  "disablePush": false,
-  "pullBeforePush": true,
-  "disablePopups": false,
-  "showErrorNotices": true,
-  "disablePopupsForNoChanges": false,
-  "listChangedFilesInMessageBody": false,
-  "showStatusBar": true,
-  "updateSubmodules": false,
-  "syncMethod": "merge",
-  "mergeStrategy": "none",
-  "customMessageOnAutoBackup": false,
-  "autoBackupAfterFileChange": false,
-  "treeStructure": false,
-  "refreshSourceControl": true,
-  "basePath": "",
-  "differentIntervalCommitAndPush": false,
-  "changedFilesInStatusBar": false,
-  "showedMobileNotice": true,
-  "refreshSourceControlTimer": 7000,
-  "showBranchStatusBar": true,
-  "setLastSaveToLastCommit": false,
-  "submoduleRecurseCheckout": false,
-  "gitDir": "",
-  "showFileMenu": true,
-  "authorInHistoryView": "initials",
-  "dateInHistoryView": false,
-  "diffStyle": "split",
-  "hunks": {
-    "showSigns": false,
-    "hunkCommands": false,
-    "statusBar": "disabled"
-  },
-  "lineAuthor": {
-    "show": false,
-    "followMovement": "inactive",
-    "authorDisplay": "initials",
-    "showCommitHash": false,
-    "dateTimeFormatOptions": "date",
-    "dateTimeFormatCustomString": "YYYY-MM-DD HH:mm",
-    "dateTimeTimezone": "viewer-local",
-    "coloringMaxAge": "1y",
-    "colorNew": {
-      "r": 255,
-      "g": 150,
-      "b": 150
-    },
-    "colorOld": {
-      "r": 120,
-      "g": 160,
-      "b": 255
-    },
-    "textColorCss": "var(--text-muted)",
-    "ignoreWhitespace": false,
-    "gutterSpacingFallbackLength": 5,
-    "lastShownAuthorDisplay": "initials",
-    "lastShownDateTimeFormatOptions": "date"
-  }
-}

.obsidian/plugins/obsidian-git/manifest.json

@@ -6,5 +6,5 @@
     "description": "Integrate Git version control with automatic backup and other advanced features.",
     "isDesktopOnly": false,
     "fundingUrl": "https://ko-fi.com/vinzent",
-    "version": "2.38.2"
+    "version": "2.38.3"
 }

.obsidian/plugins/obsidian-git/styles.css

@@ -8,15 +8,6 @@
     }
 }
 
-.git-signs-gutter {
-    .cm-gutterElement {
-        /* Needed to align the sign properly for different line heigts. Such as
-         * when having a heading or list item.
-         */
-        padding-top: 0 !important;
-    }
-}
-
 .workspace-leaf-content[data-type="git-view"] .button-border {
     border: 2px solid var(--interactive-accent);
     border-radius: var(--radius-s);
@@ -108,7 +99,7 @@
     display: flex;
 }
 .git-tools .buttons > * {
-    padding: 0 0;
+    padding: 0;
     height: auto;
 }
 
@@ -175,7 +166,7 @@ which itself is adapted from the diff2html library with the following original l
     --git-change-bg: #ffd55840;
     --git-selected: #3572b0;
 
-    --git-delete: #c33;
+    --git-delete: #cc3333;
     --git-insert: #399839;
     --git-change: #d0b44c;
     --git-move: #3572b0;
@@ -538,13 +529,24 @@ which itself is adapted from the diff2html library with the following original l
     .d2h-diff-tbody {
         position: relative;
     }
+
+    /* My additions */
+    .cm-merge-revert {
+        width: 4em;
+    }
+    /* Ensure that merge revert markers are positioned correctly */
+    .cm-merge-revert > * {
+        position: absolute;
+        background-color: var(--background-secondary);
+        display: flex;
+    }
 }
 
 /* ====================== Line Authoring Information ====================== */
 
 .cm-gutterElement.obs-git-blame-gutter {
     /* Add background color to spacing inbetween and around the gutter for better aesthetics */
-    border-width: 0px 2px 0.2px 2px;
+    border-width: 0px 2px 0.2px;
     border-style: solid;
     border-color: var(--background-secondary);
     background-color: var(--background-secondary);
@@ -557,7 +559,7 @@ which itself is adapted from the diff2html library with the following original l
     font-family: monospace;
     height: 100%; /* ensure, that age-based background color occupies entire parent */
     text-align: right;
-    padding: 0px 6px 0px 6px;
+    padding: 0px 6px;
     white-space: pre; /* Keep spaces and do not collapse them. */
 }
 
@@ -602,6 +604,11 @@ which itself is adapted from the diff2html library with the following original l
 .git-signs-gutter {
     .cm-gutterElement {
         display: grid;
+
+        /* Needed to align the sign properly for different line heigts. Such as
+         * when having a heading or list item.
+         */
+        padding-top: 0 !important;
     }
 }
 
@@ -669,18 +676,6 @@ div:hover > .git-gutter-marker.git-changedelete {
     opacity: 0.5;
 }
 
-.git-diff {
-    .cm-merge-revert {
-        width: 4em;
-    }
-    /* Ensure that merge revert markers are positioned correctly */
-    .cm-merge-revert > * {
-        position: absolute;
-        background-color: var(--background-secondary);
-        display: flex;
-    }
-}
-
 /* Prevent shifting of the editor when git signs gutter is the only gutter present */
 .cm-gutters.cm-gutters-before:has(> .git-signs-gutter:only-child) {
     margin-inline-end: 0;