Skip to content

Switch to Lucide Icons #1026

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

Merged
CryZe merged 1 commit into from
Mar 24, 2025
Merged

Switch to Lucide Icons #1026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
- name: Install Rust
uses: hecrj/setup-rust-action@v2
with:
rust-version: nightly-2025-02-17
rust-version: nightly
components: rust-src
targets: wasm32-unknown-unknown

Expand Down
5 changes: 1 addition & 4 deletions buildCore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@ if (process.argv.some((v) => v === "--unstable")) {

// Use the nightly toolchain, which enables some more optimizations.
if (process.argv.some((v) => v === "--nightly")) {
// FIXME: Nightly is broken since the LLVM 20 upgrade. We need to wait for
// stdarch (which has the fix already) to be updated:
// https://github.com/rust-lang/stdarch/pull/1719
toolchain = "+nightly-2025-02-17";
toolchain = "+nightly";
cargoFlags +=
" -Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort";
rustFlags += " -Z wasm-c-abi=spec";
Expand Down
514 changes: 277 additions & 237 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
},
"dependencies": {
"idb": "^8.0.0",
"lucide-react": "^0.483.0",
"markdown-it": "^14.1.0",
"react": "^19.0.0",
"react-dom": "^19.0.0",
Expand Down
6 changes: 5 additions & 1 deletion src/css/HotkeyButton.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@
color: red;
}

.trash {
cursor: pointer;
}

display: grid;
grid-template-columns: 1fr 30px;
grid-template-columns: 1fr 20px;
column-gap: variables.$ui-margin;
}
15 changes: 3 additions & 12 deletions src/css/LayoutEditor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
.layout-editor-inner {
width: variables.$settings-table-width;
display: inline-flex;
margin-bottom: variables.$ui-large-margin - variables.$ui-margin;
margin-bottom: variables.$ui-large-margin;

table {
width: 100%;
Expand All @@ -21,25 +21,16 @@
.btn-group {
display: flex;
flex-direction: column;
gap: variables.$ui-margin;

button {
width: 40px;
font-size: 15px;
display: block;
}

button:nth-child(1) {
margin-top: 0;
}

@include mobile.mobile {
flex-direction: row;
margin-left: variables.$ui-margin;
margin-top: variables.$ui-margin;

button {
margin: 0 variables.$ui-margin variables.$ui-large-margin 0;
}
margin: variables.$ui-large-margin;
}
}

Expand Down
14 changes: 7 additions & 7 deletions src/css/LiveSplit.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
@use 'Sidebar';
@use 'variables.icss';

$sidebar-button-height: 42px;
$sidebar-button-size: 40px;

.livesplit-container {
.sidebar-button {
.open-sidebar-button {
position: fixed;
bottom: variables.$ui-margin;
left: variables.$ui-margin;
z-index: 10;
font-size: 24px;
padding: 8px;
margin: 0;
height: $sidebar-button-height;
padding: 0;
width: $sidebar-button-size;
height: $sidebar-button-size;
}

.view-container {
Expand All @@ -26,9 +26,9 @@ $sidebar-button-height: 42px;

@include mobile.mobile {
display: block;
margin: 0 0 ($sidebar-button-height + 2 * variables.$ui-margin) 0;
margin: 0 0 ($sidebar-button-size + 2 * variables.$ui-margin) 0;
min-width: 100%;
min-height: calc(100% - #{$sidebar-button-height + 2 * variables.$ui-margin});
min-height: calc(100% - #{$sidebar-button-size + 2 * variables.$ui-margin});
}
}
}
26 changes: 9 additions & 17 deletions src/css/RunEditor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
@use "Toggle";
@use "variables.icss";

$tab-bar-height: 30px + math.div(variables.$ui-margin, 2);
$tab-bar-height: 30px;
$tab-width: 625px;
$button-width: 160px;
$label-size: 14px;
Expand Down Expand Up @@ -242,8 +242,9 @@ $small-button-padding: 1px 3px 1px 3px;
}
}

@include mobile.mobile {
.side-buttons {
.side-buttons {
margin-bottom: variables.$ui-margin;
@include mobile.mobile {
width: 100%;
}
}
Expand All @@ -252,32 +253,25 @@ $small-button-padding: 1px 3px 1px 3px;
.btn-group {
display: flex;
flex-direction: column;
gap: variables.$ui-margin;
margin-top: $tab-bar-height;
margin-right: math.div(variables.$ui-large-margin, 2);
width: $button-width;

button {
font-size: 15px;
width: $button-width;
margin-right: 0;
min-height: 30px;

@include mobile.mobile {
margin-top: 0;
margin-bottom: variables.$ui-margin;
margin-right: variables.$ui-margin;
width: calc(50% - #{variables.$ui-margin})
width: 100%;
}
}

button:nth-child(1) {
margin-top: 0;
}

@include mobile.mobile {
width: calc(100% - #{variables.$ui-margin});
flex-direction: row;
flex-wrap: wrap;
width: calc(100% - 2 * #{variables.$ui-margin});
display: grid;
grid-template-columns: 1fr 1fr;
margin-top: 0;
margin-left: variables.$ui-margin;
}
Expand Down Expand Up @@ -407,8 +401,6 @@ $small-button-padding: 1px 3px 1px 3px;
}

.filter-table {
margin-top: math.div(variables.$ui-margin, 2);
margin-bottom: math.div(variables.$ui-margin, 2);
width: 100%;

&.table {
Expand Down
23 changes: 15 additions & 8 deletions src/css/Sidebar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ $h2-font-size: 22px;
}

.sidebar {
display: flex;
flex-direction: column;
gap: variables.$ui-margin;
background: variables.$sidebar-background-color;
padding: variables.$ui-margin;
width: 250px;
Expand All @@ -28,9 +31,10 @@ $h2-font-size: 22px;
}

.sidebar-buttons {
display: contents;
hr {
border-color: variables.$border-color;
margin: (variables.$ui-large-margin - math.div(variables.$ui-margin, 2)) 0;
margin: variables.$ui-margin 0;

&.livesplit-title-separator {
margin-top: 0;
Expand All @@ -40,31 +44,35 @@ $h2-font-size: 22px;
h1,
h2 {
text-align: center;
margin-top: variables.$ui-large-margin;
margin-bottom: variables.$ui-large-margin;
margin: 0;
}

h1 {
font-size: $h1-font-size;
margin-top: variables.$ui-large-margin;
}

h2 {
font-size: $h2-font-size;
margin-bottom: variables.$ui-margin;
}

>button {
button {
width: 100%;
}

.livesplit-title {
display: flex;
justify-content: center;
align-items: center;
gap: variables.$ui-margin;
margin-top: variables.$ui-margin;

h1 {
margin: 0;
}

.livesplit-icon {
height: 40px;
margin-right: variables.$ui-margin;

img {
height: 100%;
Expand All @@ -74,13 +82,12 @@ $h2-font-size: 22px;

.modified-icon {
position: absolute;
font-size: 10px;
padding-bottom: 10px;
padding-left: 5px;
}
}

.choose-comparison {
margin-bottom: math.div(variables.$ui-margin, 2);
padding: 0 6px 0 6px;
width: 100%;
height: 40px;
Expand Down
7 changes: 3 additions & 4 deletions src/css/SplitsSelection.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ $splits-row-height: 40px;

.splits-row {
display: flex;
gap: variables.$ui-large-margin;
flex-wrap: nowrap;
align-items: center;
padding: variables.$ui-margin;
Expand Down Expand Up @@ -82,6 +83,7 @@ $splits-row-height: 40px;
}

.splits-row-buttons {
display: contents;
flex-shrink: 0;
margin-left: variables.$ui-large-margin;

Expand All @@ -92,14 +94,11 @@ $splits-row-height: 40px;
margin: 0;
transition: 0.3s;
color: white;
padding: 0;

&:hover {
opacity: 100%;
}

&:not(:last-child) {
margin-right: variables.$ui-margin;
}
}
}

Expand Down
23 changes: 15 additions & 8 deletions src/css/Table.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,16 @@
background: variables.$selected-row-color !important;
}

.tab-bar>button {
font-size: 15px;
min-height: 30px;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
margin-bottom: 0;
border-bottom: 0;
.tab-bar {
display: flex;

>button {
font-size: 15px;
min-height: 30px;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
border-bottom: 0;
}
}

tr>td>input {
Expand Down Expand Up @@ -145,7 +148,11 @@
}

&.removable-string {
grid-template-columns: 1fr 30px;
grid-template-columns: 1fr 20px;

.trash {
cursor: pointer;
}

button {
margin: 0;
Expand Down
19 changes: 7 additions & 12 deletions src/css/TimerView.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,20 @@

.buttons {
margin-top: variables.$ui-large-margin - math.div(variables.$ui-margin, 2);
max-width: 2 * variables.$button-max-width + math.div(variables.$ui-margin, 2);

.small {
button {
width: calc(50% - #{math.div(variables.$ui-margin, 2)});
max-width: variables.$button-max-width;
}
.control-buttons {
display: grid;
grid-template-columns: 1fr 1fr;
gap: variables.$ui-margin;

button:first-child {
margin-right: math.div(variables.$ui-margin, 2);
}

button:last-child {
margin-left: math.div(variables.$ui-margin, 2);
button {
width: 100%;
}
}

.manual-game-time {
width: calc(100% - math.div(variables.$ui-margin, 2));
max-width: 2 * variables.$button-max-width + math.div(variables.$ui-margin, 2);
color: variables.$button-text-color;
background-color: transparent;
border: none;
Expand Down
Loading
Loading