Merge branch 'main' of https://github.com/jimrandomh/faceclaw into android-wear-integration

# Conflicts:
#	app/phone-ui/main-page.xml
#	app/phone-ui/main-view-model.ts
This commit is contained in:
James Babcock committed 2026-08-24 22:24:03 -07:00
commit 646335cb64
63 files changed
+1296 -621

No files matched your search

+101 -6
View File
@@ -20,6 +20,15 @@ TextField {
color: #222222;
}
/* Without this, the theme's .ns-dark rules recolour the text white while the
* white background above sticks, rendering white-on-white fields.
* Order matters: .system-name-modal TextField must stay after this rule so the
* deliberately light modal wins the equal-specificity tie in dark mode. */
.ns-dark TextField {
background-color: #2e2e2e;
color: #f0f0f0;
}
.system-name-modal TextField {
background-color: #ffffff;
color: #222222;
@@ -29,6 +38,18 @@ Button.-primary {
font-size: 18;
}
/* Body/explanatory text in the onboarding flow; the theme default is too
* small to comfortably read paragraphs of legalese, especially on tablets. */
.body-text {
font-size: 18;
}
/* The logo art is black-on-transparent; tint it light in dark mode so it
* doesn't vanish into the dark page background. */
.ns-dark .onboarding-logo {
tint-color: #e6e6e6;
}
/*
* Stands in for the lens preview when showing it would be misleading (silent
* mode, or a disconnect explained by a flat battery). Sized by the view model
@@ -183,6 +204,7 @@ Button.-primary {
.pairing-title {
font-size: 16;
font-weight: bold;
color: #222222;
}
.pairing-badge {
@@ -244,15 +266,88 @@ Button.-primary {
padding: 10;
}
.pairing-diagnostics {
font-size: 11;
color: #888888;
font-family: monospace;
}
Button.pairing-link {
background-color: transparent;
color: #2a5bc4;
font-size: 14;
border-width: 0;
}
/*
* Dark-mode pairing page. The cards keep their light-mode look above; here
* they go dark-gray, and every text colour set above gets a light counterpart
* so nothing renders dark-on-dark (the instructions) or dark-on-a-dark-card.
* Order matters: the -selected/-incomplete rules must follow .pairing-row so
* they win at equal specificity.
*/
.ns-dark .pairing-instructions {
color: #b0b0b0;
}
.ns-dark .pairing-empty {
color: #999999;
}
.ns-dark .pairing-row {
background-color: #2e2e2e;
border-color: #4a4a4a;
}
.ns-dark .pairing-row-selected {
background-color: #333c4c;
border-color: #5b8def;
}
.ns-dark .pairing-row-incomplete {
background-color: #282828;
border-color: #3c3c3c;
}
.ns-dark .pairing-title {
color: #f0f0f0;
}
.ns-dark .pairing-badge {
color: #a8c4f5;
background-color: #2a3b5e;
}
.ns-dark .pairing-variant {
color: #cccccc;
}
.ns-dark .pairing-proximity {
color: #a0a0a0;
}
.ns-dark .pairing-proximity-immediate {
color: #7da7f5;
}
.ns-dark .pairing-serial {
color: #a0a0a0;
}
.ns-dark .pairing-arms {
color: #c0c0c0;
}
.ns-dark .pairing-warning {
color: #e08a66;
}
.ns-dark .pairing-swatch-label {
color: #aaaaaa;
}
.ns-dark .pairing-chevron {
color: #bbbbbb;
}
.ns-dark .pairing-selection {
background-color: #2e2e2e;
}
.ns-dark Button.pairing-link {
color: #7da7f5;
}