vault sync 10/02 17:03

.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.32.1"
+    "version": "2.36.1"
 }

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

@@ -8,17 +8,34 @@
     }
 }
 
+.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);
 }
 
 .workspace-leaf-content[data-type="git-view"] .view-content {
-    padding: 0;
+    padding-left: 0;
+    padding-top: 0;
+    padding-right: 0;
 }
 
 .workspace-leaf-content[data-type="git-history-view"] .view-content {
-    padding: 0;
+    padding-left: 0;
+    padding-top: 0;
+    padding-right: 0;
+}
+
+.loading {
+    overflow: hidden;
 }
 
 .loading > svg {
@@ -55,6 +72,15 @@
 .tooltip.mod-right {
     overflow-wrap: break-word;
 }
+
+/* Limits the scrollbar to the view body */
+.git-view {
+    display: flex;
+    flex-direction: column;
+    position: relative;
+    height: 100%;
+}
+
 .git-tools {
     display: flex;
     margin-left: auto;
@@ -81,6 +107,21 @@
     height: auto;
 }
 
+.workspace-leaf-content[data-type="git-view"] .tree-item-self,
+.workspace-leaf-content[data-type="git-history-view"] .tree-item-self {
+    align-items: center;
+}
+
+.workspace-leaf-content[data-type="git-view"]
+    .tree-item-self:hover
+    .clickable-icon,
+.workspace-leaf-content[data-type="git-history-view"]
+    .tree-item-self:hover
+    .clickable-icon {
+    color: var(--icon-color-hover);
+}
+
+/* Highlight an item as active if it's diff is currently opened */
 .is-active .git-tools .buttons > * {
     color: var(--nav-item-color-active);
 }
@@ -97,54 +138,96 @@
     color: var(--text-accent);
 }
 
