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.

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

Add URL params to control fonts #783

Merged
merged 1 commit into from
Dec 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/Header.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
}

.leftNav h3 {
font-size: 18px;
font-size: var(--font-size-subtitle);
}

.nav {
Expand Down
2 changes: 1 addition & 1 deletion src/ListBox.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
padding: 8px 16px;
outline: none;
cursor: pointer;
font-size: 15px;
font-size: var(--font-size-body);
min-height: 32px;
}

Expand Down
5 changes: 4 additions & 1 deletion src/Menu.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
align-items: center;
padding: 0 12px;
color: var(--primary-content);
font-size: 14px;
font-size: var(--font-size-body);
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
}

.menuItem > * {
Expand Down
2 changes: 1 addition & 1 deletion src/Modal.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

.modalHeader h3 {
font-weight: 600;
font-size: 24px;
font-size: var(--font-size-title);
margin: 0;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Tooltip.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
border-radius: 8px;
max-width: 135px;
width: max-content;
font-size: 12px;
font-size: var(--font-size-caption);
font-weight: 500;
text-align: center;
}
60 changes: 47 additions & 13 deletions src/UrlParams.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,30 +21,60 @@ export interface UrlParams {
roomAlias: string | null;
roomId: string | null;
viaServers: string[];
// Whether the app is running in embedded mode, and should keep the user
// confined to the current room
/**
* Whether the app is running in embedded mode, and should keep the user
* confined to the current room.
*/
isEmbedded: boolean;
// Whether the app should pause before joining the call until it sees an
// io.element.join widget action, allowing it to be preloaded
/**
* Whether the app should pause before joining the call until it sees an
* io.element.join widget action, allowing it to be preloaded.
*/
preload: boolean;
// Whether to hide the room header when in a call
/**
* Whether to hide the room header when in a call.
*/
hideHeader: boolean;
// Whether to hide the screen-sharing button
/**
* Whether to hide the screen-sharing button.
*/
hideScreensharing: boolean;
// Whether to start a walkie-talkie call instead of a video call
/**
* Whether to start a walkie-talkie call instead of a video call.
*/
isPtt: boolean;
// Whether to use end-to-end encryption
/**
* Whether to use end-to-end encryption.
*/
e2eEnabled: boolean;
// The user's ID (only used in matryoshka mode)
/**
* The user's ID (only used in matryoshka mode).
*/
userId: string | null;
// The display name to use for auto-registration
/**
* The display name to use for auto-registration.
*/
displayName: string | null;
// The device's ID (only used in matryoshka mode)
/**
* The device's ID (only used in matryoshka mode).
*/
deviceId: string | null;
// The base URL of the homeserver to use for media lookups in matryoshka mode
/**
* The base URL of the homeserver to use for media lookups in matryoshka mode.
*/
baseUrl: string | null;
// The BCP 47 code of the language the app should use
/**
* The BCP 47 code of the language the app should use.
*/
lang: string | null;
/**
* The fonts which the interface should use, if not empty.
*/
fonts: string[];
/**
* The factor by which to scale the interface's font size.
*/
fontScale: number | null;
}

/**
Expand Down Expand Up @@ -81,6 +111,8 @@ export const getUrlParams = (
? fragment
: fragment.substring(0, fragmentQueryStart);

const fontScale = parseFloat(getParam("fontScale") ?? "");

return {
roomAlias: fragmentRoute.length > 1 ? fragmentRoute : null,
roomId: getParam("roomId"),
Expand All @@ -96,6 +128,8 @@ export const getUrlParams = (
deviceId: getParam("deviceId"),
baseUrl: getParam("baseUrl"),
lang: getParam("lang"),
fonts: getAllParams("font"),
fontScale: Number.isNaN(fontScale) ? null : fontScale,
};
};

Expand Down
4 changes: 2 additions & 2 deletions src/UserMenu.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
.avatar {
width: 24px;
height: 24px;
font-size: 12px;
font-size: var(--font-size-caption);
}

@media (min-width: 800px) {
.avatar {
width: 32px;
height: 32px;
font-size: 15px;
font-size: var(--font-size-body);
}
}
6 changes: 3 additions & 3 deletions src/auth/LoginPage.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

.formContainer h4 {
font-weight: normal;
font-size: 18px;
font-size: var(--font-size-subtitle);
margin-bottom: 0;
}

Expand All @@ -48,7 +48,7 @@
.formContainer button {
height: 48px;
width: 100%;
font-size: 15px;
font-size: var(--font-size-body);
font-weight: 600;
}

Expand All @@ -61,7 +61,7 @@

.authLinks {
margin-bottom: 100px;
font-size: 15px;
font-size: var(--font-size-body);
}

.authLinks a {
Expand Down
4 changes: 2 additions & 2 deletions src/button/Button.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ limitations under the License.
.copyButton {
padding: 7px 15px;
border-radius: 8px;
font-size: 14px;
font-size: var(--font-size-body);
font-weight: 700;
}

Expand Down Expand Up @@ -142,7 +142,7 @@ limitations under the License.

.copyButton span {
font-weight: 600;
font-size: 15px;
font-size: var(--font-size-body);
margin-right: 10px;
overflow: hidden;
white-space: nowrap;
Expand Down
43 changes: 28 additions & 15 deletions src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,20 @@ limitations under the License.
@import "normalize.css/normalize.css";

:root {
--font-family: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI",
"Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans",
"Helvetica Neue", sans-serif;
--inter-unicode-range: U+0000-20e2, U+20e4-23ce, U+23d0-24c1, U+24c3-259f,
U+25c2-2664, U+2666-2763, U+2765-2b05, U+2b07-2b1b, U+2b1d-10FFFF;

--font-scale: 1;
--font-size-micro: calc(10px * var(--font-scale));
--font-size-caption: calc(12px * var(--font-scale));
--font-size-body: calc(15px * var(--font-scale));
--font-size-subtitle: calc(18px * var(--font-scale));
--font-size-title: calc(24px * var(--font-scale));
--font-size-headline: calc(32px * var(--font-scale));

--accent: #0dbd8b;
--accent-20: #0dbd8b33;
--alert: #ff5b55;
Expand Down Expand Up @@ -127,9 +139,7 @@ body {
color: var(--primary-content);
color-scheme: dark;
margin: 0;
font-family: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto",
"Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
sans-serif;
font-family: var(--font-family);
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
Expand Down Expand Up @@ -159,28 +169,31 @@ a {
/* Headline Semi Bold */
h1 {
font-weight: 600;
font-size: 32px;
line-height: 39px;
font-size: var(--font-size-headline);
}

/* Title */
h2 {
font-weight: 600;
font-size: 24px;
line-height: 29px;
font-size: var(--font-size-title);
}

/* Subtitle */
h3 {
font-weight: 400;
font-size: 18px;
line-height: 22px;
font-size: var(--font-size-subtitle);
}

h1,
h2,
h3 {
line-height: 1.2;
}

/* Body */
p {
font-size: 15px;
line-height: 24px;
font-size: var(--font-size-body);
line-height: var(--font-size-title);
}

a {
Expand All @@ -202,21 +215,21 @@ hr {
text-align: center;
height: 5px;
font-weight: 600;
font-size: 15px;
font-size: var(--font-size-body);
line-height: 24px;
margin: 0 12px;
}

summary {
font-size: 14px;
font-size: var(--font-size-body);
}

details > :not(summary) {
margin-left: 16px;
margin-left: var(--font-size-body);
}

details[open] > summary {
margin-bottom: 16px;
margin-bottom: var(--font-size-body);
}

#root > [data-overlay-container] {
Expand Down
15 changes: 15 additions & 0 deletions src/initializer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,21 @@ export class Initializer {
import.meta.env.VITE_THEME_BACKGROUND_85 as string
);
}

// Custom fonts
const { fonts, fontScale } = getUrlParams();
if (fontScale !== null) {
document.documentElement.style.setProperty(
"--font-scale",
fontScale.toString()
);
}
if (fonts.length > 0) {
document.documentElement.style.setProperty(
"--font-family",
fonts.map((f) => `"${f}"`).join(", ")
);
}
}

