Radish alpha
r
rad:z4D5UCArafTzTQpDZNQRuqswh3ury
Radicle desktop app
Radicle
Git
Patch view visual fixes
Merged rudolfs opened 1 year ago

See individual commits for more info.

check check-e2e

👉 Workflow runs 👉 Branch on GitHub

8 files changed +57 -25 19fdd17f ea43ffd4
modified src/components/Border.svelte
@@ -74,11 +74,11 @@
      "p5-1 p5-2 p5-3 p5-4 p5-5";
  }

-
  .container:hover .p2-3,
-
  .container:hover .p3-2,
-
  .container:hover .p3-3,
-
  .container:hover .p3-4,
-
  .container:hover .p4-3 {
+
  .container:hover > .p2-3,
+
  .container:hover > .p3-2,
+
  .container:hover > .p3-3,
+
  .container:hover > .p3-4,
+
  .container:hover > .p4-3 {
    background-color: var(--local-hover-background-color);
  }

modified src/components/Changeset/FileDiff.svelte
@@ -172,6 +172,7 @@
    width: 1px;
  }
  .selection-indicator-right {
+
    display: none; /* FIXME: fix the selection indicator */
    position: absolute;
    right: 0;
    top: 0;
modified src/components/File.svelte
@@ -18,6 +18,7 @@
    padding-left: 1rem;
    z-index: 2;
    font-size: var(--font-size-small);
+
    background-color: var(--color-background-default);
  }
  .header::after {
    position: absolute;
modified src/components/IssueSecondColumn.svelte
@@ -13,6 +13,7 @@
  import DropdownListItem from "./DropdownListItem.svelte";
  import Icon from "./Icon.svelte";
  import IssueTeaser from "@app/components/IssueTeaser.svelte";
+
  import Link from "./Link.svelte";
  import OutlineButton from "./OutlineButton.svelte";
  import Popover, { closeFocused } from "./Popover.svelte";

@@ -76,7 +77,15 @@
    style:white-space="nowrap">
    {title}
    <Icon name="chevron-right" />
-
    Issues
+
    <Link
+
      underline={false}
+
      route={{
+
        resource: "repo.issues",
+
        rid: repo.rid,
+
        status: "open",
+
      }}>
+
      Issues
+
    </Link>
  </div>

  <div class="global-flex" style:margin-left="1rem">
modified src/components/NakedButton.svelte
@@ -5,8 +5,9 @@
    children: Snippet;
    title?: string;
    variant: "primary" | "secondary" | "ghost";
-
    onclick?: () => void;
+
    onclick?: (e: MouseEvent) => void;
    styleHeight?: string;
+
    stylePadding?: string;
  }

  const {
@@ -15,6 +16,7 @@
    variant,
    onclick,
    styleHeight = "2rem",
+
    stylePadding = "0 8px",
  }: Props = $props();

  const style = $derived(
@@ -71,7 +73,6 @@
  }
  .p3-3 {
    grid-area: p3-3;
-
    padding: 0 8px;
    display: flex;
    align-items: center;
    gap: 0.5rem;
@@ -232,7 +233,7 @@

  <div class="pixel p3-1"></div>
  <div class="pixel p3-2"></div>
-
  <div class="pixel p3-3 txt-semibold txt-small">
+
  <div class="pixel p3-3 txt-semibold txt-small" style:padding={stylePadding}>
    {@render children()}
  </div>
  <div class="pixel p3-4"></div>
modified src/components/RevisionSelector.svelte
@@ -54,10 +54,19 @@
  }
</style>

-
<Popover popoverPadding="0" popoverPositionTop="2.5rem" popoverPositionLeft="0">
+
<Popover popoverPadding="0" popoverPositionTop="37px" popoverPositionLeft="0">
  {#snippet toggle(onclick)}
-
    <NakedButton variant="ghost" {onclick}>
-
      <Icon name="chevron-down" />
+
    <NakedButton
+
      variant="ghost"
+
      onclick={(e: MouseEvent) => {
+
        e.stopPropagation();
+
        e.preventDefault();
+
        onclick();
+
      }}
+
      stylePadding="0 4px">
+
      <div style:color="var(--color-foreground-contrast)">
+
        <Icon name="chevron-down" />
+
      </div>
    </NakedButton>
  {/snippet}

modified src/components/Tab.svelte
@@ -30,13 +30,14 @@
    display: flex;
    flex-direction: row;
    font-size: var(--font-size-small);
+
    height: 38px;
  }

  .wrapper {
    position: relative;
    display: flex;
    gap: 0.5rem;
-
    padding: 5px 0;
+
    padding: 3px 0;
    align-items: center;
  }

modified src/views/repo/Patch.svelte
@@ -30,6 +30,7 @@
  import InlineTitle from "@app/components/InlineTitle.svelte";
  import LabelInput from "@app/components/LabelInput.svelte";
  import Layout from "./Layout.svelte";
+
  import Link from "@app/components/Link.svelte";
  import OutlineButton from "@app/components/OutlineButton.svelte";
  import PatchStateBadge from "@app/components/PatchStateBadge.svelte";
  import PatchStateButton from "@app/components/PatchStateButton.svelte";
@@ -345,7 +346,15 @@
      <div class="global-flex" style:gap="4px">
        {project.data.name}
        <Icon name="chevron-right" />
-
        Patches
+
        <Link
+
          underline={false}
+
          route={{
+
            resource: "repo.patches",
+
            rid: repo.rid,
+
            status: "open",
+
          }}>
+
          Patches
+
        </Link>
      </div>

      <Popover popoverPositionRight="0" popoverPositionTop="2.5rem">
@@ -546,7 +555,7 @@
            {formatOid(patch.id)}
            <span
              class="global-counter"
-
              style:height="22px"
+
              style:height="24px"
              style:color="var(--color-foreground-contrast)">
              Initial
            </span>
@@ -558,17 +567,18 @@
                tab = "revisions";
              }}>
              {formatOid(selectedRevision.id)}
-
              <RevisionBadges revision={selectedRevision} {revisions} />
+
              <div class="global-flex" style:gap="0.25rem">
+
                <RevisionBadges revision={selectedRevision} {revisions} />
+
                <RevisionSelector
+
                  {patch}
+
                  {revisions}
+
                  {selectedRevision}
+
                  selectRevision={rev => {
+
                    selectedRevision = rev;
+
                    tab = "revisions";
+
                  }} />
+
              </div>
            </Tab>
-

-
            <RevisionSelector
-
              {patch}
-
              {revisions}
-
              {selectedRevision}
-
              selectRevision={rev => {
-
                selectedRevision = rev;
-
                tab = "revisions";
-
              }} />
          {/if}

          <div style:margin-left="auto">