Browse Source

Fixes patches panes

main
Keith Daulton 1 year ago
parent
commit
9e4dbb3f67
3 changed files with 78 additions and 70 deletions
  1. +54
    -56
      src/webviews/apps/plus/patchDetails/components/gl-draft-details.ts
  2. +3
    -8
      src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts
  3. +21
    -6
      src/webviews/apps/plus/patchDetails/patchDetails.scss

+ 54
- 56
src/webviews/apps/plus/patchDetails/components/gl-draft-details.ts View File

@ -151,12 +151,10 @@ export class GlDraftDetails extends GlTreeBase {
description = description.trim();
return html`
<div class="section section--message">
<div class="message-block">
<p class="message-block__text scrollable" data-region="message">
<span>${unsafeHTML(description)}</span>
</p>
</div>
<div class="message-block">
<p class="message-block__text scrollable" data-region="message">
<span>${unsafeHTML(description)}</span>
</p>
</div>
`;
}
@ -335,29 +333,26 @@ export class GlDraftDetails extends GlTreeBase {
// <div class="patch-base">${getActions()}</div>
// </div>
return html`
<webview-pane expanded>
<span slot="title">Apply</span>
<div class="section section--sticky-actions">
<p class="button-container">
<span class="button-group button-group--single">
<gl-button full @click=${this.onApplyPatch}>Apply Patch</gl-button>
<gk-popover placement="top">
<gl-button
slot="trigger"
density="compact"
aria-label="Apply Patch Options..."
title="Apply Patch Options..."
><code-icon icon="chevron-down"></code-icon
></gl-button>
<gk-menu class="mine-menu" @select=${this.onSelectApplyOption}>
<gk-menu-item data-value="branch">Apply to a Branch</gk-menu-item>
<!-- <gk-menu-item data-value="worktree">Apply to new worktree</gk-menu-item> -->
</gk-menu>
</gk-popover>
</span>
</p>
</div>
</webview-pane>
<div class="section section--action">
<p class="button-container">
<span class="button-group button-group--single">
<gl-button full @click=${this.onApplyPatch}>Apply Patch</gl-button>
<gk-popover placement="top">
<gl-button
slot="trigger"
density="compact"
aria-label="Apply Patch Options..."
title="Apply Patch Options..."
><code-icon icon="chevron-down"></code-icon
></gl-button>
<gk-menu class="mine-menu" @select=${this.onSelectApplyOption}>
<gk-menu-item data-value="branch">Apply to a Branch</gk-menu-item>
<!-- <gk-menu-item data-value="worktree">Apply to new worktree</gk-menu-item> -->
</gk-menu>
</gk-popover>
</span>
</p>
</div>
`;
}
@ -409,36 +404,39 @@ export class GlDraftDetails extends GlTreeBase {
return html`
<div class="pane-groups">
<div class="pane-groups__group-fixed">
<div class="top-details">
<div class="top-details__top-menu">
<div class="top-details__actionbar">
<div class="top-details__actionbar-group"></div>
<div class="top-details__actionbar-group">
${when(
this.state?.draft?.draftType === 'cloud',
() => html`
<a class="commit-action" href="#" @click=${this.onCopyCloudLink}>
<code-icon icon="${this._copiedLink ? 'check' : 'link'}"></code-icon>
<span class="top-details__sha">Copy Link</span></a
>
`,
() => html`
<a
class="commit-action"
href="#"
aria-label="Share Patch"
title="Share Patch"
@click=${this.onShareLocalPatch}
>Share</a
>
`,
)}
</div>
<div class="section">
<div class="top-details__actionbar">
<div class="top-details__actionbar-group"></div>
<div class="top-details__actionbar-group">
${when(
this.state?.draft?.draftType === 'cloud',
() => html`
<a class="commit-action" href="#" @click=${this.onCopyCloudLink}>
<code-icon icon="${this._copiedLink ? 'check' : 'link'}"></code-icon>
<span class="top-details__sha">Copy Link</span></a
>
`,
() => html`
<a
class="commit-action"
href="#"
aria-label="Share Patch"
title="Share Patch"
@click=${this.onShareLocalPatch}
>Share</a
>
`,
)}
</div>
<h1 class="title">${this.state.draft?.title}</h1>
</div>
${when(
this.state.draft?.title != null,
() => html`
<h1 class="title">${this.state.draft?.title}</h1>
${this.renderPatchMessage()}
`,
)}
</div>
${this.renderPatchMessage()}
</div>
<div class="pane-groups__group">${this.renderChangedFiles()}</div>
<div class="pane-groups__group-fixed pane-groups__group--bottom">

+ 3
- 8
src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts View File

@ -108,7 +108,7 @@ export class GlPatchCreate extends GlTreeBase {
renderForm() {
return html`
<div class="section">
<div class="section section--action">
${when(
this.state?.create?.creationError != null,
() =>
@ -150,19 +150,14 @@ export class GlPatchCreate extends GlTreeBase {
return html`
<div class="pane-groups">
<div class="pane-groups__group">${this.renderChangedFiles()}</div>
<div class="pane-groups__group-fixed pane-groups__group--bottom">
<webview-pane expanded
><span slot="title">Create Patch</span
><span slot="subtitle">PREVIEW </span>${this.renderForm()}</webview-pane
>
</div>
<div class="pane-groups__group-fixed pane-groups__group--bottom">${this.renderForm()}</div>
</div>
`;
}
private renderChangedFiles() {
return html`
<webview-pane expanded>
<webview-pane class="h-no-border" expanded>
<span slot="title">Changes to Include</span>
<action-nav slot="actions">${this.renderLayoutAction(this.fileLayout)}</action-nav>

+ 21
- 6
src/webviews/apps/plus/patchDetails/patchDetails.scss View File

@ -23,9 +23,9 @@ gk-menu-item {
}
.title {
font-size: 1.8rem;
font-size: 1.6rem;
font-weight: 600;
margin: 0;
margin: 0.2rem 0 0.8rem;
}
.message-block__text strong:not(:only-child) {
@ -76,10 +76,16 @@ gk-menu-item {
}
}
textarea.message-input__control {
resize: vertical;
min-height: 4rem;
max-height: 40rem;
.section--action {
border-top: 1px solid var(--vscode-sideBarSectionHeader-border);
padding: {
top: 1.5rem;
bottom: 1.5rem;
}
> :first-child {
padding-top: 0;
}
}
.message-input {
@ -112,6 +118,12 @@ textarea.message-input__control {
}
}
textarea.message-input__control {
resize: vertical;
min-height: 4rem;
max-height: 40rem;
}
.h {
&-spacing {
margin-bottom: 1.5rem;
@ -120,6 +132,9 @@ textarea.message-input__control {
margin: 0.8rem 0 0.4rem;
opacity: 0.8;
}
&-no-border {
--vscode-sideBarSectionHeader-border: transparent;
}
}
.alert {

Loading…
Cancel
Save