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

Respect number order when sorting assets by title #12030

Merged
merged 10 commits into from
Jan 10, 2025
+166 −27
Merged

Respect number order when sorting assets by title #12030

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7b7a82f
Respect number order when sorting assets by title
somebody1234 Jan 9, 2025
34a4cfe
Use user's preferred locale
somebody1234 Jan 9, 2025
952437b
Use locale from correct hook
somebody1234 Jan 9, 2025
0f9356b
Rename non-TSX files to `.ts`
somebody1234 Jan 9, 2025
7c5090d
Extract `assetCompareFunction` to new function
somebody1234 Jan 9, 2025
efcf114
Add tests
somebody1234 Jan 10, 2025
6c8f4ed
Fix integration tests
somebody1234 Jan 10, 2025
d1471f3
Merge branch 'develop' into wip/sb/dictionary-sort-for-assets
somebody1234 Jan 10, 2025
74d2968
Prettier
somebody1234 Jan 10, 2025
e604386
Revert GUI changes
somebody1234 Jan 10, 2025
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
Prev Previous commit
Next Next commit
Prettier
  • Loading branch information
@somebody1234
somebody1234 committed Jan 10, 2025
commit 74d2968577dded63ae266b4a7841c7d51ef231e2
8 changes: 4 additions & 4 deletions app/gui/src/project-view/assets/font-dejavu.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@font-face {
font-family: 'DejaVu Sans Mono';
src: url('/font-dejavu/DejaVuSansMono.ttf');
font-family: "DejaVu Sans Mono";
src: url("/font-dejavu/DejaVuSansMono.ttf");
font-weight: 400;
}

@font-face {
font-family: 'DejaVu Sans Mono';
src: url('/font-dejavu/DejaVuSansMono-Bold.ttf');
font-family: "DejaVu Sans Mono";
src: url("/font-dejavu/DejaVuSansMono-Bold.ttf");
font-weight: 700;
}
36 changes: 18 additions & 18 deletions app/gui/src/project-view/assets/font-enso-naming.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,70 +1,70 @@
@font-face {
font-family: 'Enso Naming';
src: url('/font-enso-naming/Enso-Naming-Thin.woff2') format('woff2');
font-family: "Enso Naming";
src: url("/font-enso-naming/Enso-Naming-Thin.woff2") format("woff2");
font-weight: 100;
font-display: swap;
unicode-range: U+0020, U+002D;
}

@font-face {
font-family: 'Enso Naming';
src: url('/font-enso-naming/Enso-Naming-ExtraLight.woff2') format('woff2');
font-family: "Enso Naming";
src: url("/font-enso-naming/Enso-Naming-ExtraLight.woff2") format("woff2");
font-weight: 200;
font-display: swap;
unicode-range: U+0020, U+002D;
}

@font-face {
font-family: 'Enso Naming';
src: url('/font-enso-naming/Enso-Naming-Light.woff2') format('woff2');
font-family: "Enso Naming";
src: url("/font-enso-naming/Enso-Naming-Light.woff2") format("woff2");
font-weight: 300;
font-display: swap;
unicode-range: U+0020, U+002D;
}

@font-face {
font-family: 'Enso Naming';
src: url('/font-enso-naming/Enso-Naming-Regular.woff2') format('woff2');
font-family: "Enso Naming";
src: url("/font-enso-naming/Enso-Naming-Regular.woff2") format("woff2");
font-weight: 400;
font-display: swap;
unicode-range: U+0020, U+002D;
}

@font-face {
font-family: 'Enso Naming';
src: url('/font-enso-naming/Enso-Naming-Medium.woff2') format('woff2');
font-family: "Enso Naming";
src: url("/font-enso-naming/Enso-Naming-Medium.woff2") format("woff2");
font-weight: 500;
font-display: swap;
unicode-range: U+0020, U+002D;
}

@font-face {
font-family: 'Enso Naming';
src: url('/font-enso-naming/Enso-Naming-SemiBold.woff2') format('woff2');
font-family: "Enso Naming";
src: url("/font-enso-naming/Enso-Naming-SemiBold.woff2") format("woff2");
font-weight: 600;
font-display: swap;
unicode-range: U+0020, U+002D;
}

@font-face {
font-family: 'Enso Naming';
src: url('/font-enso-naming/Enso-Naming-Bold.woff2') format('woff2');
font-family: "Enso Naming";
src: url("/font-enso-naming/Enso-Naming-Bold.woff2") format("woff2");
font-weight: 700;
font-display: swap;
unicode-range: U+0020, U+002D;
}

@font-face {
font-family: 'Enso Naming';
src: url('/font-enso-naming/Enso-Naming-ExtraBold.woff2') format('woff2');
font-family: "Enso Naming";
src: url("/font-enso-naming/Enso-Naming-ExtraBold.woff2") format("woff2");
font-weight: 800;
font-display: swap;
unicode-range: U+0020, U+002D;
}

