Radish alpha
r
rad:z4D5UCArafTzTQpDZNQRuqswh3ury
Radicle desktop app
Radicle
Git
Improve Sidebars to make them more equal
Draft did:key:z6MkkfM3...sVz5 opened 1 year ago
3 files changed +21 -39 53d49e0b e792c7ae
modified src/components/HomeSidebar.svelte
@@ -128,7 +128,7 @@
          class="tab txt-small"
          class:active={!activeTab.filter}
          onclick={() => router.push({ resource: "home" })}>
-
          <div class="global-flex"><Icon name="repo" />Repositories</div>
+
          <div class="global-flex"><Icon name="repo" />All Repositories</div>
          <div class="global-counter">
            {repoCount.total}
          </div>
@@ -145,7 +145,7 @@
            })}>
          <div class="global-flex">
            <Icon name="delegate" />
-
            <div>Delegate</div>
+
            <div>Delegate of</div>
          </div>
          <div class="global-counter">{repoCount.delegate}</div>
        </div>
@@ -161,7 +161,7 @@
            })}>
          <div class="global-flex">
            <Icon name="user" />
-
            <div>Contributor</div>
+
            <div>Contributor of</div>
          </div>
          <div class="global-counter">{repoCount.contributor}</div>
        </div>
modified src/components/IssuesSecondColumn.svelte
@@ -71,8 +71,8 @@
        styleWidth="100%"
        underline={false}
        route={{ resource: "repo.issues", rid: repo.rid, status: "all" }}>
-
        <div class="tab active">
-
          <div class="global-flex"><Icon name="issue" />Issues</div>
+
        <div class="tab" class:active={status === "all"}>
+
          <div class="global-flex"><Icon name="issue" />All Issues</div>
          <div class="global-counter">
            {project.meta.issues.open + project.meta.issues.closed}
          </div>
@@ -88,12 +88,10 @@
          status: "open",
        }}>
        <div class="tab" class:active={status === "open"}>
-
          <div
-
            class="global-flex"
-
            class:open={["open", "all"].includes(status)}>
+
          <div class="global-flex" class:open={status === "open"}>
            <Icon name="issue" />Open
          </div>
-
          <div class="global-counter" class:highlight={status === "all"}>
+
          <div class="global-counter" class:highlight={status === "open"}>
            {project.meta.issues.open}
          </div>
        </div>
@@ -108,12 +106,10 @@
          status: "closed",
        }}>
        <div class="tab" class:active={status === "closed"}>
-
          <div
-
            class="global-flex"
-
            class:closed={["closed", "all"].includes(status)}>
+
          <div class="global-flex" class:closed={status === "closed"}>
            <Icon name="issue-closed" />Closed
          </div>
-
          <div class="global-counter" class:highlight={status === "all"}>
+
          <div class="global-counter" class:highlight={status === "closed"}>
            {project.meta.issues.closed}
          </div>
        </div>
@@ -124,7 +120,7 @@
      <Link
        styleWidth="100%"
        underline={false}
-
        route={{ resource: "repo.patches", rid: repo.rid, status: "open" }}>
+
        route={{ resource: "repo.patches", rid: repo.rid, status: undefined }}>
        <div
          class="tab"
          style:color="var(--color-foreground-contrast)"
modified src/components/PatchesSecondColumn.svelte
@@ -44,12 +44,6 @@
    background-color: var(--color-background-default);
    font-weight: var(--font-weight-semibold);
  }
-
  .highlight {
-
    color: var(--color-foreground-contrast);
-
  }
-
  .draft {
-
    color: var(--color-fill-gray);
-
  }
  .open {
    color: var(--color-fill-success);
  }
@@ -71,7 +65,7 @@
      <Link
        styleWidth="100%"
        underline={false}
-
        route={{ resource: "repo.issues", rid: repo.rid, status: "open" }}>
+
        route={{ resource: "repo.issues", rid: repo.rid, status: "all" }}>
        <div
          class="tab"
          style:color="var(--color-foreground-contrast)"
@@ -93,8 +87,8 @@
        styleWidth="100%"
        underline={false}
        route={{ resource: "repo.patches", rid: repo.rid, status: undefined }}>
-
        <div class="tab active">
-
          <div class="global-flex"><Icon name="patch" />Patches</div>
+
        <div class="tab" class:active={status === undefined}>
+
          <div class="global-flex"><Icon name="patch" />All Patches</div>
          <div class="global-counter">
            {project.meta.patches.draft +
              project.meta.patches.open +
@@ -113,13 +107,11 @@
          status: "open",
        }}>
        <div class="tab" class:active={status === "open"}>
-
          <div
-
            class="global-flex"
-
            class:open={["open", undefined].includes(status)}>
+
          <div class="global-flex" class:open={status === "open"}>
            <Icon name="patch" />
            Open
          </div>
-
          <div class="global-counter" class:highlight={status === undefined}>
+
          <div class="global-counter">
            {project.meta.patches.open}
          </div>
        </div>
@@ -134,12 +126,10 @@
          status: "merged",
        }}>
        <div class="tab" class:active={status === "merged"}>
-
          <div
-
            class="global-flex"
-
            class:merged={["merged", undefined].includes(status)}>
+
          <div class="global-flex" class:merged={status === "merged"}>
            <Icon name="patch-merged" />Merged
          </div>
-
          <div class="global-counter" class:highlight={status === undefined}>
+
          <div class="global-counter">
            {project.meta.patches.merged}
          </div>
        </div>
@@ -154,12 +144,10 @@
          status: "archived",
        }}>
        <div class="tab" class:active={status === "archived"}>
-
          <div
-
            class="global-flex"
-
            class:archived={["archived", undefined].includes(status)}>
+
          <div class="global-flex" class:archived={status === "archived"}>
            <Icon name="patch-archived" />Archived
          </div>
-
          <div class="global-counter" class:highlight={status === undefined}>
+
          <div class="global-counter">
            {project.meta.patches.archived}
          </div>
        </div>
@@ -173,13 +161,11 @@
          status: "draft",
        }}>
        <div class="tab" class:active={status === "draft"}>
-
          <div
-
            class="global-flex"
-
            class:draft={["draft", undefined].includes(status)}>
+
          <div class="global-flex">
            <Icon name="patch-draft" />
            Draft
          </div>
-
          <div class="global-counter" class:highlight={status === undefined}>
+
          <div class="global-counter">
            {project.meta.patches.draft}
          </div>
        </div>