diff --git a/src/pug/index.pug b/src/pug/index.pug index 643b9aa..6515f50 100644 --- a/src/pug/index.pug +++ b/src/pug/index.pug @@ -3,7 +3,6 @@ html(lang="en") head meta(charset="utf-8") meta(name="viewport", content="width=device-width, initial-scale=1.0") - link(rel="preload" href="/fonts/material-symbols-outlined.woff2" as="font" type="font/woff2" crossorigin) title Onefinity CNC - Web interface @@ -16,7 +15,6 @@ html(lang="en") style: include ../svelte-components/node_modules/svelte-material-ui/bare.css style: include ../../build/http/svelte-components/smui.css style: include ../../build/http/svelte-components/style.css - style: include ../../build/http/svelte-components/material-symbols-outlined.css style: include:stylus ../stylus/style.styl body(v-cloak) diff --git a/src/pug/templates/control-view.pug b/src/pug/templates/control-view.pug index c805a7a..4151b16 100644 --- a/src/pug/templates/control-view.pug +++ b/src/pug/templates/control-view.pug @@ -61,7 +61,7 @@ script#control-view-template(type="text/x-template") button(@click="jog_fn(-1,0,0,0)") X- td(style="height:100px",align="center") button(@click="ask_zero_xy_msg = true") - .fa.fa-bullseye(style="font-size: 172%") + .fa.fa-bullseye(style="font-size: 173%") td(style="height:100px",align="center") button(@click="jog_fn(1,0,0,0)") X+ td(style="height:100px",align="center") diff --git a/src/resources/fonts/material-symbols-outlined.woff2 b/src/resources/fonts/material-symbols-outlined.woff2 deleted file mode 100644 index a162be0..0000000 Binary files a/src/resources/fonts/material-symbols-outlined.woff2 and /dev/null differ diff --git a/src/svelte-components/public/material-symbols-outlined.css b/src/svelte-components/public/material-symbols-outlined.css deleted file mode 100644 index b40236d..0000000 --- a/src/svelte-components/public/material-symbols-outlined.css +++ /dev/null @@ -1,28 +0,0 @@ -/* To browse the icons in material-symbols, see https://marella.me/material-symbols/demo/ */ - -@font-face { - font-family: "Material Symbols Outlined"; - font-style: normal; - font-weight: 100 700; - font-display: block; - src: url("./fonts/material-symbols-outlined.woff2") format("woff2"); - } - .material-symbols-outlined { - font-family: "Material Symbols Outlined"; - font-weight: normal; - font-style: normal; - font-size: 24px; - line-height: 1; - letter-spacing: normal; - text-transform: none; - display: inline-block; - white-space: nowrap; - word-wrap: normal; - direction: ltr; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - text-rendering: optimizeLegibility; - font-feature-settings: "liga"; - - font-variation-settings: "FILL" 1, "wght" 400, "GRAD" 0, "opsz" 48; - } diff --git a/src/svelte-components/src/components/AdminNetworkView.svelte b/src/svelte-components/src/components/AdminNetworkView.svelte index 453c59e..72d8844 100644 --- a/src/svelte-components/src/components/AdminNetworkView.svelte +++ b/src/svelte-components/src/components/AdminNetworkView.svelte @@ -15,22 +15,24 @@ network: {} as WifiNetwork, }; - function getWifiStrengthIcon(network: WifiNetwork) { + function getWifiStrengthStyle(network: WifiNetwork) { const strength = Math.ceil((Number(network.Quality) / 100) * 4); switch (strength) { case 0: + return "clip-path: circle(0px at 12.5px 19px);"; + case 1: - return ""; + return "clip-path: circle(4px at 12.5px 19px);"; case 2: - return "wifi_1_bar"; + return "clip-path: circle(8px at 12.5px 19px);"; case 3: - return "wifi_2_bar"; + return "clip-path: circle(14px at 12.5px 19px);"; case 4: - return "wifi"; + return ""; } } @@ -104,17 +106,16 @@ ? 'active' : ''}" > - wifi - - {getWifiStrengthIcon(network)} - + + {network.Name} {#if network.Encryption !== "Open"} - lock + {/if} @@ -189,8 +190,8 @@ span { position: absolute; - width: 24px; - height: 24px; + top: 5px; + font-size: 22px; &.background { opacity: 0.25; diff --git a/src/svelte-components/src/dialogs/WifiConnectionDialog.svelte b/src/svelte-components/src/dialogs/WifiConnectionDialog.svelte index 78e2ae2..24feaf1 100644 --- a/src/svelte-components/src/dialogs/WifiConnectionDialog.svelte +++ b/src/svelte-components/src/dialogs/WifiConnectionDialog.svelte @@ -18,8 +18,8 @@ $: needPassword = !network?.active && network?.Encryption !== "Open"; $: connectOrDisconnect = network?.active ? "Disconnect" : "Connect"; $: connectToOrDisconnectFrom = network?.active - ? "Disconnect from" - : "Connect to"; + ? "Disconnect from" + : "Connect to"; $: if (open) { password = ""; @@ -48,7 +48,9 @@ aria-labelledby="wifi-connection-dialog-title" aria-describedby="wifi-connection-dialog-content" > - {connectToOrDisconnectFrom} {network.Name} + {connectToOrDisconnectFrom} {network.Name} {#if needPassword} @@ -64,9 +66,7 @@ slot="trailingIcon" on:click={() => (showPassword = !showPassword)} > - - {showPassword ? "password" : "abc"} - + Wifi passwords must be 8 to 128 characters