Skip to content

Commit

Permalink
Merge branch 'improve-pr-experience' of https://github.com/ZebraDevs/…
Browse files Browse the repository at this point in the history
…zeta-web into improve-pr-experience
  • Loading branch information
DE7924 committed Dec 20, 2024
2 parents dea0213 + 2049d29 commit f30a24a
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 13 deletions.
2 changes: 1 addition & 1 deletion src/components/dialog/dialog.styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,4 @@ export default css`
zeta-icon {
--icon-size: 32px;
}
`;
`;
2 changes: 1 addition & 1 deletion src/components/dialog/dialog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,4 +136,4 @@ declare global {
interface HTMLElementTagNameMap {
"zeta-dialog": ZetaDialog;
}
}
}
12 changes: 6 additions & 6 deletions src/components/fab/fab.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export type FabFlavor = Exclude<Flavor, "positive" | "negative" | "outline" | "o
@customElement("zeta-fab")
export class ZetaFab extends Flavored(BaseButton) {
static get styles() {
return [super.styles ?? [], styles];
return [super.styles ?? [], styles];
}
/**
* The label display on or below the button.
Expand All @@ -28,7 +28,7 @@ export class ZetaFab extends Flavored(BaseButton) {

@property({ type: String, reflect: true }) flavor: FabFlavor = "primary";

_round: boolean | "full" = "full";
_round: boolean | "full" = "full";

/**
* The border radius of the button. Used in place of rounded prop.
Expand All @@ -38,8 +38,8 @@ export class ZetaFab extends Flavored(BaseButton) {
return this._round;
}
set round(value: boolean | "full") {
const translatedValue: boolean | "full" = `${value}`.toLowerCase() === "true" ? true : `${value}`.toLowerCase() === "full" ? "full" : false;
this.rounded = !!translatedValue;
const translatedValue: boolean | "full" = `${value}`.toLowerCase() === "true" ? true : `${value}`.toLowerCase() === "full" ? "full" : false;
this.rounded = !!translatedValue;
this._round = translatedValue;
}

Expand All @@ -51,9 +51,9 @@ export class ZetaFab extends Flavored(BaseButton) {
/**
* Whether or not the FAB is extended.
*/
@property({ type: Boolean, reflect: true }) extended: boolean = false;
@property({ type: Boolean, reflect: true }) extended: boolean = false;

@property({ type: String, reflect: true }) size: "small" | "large" = "small";
@property({ type: String, reflect: true }) size: "small" | "large" = "small";

private getLabel() {
return this.label ? html`<div class="label">${this.label}</div>` : nothing;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export default css`
display: flex;
max-width: 64px;
}
slot{
slot {
font: var(--label-small);
}
Expand All @@ -14,8 +14,6 @@ export default css`
background-color: var(--surface-selected);
}
:host > * {
display: flex;
overflow-x: hidden;
Expand Down
2 changes: 0 additions & 2 deletions src/components/navigation-rail/navigation-rail.styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,4 @@ export default css`
::slotted(:not(zeta-navigation-rail-item)) {
display: none;
}
`;

0 comments on commit f30a24a

Please sign in to comment.