public static init(): Promise<void> | null {
Expand Down
10 changes: 5 additions & 5 deletions src/input/Input.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
.inputField input,
.inputField textarea {
font-weight: 400;
font-size: 15px;
font-size: var(--font-size-body);
border: none;
border-radius: 4px;
padding: 12px 9px 10px 9px;
Expand Down Expand Up @@ -73,7 +73,7 @@
top 0.25s ease-out 0.1s, background-color 0.25s ease-out 0.1s;
color: var(--tertiary-content);
background-color: transparent;
font-size: 15px;
font-size: var(--font-size-body);
position: absolute;
left: 0;
top: 0;
Expand Down Expand Up @@ -104,7 +104,7 @@
background-color: var(--system);
transition: font-size 0.25s ease-out 0s, color 0.25s ease-out 0s,
top 0.25s ease-out 0s, background-color 0.25s ease-out 0s;
font-size: 10px;
font-size: var(--font-size-micro);
top: -13px;
padding: 0 2px;
pointer-events: auto;
Expand All @@ -125,7 +125,7 @@
display: flex;
align-items: center;
flex-grow: 1;
font-size: 15px;
font-size: var(--font-size-body);
line-height: 24px;
}

Expand Down Expand Up @@ -174,7 +174,7 @@

.errorMessage {
margin: 0;
font-size: 13px;
font-size: var(--font-size-caption);
color: var(--alert);
font-weight: 600;
}
Expand Down
4 changes: 2 additions & 2 deletions src/input/SelectInput.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

.label {
font-weight: 600;
font-size: 18px;
font-size: var(--font-size-subtitle);
margin-top: 0;
margin-bottom: 12px;
}
Expand All @@ -20,7 +20,7 @@
background-color: var(--background);
border-radius: 8px;
border: 1px solid var(--quinary-content);
font-size: 15px;
font-size: var(--font-size-body);
color: var(--primary-content);
height: 40px;
max-width: 100%;
Expand Down
2 changes: 1 addition & 1 deletion src/room/GroupCallInspector.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}

.sequenceDiagramViewer :global(.messageText) {
font-size: 12px;
font-size: var(--font-size-caption);
fill: var(--primary-content) !important;
stroke: var(--primary-content) !important;
}
Loading