RobbyV2/anuraOS
1
0
Fork 0
mirror of https://github.com/MercuryWorkshop/anuraOS.git synced 2025-09-04 09:14:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Automated merge conflict resolution

Browse Source
This commit is contained in:
MergeFlow
2025-03-26 11:35:54 -04:00
committed by BomberFish
parent 93714d3548 c7fb79fc2a
commit f57eeced03
6 changed files with 200 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dreamlandjs

Submodule dreamlandjs updated: 5cc8b1c25f...0942bf19ea

18
src/Launcher.css
View File

@@ -19,15 +19,15 @@
}
#launcher-button::after {
content: "";
position: absolute;
width: 0.78em;
height: 0.78em;
border: 0.16em solid var(--theme-fg);
border-radius: 50%;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
content: "";
position: absolute;
width: 0.7rem;
height: 0.7rem;
border: 0.125rem solid var(--theme-fg);
border-radius: 50%;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
#launcher-button img {

142
src/coreapps/SettingsApp.tsx
View File

@@ -253,6 +253,7 @@ class SettingsApp extends App {
<h2>Anura Settings</h2>
</div>
<<<<<<< HEAD
<div css={this.state} class="container">
<div class="sidebar">
<div
@@ -353,6 +354,147 @@ class SettingsApp extends App {
"x86 OS has sucessfully installed. Reload the page to use it!",
timeout: 5000,
});
=======
<div css={this.state} class="container">
<div class="sidebar">
<div
class="sidebar-settings-item"
on:click={() => {
this.state.settingsBody.scrollTo({
top: 0,
behavior: "smooth",
});
}}
>
<span class="sidebar-settings-item-name">
<span class="material-symbols-outlined">build</span>
<a>General</a>
</span>
</div>
<div
class="sidebar-settings-item"
on:click={() => {
this.state.settingsBody.scrollTo({
top: 100000,
behavior: "smooth",
});
}}
>
<span class="sidebar-settings-item-name">
<span class="material-symbols-outlined">
memory
</span>
<a>x86</a>
</span>
</div>
<div
class="sidebar-settings-item"
on:click={() => {
this.state.settingsBody.scrollTo({
top: 100000,
behavior: "smooth",
});
}}
>
<span class="sidebar-settings-item-name">
<span class="material-symbols-outlined">
device_reset
</span>
<a>Reset</a>
</span>
</div>
</div>
<div
bind:this={use(this.state.settingsBody)}
class="settings-body"
>
<div id="general" class="general settings-category">
<h3 class="settings-category-name">General</h3>
<div class="settings-group">
<SettingSwitch
title="Allow offline use"
setting="use-sw-cache"
callback={async () => {
if (
await anura.dialog.confirm(
"This will restart Anura. Are you sure?",
)
) {
anura.settings.set(
"milestone",
"INVALID",
);
window.location.reload();
} else {
anura.settings.set(
"use-sw-cache",
!anura.settings.get("use-sw-cache"),
);
}
}}
/>
<SettingSwitch
title="24-hour time"
setting="sir-yes-sir"
/>
<SettingSwitch
title="Borderless AboutBrowser"
setting="borderless-aboutbrowser"
/>
<SettingSwitch
title="Performance mode"
setting="blur-disable"
/>
<SettingSwitch
title="Reduce motion"
setting="disable-animation"
/>
<SettingSwitch
title="Window Edge Clamping"
setting="clampWindows"
/>
<SettingSwitch
title="Transparent Anura Shell Background"
setting="transparent-ashell"
/>
<SettingSwitch
title="Enable Launcher Keybind"
setting="launcher-keybind"
/>
<SettingText
title="Custom Wisp URL"
setting="wisp-url"
/>
<SettingText
title="Custom Power Off URL"
setting="exitUrl"
/>
</div>
</div>
<div id="v86" class="v86 settings-category">
<h3 class="settings-category-name">Anura x86</h3>
<div class="settings-group">
{this.state.show_x86_install ? (
<div>
<button
on:click={async () => {
this.state.x86_installing = true;
anura.settings.set(
"x86-image",
"alpine",
);
await installx86();
anura.settings.set(
"x86-disabled",
false,
);
anura.notifications.add({
title: "x86 Subsystem Installed",
description:
"x86 OS has sucessfully installed. Reload the page to use it!",
timeout: 5000,
});
>>>>>>> inline-window-control-svgs
this.state.x86_installing = false;
this.state.show_x86_install = true;

46
src/coreapps/TaskManager.tsx
View File

@@ -12,12 +12,21 @@ class TaskManager extends App {
padding-inline: 1em;
height: 2rem;
<<<<<<< HEAD
&,
& td,
& th {
&:not(:first-of-type):not(last-of-type) {
border: 2px solid var(--theme-border);
}
=======
&,
& td,
& th {
&:not(:first-of-type):not(last-of-type) {
border: 1px solid var(--theme-border);
}
>>>>>>> inline-window-control-svgs
height: 2rem;
line-height: 2rem;
@@ -66,6 +75,7 @@ class TaskManager extends App {
border-collapse: collapse;
width: 100%;
<<<<<<< HEAD
& tbody {
max-height: calc(100% - 1rem);
overflow-y: scroll;
@@ -78,6 +88,23 @@ class TaskManager extends App {
background: var(--theme-bg);
border-bottom: 2px solid var(--theme-border);
}
=======
border-color: var(--theme-border);
border-width: 1px;
& tbody {
max-height: calc(100% - 1rem);
overflow-y: scroll;
}
& thead {
height: 1rem;
position: sticky;
top: 0;
background: var(--theme-bg);
border-bottom: 1px solid var(--theme-border);
}
>>>>>>> inline-window-control-svgs
& th {
position: relative;
@@ -102,6 +129,7 @@ class TaskManager extends App {
padding: 0.5rem;
}
<<<<<<< HEAD
.resizer {
position: absolute;
top: 0;
@@ -118,6 +146,24 @@ class TaskManager extends App {
var(--theme-fg)
);
}
=======
.resizer {
position: absolute;
top: 0;
right: 0;
width: 1px;
cursor: ew-resize;
user-select: none;
background: var(--theme-border);
}
.resizer:hover {
border-color: color-mix(
in srgb,
var(--theme-border) 80%,
var(--theme-fg)
);
}
>>>>>>> inline-window-control-svgs
.resizing {
border-color: color-mix(in srgb, var(--theme-border) 60%, transparent);

2
v86

Submodule v86 updated: d39f1b4772...e2a45d91a8

2
x86_image_wizard/epoxy

Submodule x86_image_wizard/epoxy updated: 194ad4e5c8...b6ba44eaa3