-.workspace-leaf-content[data-type="diff-view"] .d2h-d-none {
+/* ====== diff2html ======
+The following styles are adapted from the obsidian-version-history plugin by
+@kometenstaub https://github.com/kometenstaub/obsidian-version-history-diff/blob/main/src/styles.scss
+which itself is adapted from the diff2html library with the following original license:
+
+   	https://github.com/rtfpessoa/diff2html/blob/master/LICENSE.md
+
+	Copyright 2014-2016 Rodrigo Fernandes https://rtfpessoa.github.io/
+
+	Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+	documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+	rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
+	persons to whom the Software is furnished to do so, subject to the following conditions:
+
+	The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+	Software.
+
+	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+	WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+	COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+	OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+.theme-dark,
+.theme-light {
+    --git-delete-bg: #ff475040;
+    --git-delete-hl: #96050a75;
+    --git-insert-bg: #68d36840;
+    --git-insert-hl: #23c02350;
+    --git-change-bg: #ffd55840;
+    --git-selected: #3572b0;
+
+    --git-delete: #c33;
+    --git-insert: #399839;
+    --git-change: #d0b44c;
+    --git-move: #3572b0;
+}
+
+.git-diff {
+    .d2h-d-none {
         display: none;
     }
-
+    .d2h-wrapper {
-.workspace-leaf-content[data-type="diff-view"] .d2h-wrapper {
         text-align: left;
+        border-radius: 0.25em;
+        overflow: auto;
     }
-
+    .d2h-file-header.d2h-file-header {
-.workspace-leaf-content[data-type="diff-view"] .d2h-file-header {
+        background-color: var(--background-secondary);
-    background-color: var(--background-primary);
+        border-bottom: 1px solid var(--background-modifier-border);
-    border-bottom: 1px solid var(--interactive-accent);
+        font-family:
-    font-family: var(--font-monospace);
+            Source Sans Pro,
+            Helvetica Neue,
+            Helvetica,
+            Arial,
+            sans-serif;
         height: 35px;
         padding: 5px 10px;
     }
-
+    .d2h-file-header,
-.workspace-leaf-content[data-type="diff-view"] .d2h-file-header,
+    .d2h-file-stats {
-.workspace-leaf-content[data-type="diff-view"] .d2h-file-stats {
         display: -webkit-box;
         display: -ms-flexbox;
         display: flex;
     }
-
+    .d2h-file-header {
-.workspace-leaf-content[data-type="diff-view"] .d2h-file-stats {
+        display: none;
+    }
+    .d2h-file-stats {
         font-size: 14px;
         margin-left: auto;
     }
-
+    .d2h-lines-added {
-.workspace-leaf-content[data-type="diff-view"] .d2h-lines-added {
+        border: 1px solid var(--color-green);
-    border: 1px solid #b4e2b4;
         border-radius: 5px 0 0 5px;
-    color: #399839;
+        color: var(--color-green);
         padding: 2px;
         text-align: right;
         vertical-align: middle;
     }
-
+    .d2h-lines-deleted {
-.workspace-leaf-content[data-type="diff-view"] .d2h-lines-deleted {
+        border: 1px solid var(--color-red);
-    border: 1px solid #e9aeae;
         border-radius: 0 5px 5px 0;
-    color: #c33;
+        color: var(--color-red);
         margin-left: 1px;
         padding: 2px;
         text-align: left;
         vertical-align: middle;
     }
-
+    .d2h-file-name-wrapper {
-.workspace-leaf-content[data-type="diff-view"] .d2h-file-name-wrapper {
         -webkit-box-align: center;
         -ms-flex-align: center;
         align-items: center;
@@ -154,26 +237,26 @@
         font-size: 15px;
         width: 100%;
     }
-
+    .d2h-file-name {
-.workspace-leaf-content[data-type="diff-view"] .d2h-file-name {
+        overflow: hidden;
-    overflow-x: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
+        color: var(--text-normal);
+        font-size: var(--h5-size);
     }
-
+    .d2h-file-wrapper {
-.workspace-leaf-content[data-type="diff-view"] .d2h-file-wrapper {
+        border: 1px solid var(--background-secondary-alt);
-    border: 1px solid var(--background-modifier-border);
         border-radius: 3px;
         margin-bottom: 1em;
+        max-height: 100%;
     }
-
+    .d2h-file-collapse {
-.workspace-leaf-content[data-type="diff-view"] .d2h-file-collapse {
         -webkit-box-pack: end;
         -ms-flex-pack: end;
         -webkit-box-align: center;
         -ms-flex-align: center;
         align-items: center;
-    border: 1px solid var(--background-modifier-border);
+        border: 1px solid var(--background-secondary-alt);
         border-radius: 3px;
         cursor: pointer;
         display: none;
@@ -181,31 +264,30 @@
         justify-content: flex-end;
         padding: 4px 8px;
     }
-
+    .d2h-file-collapse.d2h-selected {
-.workspace-leaf-content[data-type="diff-view"] .d2h-file-collapse.d2h-selected {
+        background-color: var(--git-selected);
-    background-color: #c8e1ff;
     }
-
+    .d2h-file-collapse-input {
-.workspace-leaf-content[data-type="diff-view"] .d2h-file-collapse-input {
         margin: 0 4px 0 0;
     }
-
+    .d2h-diff-table {
-.workspace-leaf-content[data-type="diff-view"] .d2h-diff-table {
         border-collapse: collapse;
-    font-family: Menlo, Consolas, monospace;
+        font-family: var(--font-monospace);
-    font-size: 13px;
+        font-size: var(--code-size);
         width: 100%;
     }
-
+    .d2h-files-diff {
-.workspace-leaf-content[data-type="diff-view"] .d2h-files-diff {
         width: 100%;
     }
-
+    .d2h-file-diff {
-.workspace-leaf-content[data-type="diff-view"] .d2h-file-diff {
+        /*
-    overflow-y: hidden;
+		overflow-y: scroll;
+		*/
+        border-radius: 5px;
+        font-size: var(--font-text-size);
+        line-height: var(--line-height-normal);
     }
