Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FXVPN-12 - Move Pill button into its own component #135

Merged
merged 2 commits into from
Dec 13, 2024
Merged

FXVPN-12 - Move Pill button into its own component #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b6ed85
Move the PillButton into its own component
strseb Dec 9, 2024
0a6c47a
fix css
strseb Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 86 additions & 0 deletions src/components/mz-pill.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

import { html, LitElement, css, classMap } from "../vendor/lit-all.min.js";

/**
* `MZPillButton`
*
* Properties:
* - alt: Tooltip text for the button.
*
* Usage:
* <mz-pill enabled=true alt="Visit Example" @clicked=${Something} />
*
*/

export class MZPillButton extends LitElement {
static properties = {
enabled: { attribute: true },
alt: { attribute: true },
};
constructor() {
super();
this.enabled = true;
this.alt = "";
}
render() {
const classes = {
pill: true,
on: this.enabled,
};
return html`
<button class=${classMap(classes)} title=${this.alt}></button>
`;
}
static styles = css`
.pill {
width: 45px;
height: 24px;
border-radius: 30px;
border: none;
background-color: var(--color-disabled);
position: relative;
transition: background-color 0.2s ease;
}

.pill:hover {
background-color: var(--color-disabled-hover);
}

.pill:active {
background-color: var(--color-disabled-active);
}
.on.pill,
.connecting .pill {
background-color: var(--color-enabled);
}

.on .pill:hover {
background-color: var(--color-enabled-hover);
}

.on.pill:active {
background-color: var(--color-enabled-active);
}

.pill::before {
content: " ";
background: white;
display: box;
width: 18px;
height: 18px;
border-radius: 20px;
position: absolute;
top: 3px;
left: 3px;
transition: all 0.25s;
}
.on.pill::before {
top: 3px;
left: 24px;
}
`;
}
customElements.define("mz-pill", MZPillButton);
61 changes: 8 additions & 53 deletions src/components/vpncard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ import { resetSizing, fontStyling, positioner } from "./styles.js";

import { VPNState } from "../background/vpncontroller/states.js";
import "./mz-rings.js";

import "./mz-pill.js";

/**
* @typedef {import("../background/vpncontroller/states.js").VPNState} VPNState
*/
Expand Down Expand Up @@ -143,7 +146,10 @@ export class VPNCard extends LitElement {
)}
${timeString}
</div>
<button class="pill" @click=${this.#toggle}></button>
<mz-pill
.enabled=${this.enabled || this.connecting}
@click=${this.#toggle}
></mz-pill>
</main>
${this.enabled || this.connecting
? VPNCard.footer(this.cityName, this.countryFlag)
Expand Down Expand Up @@ -325,60 +331,9 @@ export class VPNCard extends LitElement {
margin-right: var(--default-padding);
}

.pill {
width: 45px;
height: 24px;
border-radius: 30px;
border: none;
background-color: var(--color-disabled);
position: relative;
transition: background-color 0.2s ease;
}

.pill:hover {
background-color: var(--color-disabled-hover);
}

.pill:active {
background-color: var(--color-disabled-active);
}
.on .pill,
.connecting .pill {
background-color: var(--color-enabled);
}

.connecting .pill:hover,
.on .pill:hover {
background-color: var(--color-enabled-hover);
}

.connecting .pill:active,
.on .pill:active {
background-color: var(--color-enabled-active);
}

.pill::before {
content: " ";
background: white;
display: box;
width: 18px;
height: 18px;
border-radius: 20px;
position: absolute;
top: 3px;
left: 3px;
transition: all 0.25s;
}

.connecting .pill::before,
.on .pill::before {
top: 3px;
left: 24px;
}

.box.connecting svg,
.box.connecting .timer,
.connecting .pill,
.connecting mz-pill,
.connecting footer {
opacity: 0.5;
transition: opacity 0.3s ease;
Expand Down
Loading