Radish alpha
r
rad:z4V1sjrXqjvFdnCUbxPFqd5p4DtH5
Radicle web interface
Radicle
Git
Show dismiss button when a specific commit has been selected
Open rudolfs opened 1 year ago
3 files changed +32 -17 e31ca2d0 f4c773c8
modified src/views/projects/Source/Header.svelte
@@ -89,21 +89,34 @@
</style>

<div class="top-header">
-
  <PeerBranchSelector
-
    {peers}
-
    {peer}
-
    {baseRoute}
-
    onCanonical={Boolean(!peer && selectedBranch === project.defaultBranch)}
-
    {project}
-
    {selectedBranch} />
-
  <CommitButton
-
    styleMinWidth="0"
-
    styleWidth="100%"
-
    hideSummaryOnMobile={false}
-
    projectId={project.id}
-
    commit={lastCommit}
-
    baseUrl={node}
-
    styleRoundBorders />
+
  {#if selectedBranch}
+
    <PeerBranchSelector
+
      {peers}
+
      {peer}
+
      {baseRoute}
+
      onCanonical={Boolean(!peer && selectedBranch === project.defaultBranch)}
+
      {project}
+
      {selectedBranch} />
+
  {/if}
+
  <div class="global-flex-item txt-overflow" style:gap="1px">
+
    <CommitButton
+
      styleMinWidth="0"
+
      styleWidth="100%"
+
      hideSummaryOnMobile={false}
+
      projectId={project.id}
+
      commit={lastCommit}
+
      styleRoundBorders={Boolean(selectedBranch)}
+
      baseUrl={node} />
+
    {#if !selectedBranch}
+
      <Link route={baseRoute}>
+
        <Button
+
          variant="not-selected"
+
          styleBorderRadius="0 var(--border-radius-tiny) var(--border-radius-tiny) 0">
+
          <IconSmall name="cross" />
+
        </Button>
+
      </Link>
+
    {/if}
+
  </div>
</div>

<div class="header">
modified src/views/projects/Source/PeerBranchSelector.svelte
@@ -118,7 +118,9 @@
      slot="toggle"
      let:expanded
      let:toggle
-
      styleBorderRadius="var(--border-radius-tiny) 0 0 var(--border-radius-tiny)"
+
      styleBorderRadius={onCanonical
+
        ? "var(--border-radius-tiny)"
+
        : "var(--border-radius-tiny) 0 0 var(--border-radius-tiny)"}
      styleWidth="100%"
      on:click={toggle}
      title="Change branch"
modified src/views/projects/components/CommitButton.svelte
@@ -44,7 +44,7 @@
    {styleMinWidth}
    styleBorderRadius={styleRoundBorders
      ? "var(--border-radius-tiny)"
-
      : "0 var(--border-radius-tiny) var(--border-radius-tiny) 0"}>
+
      : "var(--border-radius-tiny) 0 0 var(--border-radius-tiny)"}>
    <div class="txt-overflow commit">
      <div class="identifier global-commit">
        {commitShortId}