-
+    .d2h-file-side-diff {
-.workspace-leaf-content[data-type="diff-view"] .d2h-file-side-diff {
         display: inline-block;
         margin-bottom: -8px;
         margin-right: -4px;
@@ -213,13 +295,12 @@
         overflow-y: hidden;
         width: 50%;
     }
-
+    .d2h-code-line {
-.workspace-leaf-content[data-type="diff-view"] .d2h-code-line {
+        padding-left: 6em;
-    padding: 0 8em;
+        padding-right: 1.5em;
     }
-
+    .d2h-code-line,
-.workspace-leaf-content[data-type="diff-view"] .d2h-code-line,
+    .d2h-code-side-line {
-.workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line {
         display: inline-block;
         -webkit-user-select: none;
         -moz-user-select: none;
@@ -228,12 +309,12 @@
         white-space: nowrap;
         width: 100%;
     }
-
+    .d2h-code-side-line {
-.workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line {
+        /* needed to be changed */
-    padding: 0 4.5em;
+        padding-left: 0.5em;
+        padding-right: 0.5em;
     }
-
+    .d2h-code-line-ctn {
-.workspace-leaf-content[data-type="diff-view"] .d2h-code-line-ctn {
         word-wrap: normal;
         background: none;
         display: inline-block;
@@ -243,276 +324,190 @@
         -ms-user-select: text;
         user-select: text;
         vertical-align: middle;
-    white-space: pre;
         width: 100%;
+        /* only works for line-by-line */
+        white-space: pre-wrap;
     }
-
+    .d2h-code-line del,
-.theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-code-line del,
+    .d2h-code-side-line del {
-.theme-light
+        background-color: var(--git-delete-hl);
-    .workspace-leaf-content[data-type="diff-view"]
+        color: var(--text-normal);
-    .d2h-code-side-line
-    del {
-    background-color: #ffb6ba;
     }
-
+    .d2h-code-line del,
-.theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-code-line del,
+    .d2h-code-line ins,
-.theme-dark
+    .d2h-code-side-line del,
-    .workspace-leaf-content[data-type="diff-view"]
+    .d2h-code-side-line ins {
-    .d2h-code-side-line
-    del {
-    background-color: #8d232881;
-}
-
-.workspace-leaf-content[data-type="diff-view"] .d2h-code-line del,
-.workspace-leaf-content[data-type="diff-view"] .d2h-code-line ins,
-.workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line del,
-.workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line ins {
         border-radius: 0.2em;
         display: inline-block;
         margin-top: -1px;
         text-decoration: none;
         vertical-align: middle;
     }
-
+    .d2h-code-line ins,
-.theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-code-line ins,
+    .d2h-code-side-line ins {
-.theme-light
+        background-color: var(--git-insert-hl);
-    .workspace-leaf-content[data-type="diff-view"]
-    .d2h-code-side-line
-    ins {
-    background-color: #97f295;
         text-align: left;
     }
-
+    .d2h-code-line-prefix {
-.theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-code-line ins,
-.theme-dark
-    .workspace-leaf-content[data-type="diff-view"]
-    .d2h-code-side-line
-    ins {
-    background-color: #1d921996;
-    text-align: left;
-}
-
-.workspace-leaf-content[data-type="diff-view"] .d2h-code-line-prefix {
         word-wrap: normal;
         background: none;
         display: inline;
         padding: 0;
         white-space: pre;
     }
-
+    .line-num1 {
-.workspace-leaf-content[data-type="diff-view"] .line-num1 {
         float: left;
     }
-
+    .line-num1,
-.workspace-leaf-content[data-type="diff-view"] .line-num1,
+    .line-num2 {
-.workspace-leaf-content[data-type="diff-view"] .line-num2 {
         -webkit-box-sizing: border-box;
         box-sizing: border-box;
         overflow: hidden;
+        /*
 		padding: 0 0.5em;
+		*/
         text-overflow: ellipsis;
-    width: 3.5em;
+        width: 2.5em;
+        padding-left: 0;
     }
-
+    .line-num2 {
-.workspace-leaf-content[data-type="diff-view"] .line-num2 {
         float: right;
     }
-
+    .d2h-code-linenumber {
-.workspace-leaf-content[data-type="diff-view"] .d2h-code-linenumber {
         background-color: var(--background-primary);
         border: solid var(--background-modifier-border);
         border-width: 0 1px;
         -webkit-box-sizing: border-box;
         box-sizing: border-box;
-    color: var(--text-muted);
+        color: var(--text-faint);
         cursor: pointer;
         display: inline-block;
         position: absolute;
         text-align: right;
-    width: 7.5em;
+        width: 5.5em;
     }
-
+    .d2h-code-linenumber:after {
-.workspace-leaf-content[data-type="diff-view"] .d2h-code-linenumber:after {
         content: "\200b";
     }
-
+    .d2h-code-side-linenumber {
-.workspace-leaf-content[data-type="diff-view"] .d2h-code-side-linenumber {
         background-color: var(--background-primary);
         border: solid var(--background-modifier-border);
         border-width: 0 1px;
         -webkit-box-sizing: border-box;
         box-sizing: border-box;
-    color: var(--text-muted);
+        color: var(--text-faint);
         cursor: pointer;
-    display: inline-block;
         overflow: hidden;
         padding: 0 0.5em;
-    position: absolute;
         text-align: right;
         text-overflow: ellipsis;
         width: 4em;
-}
+        /* needed to be changed */
-
+        display: table-cell;
-.workspace-leaf-content[data-type="diff-view"] .d2h-diff-tbody tr {
         position: relative;
     }
-
+    .d2h-code-side-linenumber:after {
-.workspace-leaf-content[data-type="diff-view"] .d2h-code-side-linenumber:after {
         content: "\200b";
     }
-
+    .d2h-code-side-emptyplaceholder,
-.workspace-leaf-content[data-type="diff-view"] .d2h-code-side-emptyplaceholder,
+    .d2h-emptyplaceholder {
-.workspace-leaf-content[data-type="diff-view"] .d2h-emptyplaceholder {
         background-color: var(--background-primary);
         border-color: var(--background-modifier-border);
     }
-
+    .d2h-code-line-prefix,
-.workspace-leaf-content[data-type="diff-view"] .d2h-code-line-prefix,
+    .d2h-code-linenumber,
-.workspace-leaf-content[data-type="diff-view"] .d2h-code-linenumber,
+    .d2h-code-side-linenumber,
-.workspace-leaf-content[data-type="diff-view"] .d2h-code-side-linenumber,
+    .d2h-emptyplaceholder {
-.workspace-leaf-content[data-type="diff-view"] .d2h-emptyplaceholder {
         -webkit-user-select: none;
         -moz-user-select: none;
         -ms-user-select: none;
         user-select: none;
     }
-
+    .d2h-code-linenumber,
-.workspace-leaf-content[data-type="diff-view"] .d2h-code-linenumber,
+    .d2h-code-side-linenumber {
-.workspace-leaf-content[data-type="diff-view"] .d2h-code-side-linenumber {
         direction: rtl;
     }
-
+    .d2h-del {
-.theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-del {
+        background-color: var(--git-delete-bg);
-    background-color: #fee8e9;
+        border-color: var(--git-delete-hl);
-    border-color: #e9aeae;
     }
-
+    .d2h-ins {
-.theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-ins {
+        background-color: var(--git-insert-bg);
-    background-color: #dfd;
+        border-color: var(--git-insert-hl);
-    border-color: #b4e2b4;
     }
-
+    .d2h-info {
-.theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-del {
-    background-color: #521b1d83;
-    border-color: #691d1d73;
-}
-
-.theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-ins {
-    background-color: rgba(30, 71, 30, 0.5);
-    border-color: #13501381;
-}
-
-.workspace-leaf-content[data-type="diff-view"] .d2h-info {
         background-color: var(--background-primary);
         border-color: var(--background-modifier-border);
+        color: var(--text-faint);
+    }
+    .d2h-del,
+    .d2h-ins,
+    .d2h-file-diff .d2h-change {
         color: var(--text-normal);
     }
-
+    .d2h-file-diff .d2h-del.d2h-change {
-.theme-light
+        background-color: var(--git-change-bg);
-    .workspace-leaf-content[data-type="diff-view"]
-    .d2h-file-diff
-    .d2h-del.d2h-change {
-    background-color: #fdf2d0;
     }
-
+    .d2h-file-diff .d2h-ins.d2h-change {
-.theme-dark
+        background-color: var(--git-insert-bg);
-    .workspace-leaf-content[data-type="diff-view"]
-    .d2h-file-diff
-    .d2h-del.d2h-change {
-    background-color: #55492480;
     }
-
+    .d2h-file-list-wrapper {
-.theme-light
+        a {
-    .workspace-leaf-content[data-type="diff-view"]
-    .d2h-file-diff
-    .d2h-ins.d2h-change {
-    background-color: #ded;
-}
-
-.theme-dark
-    .workspace-leaf-content[data-type="diff-view"]
-    .d2h-file-diff
-    .d2h-ins.d2h-change {
-    background-color: rgba(37, 78, 37, 0.418);
-}
-
-.workspace-leaf-content[data-type="diff-view"] .d2h-file-list-wrapper {
-    margin-bottom: 10px;
-}
-
-.workspace-leaf-content[data-type="diff-view"] .d2h-file-list-wrapper a {
-    color: #3572b0;
             text-decoration: none;
+            cursor: default;
+            -webkit-user-drag: none;
         }
 
-.workspace-leaf-content[data-type="diff-view"]
+        svg {
-    .d2h-file-list-wrapper
+            display: none;
-    a:visited {
-    color: #3572b0;
         }
-
+    }
-.workspace-leaf-content[data-type="diff-view"] .d2h-file-list-header {
+    .d2h-file-list-header {
         text-align: left;
     }
-
+    .d2h-file-list-title {
-.workspace-leaf-content[data-type="diff-view"] .d2h-file-list-title {
+        display: none;
-    font-weight: 700;
     }
-
+    .d2h-file-list-line {
-.workspace-leaf-content[data-type="diff-view"] .d2h-file-list-line {
         display: -webkit-box;
         display: -ms-flexbox;
         display: flex;
         text-align: left;
     }
-
+    .d2h-file-list {
-.workspace-leaf-content[data-type="diff-view"] .d2h-file-list {
-    display: block;
-    list-style: none;
-    margin: 0;
-    padding: 0;
     }
-
+    .d2h-file-list > li {
-.workspace-leaf-content[data-type="diff-view"] .d2h-file-list > li {
         border-bottom: 1px solid var(--background-modifier-border);
         margin: 0;
         padding: 5px 10px;
     }
-
+    .d2h-file-list > li:last-child {
-.workspace-leaf-content[data-type="diff-view"] .d2h-file-list > li:last-child {
         border-bottom: none;
     }
-
+    .d2h-file-switch {
-.workspace-leaf-content[data-type="diff-view"] .d2h-file-switch {
         cursor: pointer;
         display: none;
         font-size: 10px;
     }
-
+    .d2h-icon {
-.workspace-leaf-content[data-type="diff-view"] .d2h-icon {
         fill: currentColor;
         margin-right: 10px;
         vertical-align: middle;
     }
-
+    .d2h-deleted {
-.workspace-leaf-content[data-type="diff-view"] .d2h-deleted {
+        color: var(--git-delete);
-    color: #c33;
     }
-
+    .d2h-added {
-.workspace-leaf-content[data-type="diff-view"] .d2h-added {
+        color: var(--git-insert);
-    color: #399839;
     }
-
+    .d2h-changed {
-.workspace-leaf-content[data-type="diff-view"] .d2h-changed {
+        color: var(--git-change);
-    color: #d0b44c;
     }
-
+    .d2h-moved {
-.workspace-leaf-content[data-type="diff-view"] .d2h-moved {
+        color: var(--git-move);
-    color: #3572b0;
     }
-
+    .d2h-tag {
-.workspace-leaf-content[data-type="diff-view"] .d2h-tag {
+        background-color: var(--background-secondary);
-    background-color: var(--background-primary);
         display: -webkit-box;
         display: -ms-flexbox;
         display: flex;
@@ -520,21 +515,24 @@
         margin-left: 5px;
         padding: 0 2px;
     }
-
+    .d2h-deleted-tag {
-.workspace-leaf-content[data-type="diff-view"] .d2h-deleted-tag {
+        border: 1px solid var(--git-delete);
-    border: 2px solid #c33;
+    }
+    .d2h-added-tag {
+        border: 1px solid var(--git-insert);
+    }
+    .d2h-changed-tag {
+        border: 1px solid var(--git-change);
+    }
+    .d2h-moved-tag {
+        border: 1px solid var(--git-move);
     }
 
-.workspace-leaf-content[data-type="diff-view"] .d2h-added-tag {
+    /* needed for line-by-line*/
-    border: 1px solid #399839;
-}
 
-.workspace-leaf-content[data-type="diff-view"] .d2h-changed-tag {
+    .d2h-diff-tbody {
-    border: 1px solid #d0b44c;
+        position: relative;
     }
-
-.workspace-leaf-content[data-type="diff-view"] .d2h-moved-tag {
-    border: 1px solid #3572b0;
 }
 
 /* ====================== Line Authoring Information ====================== */
@@ -574,3 +572,134 @@
 .git-split-diff-view .cm-insertedLine .cm-changedText {
     background-color: #22bb2230;
 }
+
+.git-obscure-prompt[git-is-obscured="true"] #git-show-password:after {
+    -webkit-mask-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="svg-icon lucide-eye"><path d="M2.062 12.348a1 1 0 0 1 0-.696 10.75 10.75 0 0 1 19.876 0 1 1 0 0 1 0 .696 10.75 10.75 0 0 1-19.876 0"></path><circle cx="12" cy="12" r="3"></circle></svg>');
+}
+
+.git-obscure-prompt[git-is-obscured="false"] #git-show-password:after {
+    -webkit-mask-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="svg-icon lucide-eye-off"><path d="M10.733 5.076a10.744 10.744 0 0 1 11.205 6.575 1 1 0 0 1 0 .696 10.747 10.747 0 0 1-1.444 2.49"></path><path d="M14.084 14.158a3 3 0 0 1-4.242-4.242"></path><path d="M17.479 17.499a10.75 10.75 0 0 1-15.417-5.151 1 1 0 0 1 0-.696 10.75 10.75 0 0 1 4.446-5.143"></path><path d="m2 2 20 20"></path></svg>');
+}
+
+/* Override styling of Codemirror merge view "collapsed lines" indicator */
+.git-split-diff-view .ͼ2 .cm-collapsedLines {
+    background: var(--interactive-normal);
+    border-radius: var(--radius-m);
+    color: var(--text-accent);
+    font-size: var(--font-small);
+    padding: var(--size-4-1) var(--size-4-1);
+}
+.git-split-diff-view .ͼ2 .cm-collapsedLines:hover {
+    background: var(--interactive-hover);
+    color: var(--text-accent-hover);
+}
+
+.git-signs-gutter {
+    .cm-gutterElement {
+        display: grid;
+    }
+}
+
+.git-gutter-marker:hover {
+    border-radius: 2px;
+}
+
+.git-gutter-marker.git-add {
+    background-color: var(--color-green);
+    justify-self: center;
+    height: inherit;
+    width: 0.2rem;
+}
+
+.git-gutter-marker.git-change {
+    background-color: var(--color-yellow);
+    justify-self: center;
+    height: inherit;
+    width: 0.2rem;
+}
+
+.git-gutter-marker.git-changedelete {
+    color: var(--color-yellow);
+    font-weight: var(--font-bold);
+    font-size: 1rem;
+    justify-self: center;
+    height: inherit;
+}
+
+.git-gutter-marker.git-delete {
+    background-color: var(--color-red);
+    height: 0.2rem;
+    width: 0.8rem;
+    align-self: end;
+}
+
+.git-gutter-marker.git-topdelete {
+    background-color: var(--color-red);
+    height: 0.2rem;
+    width: 0.8rem;
+    align-self: start;
+}
+
+div:hover > .git-gutter-marker.git-change {
+    width: 0.6rem;
+}
+
+div:hover > .git-gutter-marker.git-add {
+    width: 0.6rem;
+}
+
+div:hover > .git-gutter-marker.git-delete {
+    height: 0.6rem;
+}
+
+div:hover > .git-gutter-marker.git-topdelete {
+    height: 0.6rem;
+}
+
+div:hover > .git-gutter-marker.git-changedelete {
+    font-weight: var(--font-bold);
+}
+
+.git-gutter-marker.staged {
+    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;
+    .git-signs-gutter {
+        margin-inline-start: -1rem;
+    }
+}
+
+.git-changes-status-bar-colored {
+    .git-add {
+        color: var(--color-green);
+    }
+    .git-change {
+        color: var(--color-yellow);
+    }
+    .git-delete {
+        color: var(--color-red);
+    }
+}
+
+.git-changes-status-bar .git-add {
+    margin-right: 0.3em;
+}
+
+.git-changes-status-bar .git-change {
+    margin-right: 0.3em;
+}