Skip to content

Switch to using @fontsource for Inter & Inconsolata #28540

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

Merged
merged 20 commits into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4b3ae79
Switch to using @fontsource for Inter & Inconsolata
t3chguy Nov 25, 2024
5c2fe6a
Remove unused font Open_Sans
t3chguy Nov 25, 2024
27234a5
Switch to less broken imports
t3chguy Nov 25, 2024
2c56e01
Switch to Ubuntu 24.04
t3chguy Nov 27, 2024
23c28a9
Merge branch 'develop' of https://github.com/vector-im/element-web in…
t3chguy Nov 27, 2024
4f13105
Discard changes to res/themes/dark/css/dark.pcss
t3chguy Nov 27, 2024
fe6a4e6
Discard changes to res/themes/legacy-light/css/_fonts.pcss
t3chguy Nov 27, 2024
20aaa6c
Discard changes to res/themes/light-high-contrast/css/light-high-cont…
t3chguy Nov 27, 2024
e0dbe81
Discard changes to res/themes/light/css/light.pcss
t3chguy Nov 27, 2024
4e3f4a0
Discard changes to .github/workflows/end-to-end-tests.yaml
t3chguy Dec 2, 2024
401ef89
Set outputDir for fonts
t3chguy Dec 2, 2024
0f3a057
Merge branch 'develop' of https://github.com/vector-im/element-web in…
t3chguy Dec 2, 2024
be7d4f8
Use headed mode for Playwright
t3chguy Dec 2, 2024
4fd2eb3
Switch to new Chrome headless mode instead
t3chguy Dec 2, 2024
d10871f
Cache bust playwright browser install in CI
t3chguy Dec 2, 2024
529cfdf
Update screenshots
t3chguy Dec 2, 2024
96bab41
Try with 22.04
t3chguy Dec 3, 2024
1317544
Update to Ubuntu Noble
t3chguy Dec 3, 2024
68138db
Merge branch 'develop' of https://github.com/vector-im/element-web in…
t3chguy Dec 3, 2024
2ce3dac
Merge branch 'develop' into t3chguy/fix/25969
t3chguy Dec 3, 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
8 changes: 4 additions & 4 deletions .github/workflows/end-to-end-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
name: "Run Tests ${{ matrix.runner }}/${{ strategy.job-total }}"
needs: build
if: inputs.skip != true
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
permissions:
actions: read
issues: read
Expand Down Expand Up @@ -124,11 +124,11 @@ jobs:
with:
path: |
~/.cache/ms-playwright
key: ${{ runner.os }}-playwright-${{ steps.playwright.outputs.version }}
key: ${{ runner.os }}-playwright-${{ steps.playwright.outputs.version }}-chromium

- name: Install Playwright browsers
- name: Install Playwright browser
if: steps.playwright-cache.outputs.cache-hit != 'true'
run: yarn playwright install --with-deps
run: yarn playwright install --with-deps --no-shell chromium

- name: Run Playwright tests
run: yarn playwright test --shard ${{ matrix.runner }}/${{ strategy.job-total }}
Expand Down
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@
},
"dependencies": {
"@babel/runtime": "^7.12.5",
"@fontsource/inconsolata": "^5",
"@fontsource/inter": "^5",
"@formatjs/intl-segmenter": "^11.5.7",
"@matrix-org/analytics-events": "^0.29.0",
"@matrix-org/emojibase-bindings": "^1.3.3",
Expand Down
3 changes: 2 additions & 1 deletion playwright.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
Please see LICENSE files in the repository root for full details.
*/

import { defineConfig } from "@playwright/test";
import { defineConfig, devices } from "@playwright/test";

const baseURL = process.env["BASE_URL"] ?? "http://localhost:8080";

export default defineConfig({
projects: [{ name: "Chrome", use: { ...devices["Desktop Chrome"], channel: "chromium" } }],
use: {
viewport: { width: 1280, height: 720 },
ignoreHTTPSErrors: true,
Expand Down
2 changes: 1 addition & 1 deletion playwright/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/playwright:v1.49.0-jammy
FROM mcr.microsoft.com/playwright:v1.49.0-noble

WORKDIR /work

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed res/fonts/Inter/Inter-Bold.woff
Binary file not shown.
Binary file removed res/fonts/Inter/Inter-Bold.woff2
Binary file not shown.
Binary file removed res/fonts/Inter/Inter-BoldItalic.woff
Binary file not shown.
Binary file removed res/fonts/Inter/Inter-BoldItalic.woff2
Binary file not shown.
Binary file removed res/fonts/Inter/Inter-Italic.woff
Binary file not shown.
Binary file removed res/fonts/Inter/Inter-Italic.woff2
Binary file not shown.
Binary file removed res/fonts/Inter/Inter-Medium.woff
Binary file not shown.
Binary file removed res/fonts/Inter/Inter-Medium.woff2
Binary file not shown.
Binary file removed res/fonts/Inter/Inter-MediumItalic.woff
Binary file not shown.
Binary file removed res/fonts/Inter/Inter-MediumItalic.woff2
Binary file not shown.
Binary file removed res/fonts/Inter/Inter-Regular.woff
Binary file not shown.
Binary file removed res/fonts/Inter/Inter-Regular.woff2
Binary file not shown.
Binary file removed res/fonts/Inter/Inter-SemiBold.woff
Binary file not shown.
Binary file removed res/fonts/Inter/Inter-SemiBold.woff2
Binary file not shown.
Binary file removed res/fonts/Inter/Inter-SemiBoldItalic.woff
Binary file not shown.
Binary file removed res/fonts/Inter/Inter-SemiBoldItalic.woff2
Binary file not shown.
202 changes: 0 additions & 202 deletions res/fonts/Open_Sans/LICENSE.txt

This file was deleted.

Binary file removed res/fonts/Open_Sans/OpenSans-Bold.ttf
Binary file not shown.
Binary file removed res/fonts/Open_Sans/OpenSans-BoldItalic.ttf
Binary file not shown.
Binary file removed res/fonts/Open_Sans/OpenSans-Italic.ttf
Binary file not shown.
Binary file removed res/fonts/Open_Sans/OpenSans-Regular.ttf
Binary file not shown.
Binary file removed res/fonts/Open_Sans/OpenSans-Semibold.ttf
Binary file not shown.
Binary file removed res/fonts/Open_Sans/OpenSans-SemiboldItalic.ttf
Binary file not shown.
Loading
Loading