fix: ui alignment

Vinzent03 · Aug 29, 2023 · a9adfff · a9adfff
1 parent f07304a
commit a9adfff
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 16 deletions.
diff --git a/src/ui/history/components/logFileComponent.svelte b/src/ui/history/components/logFileComponent.svelte
@@ -45,6 +45,7 @@
 >
     <div
         class="tree-item-self is-clickable nav-file-title"
+        data-path={diff.vault_path}
         aria-label-position={side}
         aria-label={diff.vault_path}
     >
@@ -71,8 +72,7 @@
 
 <style lang="scss">
     main {
-        .nav-file-title-content {
-            display: flex;
+        .nav-file-title {
             align-items: center;
         }
     }

diff --git a/src/ui/sourceControl/components/fileComponent.svelte b/src/ui/sourceControl/components/fileComponent.svelte
@@ -84,6 +84,7 @@
 >
     <div
         class="tree-item-self is-clickable nav-file-title"
+        data-path={change.vault_path}
         aria-label-position={side}
         aria-label={change.vault_path}
     >
@@ -131,8 +132,7 @@
 
 <style lang="scss">
     main {
-        .nav-file-title-content {
-            display: flex;
+        .nav-file-title {
             align-items: center;
         }
     }

diff --git a/src/ui/sourceControl/components/pulledFileComponent.svelte b/src/ui/sourceControl/components/pulledFileComponent.svelte
@@ -35,6 +35,7 @@
     <!-- svelte-ignore a11y-unknown-aria-attribute -->
     <div
         class="tree-item-self is-clickable nav-file-title"
+        data-path={change.vault_path}
         aria-label-position={side}
         aria-label={change.vault_path}
     >
@@ -51,8 +52,7 @@
 
 <style lang="scss">
     main {
-        .nav-file-title-content {
-            display: flex;
+        .nav-file-title {
             align-items: center;
         }
     }

diff --git a/src/ui/sourceControl/components/stagedFileComponent.svelte b/src/ui/sourceControl/components/stagedFileComponent.svelte
@@ -60,6 +60,7 @@
 >
     <div
         class="tree-item-self is-clickable nav-file-title"
+        data-path={change.vault_path}
         aria-label-position={side}
         aria-label={change.vault_path}
     >
@@ -92,8 +93,7 @@
 
 <style lang="scss">
     main {
-        .nav-file-title-content {
-            display: flex;
+        .nav-file-title {
             align-items: center;
         }
     }

diff --git a/src/ui/sourceControl/components/treeComponent.svelte b/src/ui/sourceControl/components/treeComponent.svelte
@@ -211,8 +211,7 @@
 
 <style lang="scss">
     main {
-        .nav-folder-title-content {
-            display: flex;
+        .nav-folder-title {
             align-items: center;
         }
     }

diff --git a/src/ui/sourceControl/sourceControl.svelte b/src/ui/sourceControl/sourceControl.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import { Platform, setIcon } from "obsidian";
+    import { SOURCE_CONTROL_VIEW_CONFIG } from "src/constants";
     import ObsidianGit from "src/main";
     import {
         FileStatusResult,
@@ -98,15 +99,18 @@
         const unPushedCommits = await plugin.gitManager.getUnpushedCommits();
 
         buttons.forEach((btn) => {
-            if(Platform.isMobile){
+            if (Platform.isMobile) {
                 btn.removeClass("button-border");
                 if (btn.id == "push" && unPushedCommits > 0) {
                     btn.addClass("button-border");
                 }
-            }else{
-                btn.firstElementChild?.removeAttribute("color")
+            } else {
+                btn.firstElementChild?.removeAttribute("color");
                 if (btn.id == "push" && unPushedCommits > 0) {
-                    btn.firstElementChild?.setAttr("color","var(--text-accent)")
+                    btn.firstElementChild?.setAttr(
+                        "color",
+                        "var(--text-accent)"
+                    );
                 }
             }
         });
@@ -217,7 +221,7 @@
     $: rows = (commitMessage.match(/\n/g) || []).length + 1 || 1;
 </script>
 
-<main>
+<main data-type={SOURCE_CONTROL_VIEW_CONFIG.type}>
     <div class="nav-header">
         <div class="nav-buttons-container">
             <div
@@ -403,7 +407,7 @@
                         {/if}
                     </div>
                     <div
-                        class="changes nav-folder"
+                        class="changes tree-item nav-folder"
                         class:is-collapsed={!changesOpen}
                     >
                         <div
@@ -619,6 +623,10 @@
         }
     }
 
+    .nav-folder-title {
+        align-items: center;
+    }
+
     .git-commit-msg-clear-button {
         position: absolute;
         background: transparent;