Radish alpha
r
radicle-explorer
Radicle web interface
Radicle
Git (anonymous pull)
Log in to clone via SSH
Commits ›
Move patch and issue icons into state badge
Sebastian Martinez committed 2 years ago
commit a7c0aea1b3c5171677f6033835cd8c583c9b291a
parent f038827231340472bf399910f16586d6ef1216d8
2 files changed +3 -48
modified src/views/projects/Issue.svelte
@@ -30,7 +30,6 @@
  import Embeds from "@app/views/projects/Cob/Embeds.svelte";

  import ErrorModal from "@app/modals/ErrorModal.svelte";

  import ExtendedTextarea from "@app/components/ExtendedTextarea.svelte";
- 
  import Icon from "@app/components/Icon.svelte";

  import IconButton from "@app/components/IconButton.svelte";

  import IconSmall from "@app/components/IconSmall.svelte";

  import InlineMarkdown from "@app/components/InlineMarkdown.svelte";
@@ -450,12 +449,6 @@
    height: 22px;

    margin-top: 1rem;

  }
- 
  .open {
- 
    color: var(--color-fill-success);
- 
  }
- 
  .closed {
- 
    color: var(--color-foreground-red);
- 
  }



  @media (max-width: 720px) {

    .issue {
@@ -470,12 +463,6 @@
      <CobHeader id={issue.id}>

        <svelte:fragment slot="title">

          {#if issueState !== "read"}
- 
            <div
- 
              class="state"
- 
              class:closed={issue.state.status === "closed"}
- 
              class:open={issue.state.status === "open"}>
- 
              <Icon name="issue" />
- 
            </div>

            <TextInput

              placeholder="Title"

              bind:value={issue.title}
@@ -484,12 +471,6 @@
            <span class="txt-missing">No title</span>

          {:else}

            <div class="title">
- 
              <div
- 
                class="state"
- 
                class:closed={issue.state.status === "closed"}
- 
                class:open={issue.state.status === "open"}>
- 
                <Icon name="issue" />
- 
              </div>

              <InlineMarkdown fontSize="large" content={issue.title} />

            </div>

          {/if}
@@ -504,10 +485,12 @@
        <svelte:fragment slot="state">

          {#if issue.state.status === "open"}

            <Badge size="tiny" variant="positive">
+ 
              <IconSmall name="issue" />

              {issue.state.status}

            </Badge>

          {:else}

            <Badge size="tiny" variant="negative">
+ 
              <IconSmall name="issue" />

              {issue.state.status} as

              {issue.state.reason}

            </Badge>
modified src/views/projects/Patch.svelte
@@ -64,7 +64,6 @@
  import Embeds from "@app/views/projects/Cob/Embeds.svelte";

  import ErrorModal from "@app/modals/ErrorModal.svelte";

  import ExtendedTextarea from "@app/components/ExtendedTextarea.svelte";
- 
  import Icon from "@app/components/Icon.svelte";

  import IconButton from "@app/components/IconButton.svelte";

  import IconSmall from "@app/components/IconSmall.svelte";

  import InlineMarkdown from "@app/components/InlineMarkdown.svelte";
@@ -596,18 +595,6 @@
    flex-wrap: nowrap;

    gap: 0.5rem;

  }
- 
  .draft {
- 
    color: var(--color-foreground-dim);
- 
  }
- 
  .open {
- 
    color: var(--color-fill-success);
- 
  }
- 
  .archived {
- 
    color: var(--color-foreground-yellow);
- 
  }
- 
  .merged {
- 
    color: var(--color-fill-primary);
- 
  }

  .metadata-section-header {

    font-size: var(--font-size-small);

    margin-bottom: 0.75rem;
@@ -656,14 +643,6 @@
      <CobHeader id={patch.id}>

        <svelte:fragment slot="title">

          {#if patchState !== "read"}
- 
            <div
- 
              class="state"
- 
              class:draft={patch.state.status === "draft"}
- 
              class:open={patch.state.status === "open"}
- 
              class:merged={patch.state.status === "merged"}
- 
              class:archived={patch.state.status === "archived"}>
- 
              <Icon name="patch" />
- 
            </div>

            <TextInput

              placeholder="Title"

              bind:value={patch.title}
@@ -672,14 +651,6 @@
            <span class="txt-missing">No title</span>

          {:else}

            <div class="title">
- 
              <div
- 
                class="state"
- 
                class:draft={patch.state.status === "draft"}
- 
                class:open={patch.state.status === "open"}
- 
                class:merged={patch.state.status === "merged"}
- 
                class:archived={patch.state.status === "archived"}>
- 
                <Icon name="patch" />
- 
              </div>

              <InlineMarkdown fontSize="large" content={patch.title} />

            </div>

          {/if}
@@ -693,6 +664,7 @@
        </svelte:fragment>

        <svelte:fragment slot="state">

          <Badge size="tiny" variant={badgeColor(patch.state.status)}>
+ 
            <IconSmall name="patch" />

            {patch.state.status}

          </Badge>

        </svelte:fragment>