Skip to content
This repository was archived by the owner on Feb 6, 2024. It is now read-only.

Commit dcd79cc

Browse files
feat(#544): show opacity
Signed-off-by: peterpeterparker <[email protected]>
1 parent f484e29 commit dcd79cc

File tree

6 files changed

+40
-22
lines changed

6 files changed

+40
-22
lines changed

studio/src/app/components/editor/color/app-color-chart/app-color-chart.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ enum ApplyColorType {
1111
STROKE,
1212
TEXT,
1313
AXIS,
14-
GRID
14+
GRID,
1515
}
1616

1717
@Component({
18-
tag: 'app-color-chart'
18+
tag: 'app-color-chart',
1919
})
2020
export class AppColorDeckSlide {
2121
@Element() el: HTMLElement;
@@ -207,7 +207,9 @@ export class AppColorDeckSlide {
207207
</ion-item>,
208208

209209
<ion-item-divider class="ion-padding-top">
210-
<ion-label>Opacity</ion-label>
210+
<ion-label>
211+
Opacity <small>{this.colorOpacity}%</small>
212+
</ion-label>
211213
</ion-item-divider>,
212214

213215
<ion-item class="item-opacity">
@@ -227,15 +229,15 @@ export class AppColorDeckSlide {
227229
onColorChange={($event: CustomEvent) => this.selectColor($event)}
228230
color-rgb={this.color}>
229231
<ion-icon src="/assets/icons/ionicons/ellipsis-vertical.svg" slot="more" aria-label="More" class="more"></ion-icon>
230-
</deckgo-color>
232+
</deckgo-color>,
231233
];
232234
}
233235

234236
private renderColorOptions() {
235237
const options = [
236238
<ion-select-option value={ApplyColorType.FILL}>Fill</ion-select-option>,
237239
<ion-select-option value={ApplyColorType.STROKE}>Stroke</ion-select-option>,
238-
<ion-select-option value={ApplyColorType.TEXT}>Text</ion-select-option>
240+
<ion-select-option value={ApplyColorType.TEXT}>Text</ion-select-option>,
239241
];
240242

241243
if (this.chartType != SlideChartType.PIE) {

studio/src/app/components/editor/color/app-color-code/app-color-code.tsx

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ enum CodeColorType {
1111
KEYWORD,
1212
FUNCTION,
1313
REGEX,
14-
LINE_NUMBERS
14+
LINE_NUMBERS,
1515
}
1616

1717
@Component({
1818
tag: 'app-color-code',
19-
styleUrl: 'app-color-code.scss'
19+
styleUrl: 'app-color-code.scss',
2020
})
2121
export class AppColorCode {
2222
@Element() el: HTMLElement;
@@ -323,7 +323,9 @@ export class AppColorCode {
323323
</ion-item>
324324

325325
<ion-item-divider class="ion-padding-top">
326-
<ion-label>Opacity</ion-label>
326+
<ion-label>
327+
Opacity <small>{this.codeColorOpacity}%</small>
328+
</ion-label>
327329
</ion-item-divider>
328330

329331
<ion-item class="item-opacity">
@@ -370,7 +372,9 @@ export class AppColorCode {
370372
</ion-item>
371373

372374
<ion-item-divider class="ion-padding-top">
373-
<ion-label>Opacity</ion-label>
375+
<ion-label>
376+
Opacity <small>{this.highlightColorOpacity}%</small>
377+
</ion-label>
374378
</ion-item-divider>
375379

376380
<ion-item class="item-opacity">
@@ -393,7 +397,7 @@ export class AppColorCode {
393397
<ion-icon src="/assets/icons/ionicons/ellipsis-vertical.svg" slot="more" aria-label="More" class="more"></ion-icon>
394398
</deckgo-color>
395399
</div>
396-
</ion-list>
400+
</ion-list>,
397401
];
398402
}
399403
}

studio/src/app/components/editor/color/app-color-qrcode/app-color-qrcode.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import {ColorUtils, InitStyleColor} from '../../../../utils/editor/color.utils';
55

66
enum ApplyColorType {
77
QR_CODE,
8-
BACKGROUND
8+
BACKGROUND,
99
}
1010

1111
@Component({
12-
tag: 'app-color-qrcode'
12+
tag: 'app-color-qrcode',
1313
})
1414
export class AppColorQRCode {
1515
@Element() el: HTMLElement;
@@ -158,7 +158,9 @@ export class AppColorQRCode {
158158
</ion-item>
159159
</ion-radio-group>
160160
<ion-item-divider class="ion-padding-top">
161-
<ion-label>Opacity</ion-label>
161+
<ion-label>
162+
Opacity <small>{this.colorOpacity}%</small>
163+
</ion-label>
162164
</ion-item-divider>
163165
<ion-item class="item-opacity">
164166
<ion-range
@@ -182,7 +184,7 @@ export class AppColorQRCode {
182184
<ion-button shape="round" onClick={() => this.resetColor()} fill="outline" class="delete">
183185
<ion-label>{this.resetLabelContent()}</ion-label>
184186
</ion-button>
185-
</ion-item>
187+
</ion-item>,
186188
];
187189
}
188190

studio/src/app/components/editor/color/app-color-sides/app-color-sides.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import {ColorUtils, InitStyleColor} from '../../../../utils/editor/color.utils';
55

66
enum ApplyColorType {
77
TEXT,
8-
BACKGROUND
8+
BACKGROUND,
99
}
1010

1111
@Component({
12-
tag: 'app-color-sides'
12+
tag: 'app-color-sides',
1313
})
1414
export class AppColorSides {
1515
@Element() el: HTMLElement;
@@ -177,7 +177,9 @@ export class AppColorSides {
177177
</ion-item>
178178
</ion-radio-group>
179179
<ion-item-divider class="ion-padding-top">
180-
<ion-label>Opacity</ion-label>
180+
<ion-label>
181+
Opacity <small>{this.colorOpacity}%</small>
182+
</ion-label>
181183
</ion-item-divider>
182184
<ion-item class="item-opacity">
183185
<ion-range
@@ -201,7 +203,7 @@ export class AppColorSides {
201203
<ion-button shape="round" onClick={() => this.resetColor()} fill="outline" class="delete">
202204
<ion-label>{this.resetLabelContent()}</ion-label>
203205
</ion-button>
204-
</ion-item>
206+
</ion-item>,
205207
];
206208
}
207209

studio/src/app/components/editor/color/app-color-text-background/app-color-text-background.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import {ColorUtils, InitStyleColor} from '../../../../utils/editor/color.utils';
55

66
enum ApplyColorType {
77
TEXT,
8-
BACKGROUND
8+
BACKGROUND,
99
}
1010

1111
@Component({
12-
tag: 'app-color-text-background'
12+
tag: 'app-color-text-background',
1313
})
1414
export class AppColorTextBackground {
1515
@Element() el: HTMLElement;
@@ -193,7 +193,9 @@ export class AppColorTextBackground {
193193
</ion-item>
194194
</ion-radio-group>
195195
<ion-item-divider class="ion-padding-top">
196-
<ion-label>Opacity</ion-label>
196+
<ion-label>
197+
Opacity <small>{this.colorOpacity}%</small>
198+
</ion-label>
197199
</ion-item-divider>
198200
<ion-item class="item-opacity">
199201
<ion-range
@@ -217,7 +219,7 @@ export class AppColorTextBackground {
217219
<ion-button shape="round" onClick={() => this.resetColor()} fill="outline" class="delete">
218220
<ion-label>{this.resetLabelContent()}</ion-label>
219221
</ion-button>
220-
</ion-item>
222+
</ion-item>,
221223
];
222224
}
223225

studio/src/app/popovers/editor/app-color/app-color.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,10 @@ app-color {
1111
ion-item.item-opacity {
1212
--padding-start: 8px;
1313
}
14+
15+
ion-item-divider {
16+
small {
17+
font-size: var(--font-size-very-small);
18+
}
19+
}
1420
}

0 commit comments

Comments
 (0)