@font-face {
font-family: 'Enso Naming';
src: url('/font-enso-naming/Enso-Naming-Black.woff2') format('woff2');
font-family: "Enso Naming";
src: url("/font-enso-naming/Enso-Naming-Black.woff2") format("woff2");
font-weight: 900;
font-display: swap;
unicode-range: U+0020, U+002D;
Expand Down
72 changes: 36 additions & 36 deletions app/gui/src/project-view/assets/font-enso-prose.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,142 +1,142 @@
@font-face {
font-family: 'Enso Prose';
src: url('/font-enso-prose/Enso-Prose-Thin.woff2') format('woff2');
font-family: "Enso Prose";
src: url("/font-enso-prose/Enso-Prose-Thin.woff2") format("woff2");
font-weight: 100;
font-display: swap;
unicode-range: U+0020, U+002D, U+002E;
}

@font-face {
font-family: 'Enso Prose';
src: url('/font-enso-prose/Enso-Prose-ExtraLight.woff2') format('woff2');
font-family: "Enso Prose";
src: url("/font-enso-prose/Enso-Prose-ExtraLight.woff2") format("woff2");
font-weight: 200;
font-display: swap;
unicode-range: U+0020, U+002D, U+002E;
}

@font-face {
font-family: 'Enso Prose';
src: url('/font-enso-prose/Enso-Prose-Light.woff2') format('woff2');
font-family: "Enso Prose";
src: url("/font-enso-prose/Enso-Prose-Light.woff2") format("woff2");
font-weight: 300;
font-display: swap;
unicode-range: U+0020, U+002D, U+002E;
}

@font-face {
font-family: 'Enso Prose';
src: url('/font-enso-prose/Enso-Prose-Regular.woff2') format('woff2');
font-family: "Enso Prose";
src: url("/font-enso-prose/Enso-Prose-Regular.woff2") format("woff2");
font-weight: 400;
font-display: swap;
unicode-range: U+0020, U+002D, U+002E;
}

@font-face {
font-family: 'Enso Prose';
src: url('/font-enso-prose/Enso-Prose-Medium.woff2') format('woff2');
font-family: "Enso Prose";
src: url("/font-enso-prose/Enso-Prose-Medium.woff2") format("woff2");
font-weight: 500;
font-display: swap;
unicode-range: U+0020, U+002D, U+002E;
}

@font-face {
font-family: 'Enso Prose';
src: url('/font-enso-prose/Enso-Prose-SemiBold.woff2') format('woff2');
font-family: "Enso Prose";
src: url("/font-enso-prose/Enso-Prose-SemiBold.woff2") format("woff2");
font-weight: 600;
font-display: swap;
unicode-range: U+0020, U+002D, U+002E;
}

@font-face {
font-family: 'Enso Prose';
src: url('/font-enso-prose/Enso-Prose-Bold.woff2') format('woff2');
font-family: "Enso Prose";
src: url("/font-enso-prose/Enso-Prose-Bold.woff2") format("woff2");
font-weight: 700;
font-display: swap;
unicode-range: U+0020, U+002D, U+002E;
}

@font-face {
font-family: 'Enso Prose';
src: url('/font-enso-prose/Enso-Prose-ExtraBold.woff2') format('woff2');
font-family: "Enso Prose";
src: url("/font-enso-prose/Enso-Prose-ExtraBold.woff2") format("woff2");
font-weight: 800;
font-display: swap;
unicode-range: U+0020, U+002D, U+002E;
}

@font-face {
font-family: 'Enso Prose';
src: url('/font-enso-prose/Enso-Prose-Black.woff2') format('woff2');
font-family: "Enso Prose";
src: url("/font-enso-prose/Enso-Prose-Black.woff2") format("woff2");
font-weight: 900;
font-display: swap;
unicode-range: U+0020, U+002D, U+002E;
}

@font-face {
font-family: 'Enso Naming';
src: url('/font-enso-naming/Enso-Naming-Thin.woff2') format('woff2');
font-family: "Enso Naming";
src: url("/font-enso-naming/Enso-Naming-Thin.woff2") format("woff2");
font-weight: 100;
font-display: swap;
unicode-range: U+0020, U+002D;
}

@font-face {
font-family: 'Enso Naming';
src: url('/font-enso-naming/Enso-Naming-ExtraLight.woff2') format('woff2');
font-family: "Enso Naming";
src: url("/font-enso-naming/Enso-Naming-ExtraLight.woff2") format("woff2");
font-weight: 200;
font-display: swap;
unicode-range: U+0020, U+002D;
}

@font-face {
font-family: 'Enso Naming';
src: url('/font-enso-naming/Enso-Naming-Light.woff2') format('woff2');
font-family: "Enso Naming";
src: url("/font-enso-naming/Enso-Naming-Light.woff2") format("woff2");
font-weight: 300;
font-display: swap;
unicode-range: U+0020, U+002D;
}

@font-face {
font-family: 'Enso Naming';
src: url('/font-enso-naming/Enso-Naming-Regular.woff2') format('woff2');
font-family: "Enso Naming";
src: url("/font-enso-naming/Enso-Naming-Regular.woff2") format("woff2");
font-weight: 400;
font-display: swap;
unicode-range: U+0020, U+002D;
}

@font-face {
font-family: 'Enso Naming';
src: url('/font-enso-naming/Enso-Naming-Medium.woff2') format('woff2');
font-family: "Enso Naming";
src: url("/font-enso-naming/Enso-Naming-Medium.woff2") format("woff2");
font-weight: 500;
font-display: swap;
unicode-range: U+0020, U+002D;
}

@font-face {
font-family: 'Enso Naming';
src: url('/font-enso-naming/Enso-Naming-SemiBold.woff2') format('woff2');
font-family: "Enso Naming";
src: url("/font-enso-naming/Enso-Naming-SemiBold.woff2") format("woff2");
font-weight: 600;
font-display: swap;
unicode-range: U+0020, U+002D;
}

@font-face {
font-family: 'Enso Naming';
src: url('/font-enso-naming/Enso-Naming-Bold.woff2') format('woff2');
font-family: "Enso Naming";
src: url("/font-enso-naming/Enso-Naming-Bold.woff2") format("woff2");
font-weight: 700;
font-display: swap;
unicode-range: U+0020, U+002D;
}

@font-face {
font-family: 'Enso Naming';
src: url('/font-enso-naming/Enso-Naming-ExtraBold.woff2') format('woff2');
font-family: "Enso Naming";
src: url("/font-enso-naming/Enso-Naming-ExtraBold.woff2") format("woff2");
font-weight: 800;
font-display: swap;
unicode-range: U+0020, U+002D;
}

@font-face {
font-family: 'Enso Naming';
src: url('/font-enso-naming/Enso-Naming-Black.woff2') format('woff2');
font-family: "Enso Naming";
src: url("/font-enso-naming/Enso-Naming-Black.woff2") format("woff2");
font-weight: 900;
font-display: swap;
unicode-range: U+0020, U+002D;
Expand Down
36 changes: 18 additions & 18 deletions app/gui/src/project-view/assets/font-enso.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
@font-face {
font-family: 'Enso';
src: url('/font-enso/Enso-Thin.ttf');
font-family: "Enso";
src: url("/font-enso/Enso-Thin.ttf");
font-weight: 100;
}

@font-face {
font-family: 'Enso';
src: url('/font-enso/Enso-ExtraLight.ttf');
font-family: "Enso";
src: url("/font-enso/Enso-ExtraLight.ttf");
font-weight: 200;
}

@font-face {
font-family: 'Enso';
src: url('/font-enso/Enso-Light.ttf');
font-family: "Enso";
src: url("/font-enso/Enso-Light.ttf");
font-weight: 300;
}

@font-face {
font-family: 'Enso';
src: url('/font-enso/Enso-Regular.ttf');
font-family: "Enso";
src: url("/font-enso/Enso-Regular.ttf");
font-weight: 400;
}

@font-face {
font-family: 'Enso';
src: url('/font-enso/Enso-Medium.ttf');
font-family: "Enso";
src: url("/font-enso/Enso-Medium.ttf");
font-weight: 500;
}

@font-face {
font-family: 'Enso';
src: url('/font-enso/Enso-SemiBold.ttf');
font-family: "Enso";
src: url("/font-enso/Enso-SemiBold.ttf");
font-weight: 600;
}

@font-face {
font-family: 'Enso';
src: url('/font-enso/Enso-Bold.ttf');
font-family: "Enso";
src: url("/font-enso/Enso-Bold.ttf");
font-weight: 700;
}

@font-face {
font-family: 'Enso';
src: url('/font-enso/Enso-ExtraBold.ttf');
font-family: "Enso";
src: url("/font-enso/Enso-ExtraBold.ttf");
font-weight: 800;
}

@font-face {
font-family: 'Enso';
src: url('/font-enso/Enso-Black.ttf');
font-family: "Enso";
src: url("/font-enso/Enso-Black.ttf");
font-weight: 900;
}
4 changes: 2 additions & 2 deletions app/gui/src/project-view/assets/font-mplus1.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@font-face {
font-family: 'M PLUS 1';
src: url('/font-mplus1/MPLUS1[wght].ttf');
font-family: "M PLUS 1";
src: url("/font-mplus1/MPLUS1[wght].ttf");
}
Loading