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

Clean up some async race conditions & CSS fixes #930

Merged
merged 1 commit into from
Jun 19, 2024
Merged

Clean up some async race conditions & CSS fixes #930

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
91 changes: 52 additions & 39 deletions src/css/Dialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,52 +1,65 @@
@import 'variables';

.is-mobile+dialog>.dialog {
min-width: auto;
}

dialog {
color: #eee;
background: $main-background-color;
border: 2px solid $border-color;
border-radius: 10px;
min-width: 225px;
max-width: 400px;
padding: $ui-large-margin;

h1 {
font-size: 20px;
margin: 5px 0;
background: none;
border: none;
outline: 0;

&::backdrop {
background: rgba(0, 0, 0, 0.5);
}

.buttons {
button {
font-size: 16px;
margin: 0;
min-width: 80px;
.dialog {
color: #eee;
background: $main-background-color;
border: 2px solid $border-color;
border-radius: 10px;
min-width: 225px;

&:focus {
border-color: #888;
}
max-width: 400px;
padding: $ui-large-margin;

h1 {
font-size: 20px;
margin: 5px 0;
}

display: flex;
flex-direction: row;
justify-content: flex-end;
column-gap: $ui-margin;
}
.buttons {
button {
font-size: 16px;
margin: 0;
min-width: 80px;
height: auto;

&::backdrop {
background: rgba(0, 0, 0, 0.5);
}
&:focus {
border-color: #888;
}
}

display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: flex-end;
gap: $ui-margin;
}

input {
width: 100%;
border: none;
border-bottom: 1px solid hsla(0, 0%, 100%, 0.25);
background: transparent;
color: white;
text-overflow: ellipsis;
font-family: "fira", sans-serif;
font-size: 16px;

input {
width: 100%;
border: none;
border-bottom: 1px solid hsla(0, 0%, 100%, 0.25);
background: transparent;
color: white;
text-overflow: ellipsis;
font-family: "fira", sans-serif;
font-size: 16px;

&:focus {
outline: 0;
&:focus {
outline: 0;
}
}
}
}
6 changes: 4 additions & 2 deletions src/css/HotkeyButton.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@

.hotkey-box {
button {
margin: 0px;
margin: 0;
font-size: 16px;
height: 22px;
min-height: 22px;
padding-top: 0;
padding-bottom: 0;
}

.hotkey-button.focused {
Expand Down
8 changes: 6 additions & 2 deletions src/css/LiveSplitServerButton.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
@import 'variables';

.livesplit-server-button {
margin: 0px;
margin: 0;
font-size: 16px;
height: 22px;
min-height: 22px;
padding-top: 0;
padding-bottom: 0;
// TODO: This is the same as the hotkey button.
}
4 changes: 2 additions & 2 deletions src/css/RunEditor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ $small-button-padding: 1px 3px 1px 3px;
font-size: 15px;
width: $button-width;
margin-right: 0;
height: 30px;
min-height: 30px;

@include mobile {
margin-top: 0;
Expand Down Expand Up @@ -389,7 +389,7 @@ $small-button-padding: 1px 3px 1px 3px;
content: "";
height: 2px;
width: 0;
bottom: 0px;
bottom: 0;
position: absolute;
background: hsla(50, 100%, 50%, 1);
transition: 0.2s ease all;
Expand Down
10 changes: 7 additions & 3 deletions src/css/Sidebar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,13 @@ $h2-font-size: 22px;

@include toggle;

>div>div.small>button {
width: 50%;
font-size: 18px;
>div>div.small {
display: flex;

>button {
width: 50%;
font-size: 18px;
}
}

.sidebar-buttons {
Expand Down
22 changes: 12 additions & 10 deletions src/css/Table.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@

.table-row-even {
display: table-row;
background: $dark-row-color !important;
background: $dark-row-color !important;
}

.table-row-odd {
display: table-row;
background: $light-row-color !important;
background: $light-row-color !important;
}
}

Expand Down Expand Up @@ -54,16 +54,16 @@
}

.selected {
background: $selected-row-color !important;
background: $selected-row-color !important;
}

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

tr>td>input {
Expand Down Expand Up @@ -144,9 +144,11 @@
grid-template-columns: 1fr 30px;

button {
margin: 0px;
margin: 0;
font-size: 12px;
height: $settings-row-height;
min-height: $settings-row-height;
padding-top: 0;
padding-bottom: 0;
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions src/css/Toggle.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

@mixin toggle {
.toggle-left {
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}

.toggle-right {
border-top-left-radius: 0px;
border-bottom-left-radius: 0px;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}

.toggle-middle {
border-radius: 0px;
border-radius: 0;
}

.button-pressed,
Expand Down
8 changes: 5 additions & 3 deletions src/css/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ td#dif {
}

table {
border-spacing: 0px 2px;
border-spacing: 0 2px;
}

button:active,
Expand All @@ -83,14 +83,16 @@ button {
color: $button-text-color;
cursor: pointer;
font-size: 20px;
line-height: 1.1;
border-width: 1px;
border-style: solid;
border-color: $border-color;
border-image: initial;
border-radius: 5px;
font-weight: bold;
font-family: "fira", sans-serif;
height: $button-height;
min-height: $button-height;
padding: 5px $ui-margin;
}

a {
Expand Down Expand Up @@ -124,7 +126,7 @@ button:disabled:active {
::-webkit-scrollbar-thumb {
background-clip: padding-box;
background-color: #303030;
border: 0px solid #0000;
border: 0 solid #0000;
border-radius: 10px;
}

Expand Down
Loading