From 80e50839a6f1ca4f24fa72fef0ae2f11496db199 Mon Sep 17 00:00:00 2001 From: peterpeterparker Date: Thu, 14 May 2020 13:09:14 +0200 Subject: [PATCH] feat: replace "toggle" with "transform" Signed-off-by: peterpeterparker --- .../app-actions-element.tsx | 4 +-- .../editor/app-slot-type/app-slot-type.scss | 19 +++++++++-- .../editor/app-slot-type/app-slot-type.tsx | 32 +++++++++++++------ studio/src/assets/assets.json | 3 +- .../src/assets/icons/ionicons/color-wand.svg | 1 + 5 files changed, 45 insertions(+), 14 deletions(-) create mode 100644 studio/src/assets/icons/ionicons/color-wand.svg diff --git a/studio/src/app/components/editor/actions/element/app-actions-element/app-actions-element.tsx b/studio/src/app/components/editor/actions/element/app-actions-element/app-actions-element.tsx index eeb19b8a5..4b5cb6c14 100644 --- a/studio/src/app/components/editor/actions/element/app-actions-element/app-actions-element.tsx +++ b/studio/src/app/components/editor/actions/element/app-actions-element/app-actions-element.tsx @@ -1163,8 +1163,8 @@ export class AppActionsElement { Options , this.openSlotType()} aria-label="Toggle element type" color="primary" mode="md" class={classToggle}> - - Toggle + + Transform , ]; } diff --git a/studio/src/app/popovers/editor/app-slot-type/app-slot-type.scss b/studio/src/app/popovers/editor/app-slot-type/app-slot-type.scss index 1d3470c4c..713ef1488 100644 --- a/studio/src/app/popovers/editor/app-slot-type/app-slot-type.scss +++ b/studio/src/app/popovers/editor/app-slot-type/app-slot-type.scss @@ -18,14 +18,29 @@ app-slot-type { ion-list { ion-item { h1, - h2, - h3 { + h2 { font-weight: 500; } + h3 { + font-weight: 400; + } + + h1, + h2, + h3, p { margin: 0; } + + ion-icon { + color: var(--ion-color-dark); + } + + span.placeholder { + width: 26px; + margin: 12px 32px 12px 0; + } } } diff --git a/studio/src/app/popovers/editor/app-slot-type/app-slot-type.tsx b/studio/src/app/popovers/editor/app-slot-type/app-slot-type.tsx index 018aff067..1c483af95 100644 --- a/studio/src/app/popovers/editor/app-slot-type/app-slot-type.tsx +++ b/studio/src/app/popovers/editor/app-slot-type/app-slot-type.tsx @@ -5,7 +5,7 @@ import {SlotUtils} from '../../../utils/editor/slot.utils'; @Component({ tag: 'app-slot-type', - styleUrl: 'app-slot-type.scss' + styleUrl: 'app-slot-type.scss', }) export class AppSlideAdd { @Element() el: HTMLElement; @@ -68,14 +68,14 @@ export class AppSlideAdd { private async closePopover(type?: SlotType) { await (this.el.closest('ion-popover') as HTMLIonPopoverElement).dismiss({ - type: this.currentType !== type ? type : null + type: this.currentType !== type ? type : null, }); } render() { return [ -

Toggle section

+

Transform element

this.closePopover()}> @@ -84,26 +84,36 @@ export class AppSlideAdd { this.closePopover(SlotType.H1)} class={this.currentType === SlotType.H1 ? 'current' : ''}> +

Huge title

this.closePopover(SlotType.H2)} class={this.currentType === SlotType.H2 ? 'current' : ''}> + +   +

Large title

this.closePopover(SlotType.H3)} class={this.currentType === SlotType.H3 ? 'current' : ''}> + +   +

Small title

this.closePopover(SlotType.SECTION)} class={this.currentType === SlotType.SECTION ? 'current' : ''}> + +   +

Paragraph

{this.renderComplexTypes()} -
+ , ]; } @@ -115,24 +125,28 @@ export class AppSlideAdd { return [ this.closePopover(SlotType.OL)} class={this.currentType === SlotType.OL ? 'current' : ''}> -

List

+ + List
, this.closePopover(SlotType.IMG)} class={this.currentType === SlotType.IMG ? 'current' : ''}> -

Image

+ + Image
, this.closePopover(SlotType.CODE)} class={this.currentType === SlotType.CODE ? 'current' : ''}> -

Code

+ + Code
, this.closePopover(SlotType.MATH)} class={this.currentType === SlotType.MATH ? 'current' : ''}> -

Math

+ + Math
-
+ , ]; } } diff --git a/studio/src/assets/assets.json b/studio/src/assets/assets.json index 1ba3463fc..7ebf49279 100644 --- a/studio/src/assets/assets.json +++ b/studio/src/assets/assets.json @@ -239,6 +239,7 @@ {"src": "/icons/align-center.svg", "ariaLabel": "Align center"}, {"src": "/icons/align-left.svg", "ariaLabel": "Align left"}, {"src": "/icons/align-right.svg", "ariaLabel": "Align right"}, - {"src": "/icons/math.svg", "ariaLabel": "Math"} + {"src": "/icons/math.svg", "ariaLabel": "Math"}, + {"src": "/icons/ionicons/color-wand.svg", "ariaLabel": "Transform element"} ] } diff --git a/studio/src/assets/icons/ionicons/color-wand.svg b/studio/src/assets/icons/ionicons/color-wand.svg new file mode 100644 index 000000000..5d118c52c --- /dev/null +++ b/studio/src/assets/icons/ionicons/color-wand.svg @@ -0,0 +1 @@ +ionicons-v5-m