Skip to content

A Swiss Army knife for developers.

Updated MacOS build

Etienne Baudoux8d466ee8a917
diff --git a/src/app/dev/DevToys.Blazor/Assets/sass/theme/macos/dark.scss b/src/app/dev/DevToys.Blazor/Assets/sass/theme/macos/dark.scss
index a58a23d0f..f5eaab8fa 100644
--- a/src/app/dev/DevToys.Blazor/Assets/sass/theme/macos/dark.scss
+++ b/src/app/dev/DevToys.Blazor/Assets/sass/theme/macos/dark.scss
@@ -12,6 +12,17 @@
--accent-tertiary: rgba(var(--accent-light-2), 0.8);
--accent-disabled: rgba(255, 255, 255, 0.158);
+ /* System fill colors */
+ --system-fill-color-success: rgb(108, 203, 95);
+ --system-fill-color-caution: rgb(252, 225, 0);
+ --system-fill-color-critical: rgb(255, 153, 164);
+ --system-fill-color-neutral: rgba(255, 255, 255, 0.545);
+ --system-fill-color-success-background: rgb(57, 61, 27);
+ --system-fill-color-caution-background: rgb(67, 53, 25);
+ --system-fill-color-critical-background: rgb(68, 39, 38);
+ --system-fill-color-neutral-background: rgba(255, 255, 255, 0.031);
+ --system-fill-color-attention-background: rgba(255, 255, 255, 0.031);
+
/* Text on Accent */
--text-on-accent-primary: rgb(0, 0, 0);
--text-on-accent-secondary: rgba(0, 0, 0, 0.5);
@@ -37,12 +48,19 @@
--control-fill-color-transparent: rgba(255, 255, 255, 0);
--control-fill-color-input-active: rgba(30, 30, 30, 0.702);
+ --control-alt-fill-color-transparent: rgba(255, 255, 255, 0);
+ --control-alt-fill-color-secondary: rgba(0, 0, 0, 0.098);
+ --control-alt-fill-color-tertiary: rgba(255, 255, 255, 0.043);
+ --control-alt-fill-color-quarternary: rgba(255, 255, 255, 0.071);
+ --control-alt-fill-color-disabled: rgba(255, 255, 255, 0);
+
/* Control Stroke */
--control-stroke-color-default: rgba(255, 255, 255, 0.071);
--control-stroke-color-secondary: rgba(255, 255, 255, 0.094);
--control-stroke-on-accent-default: hsla(0, 0%, 100%, 8%);
--control-stroke-on-accent-secondary: hsla(0, 0%, 0%, 14%);
--control-strong-stroke-default: rgba(255, 255, 255, 0.544);
+ --control-strong-stroke-disabled: rgba(255, 255, 255, 0.157);
/* Subtle Fill */
--subtle-fill-transparent: transparent;
@@ -114,6 +132,114 @@
--stealth-button-border-disabled: var(--control-fill-color-transparent);
--stealth-button-border-thickness: 1px solid;
+ /* CheckBox */
+ --check-box-check-corner-radius: var(--control-corner-radius);
+ --check-box-foreground: var(--text-fill-color-primary);
+ --check-box-foreground-disabled: var(--text-fill-color-disabled);
+
+ --check-box-check-background-stroke-unchecked: var(--control-strong-stroke-default);
+ --check-box-check-background-stroke-unchecked-pointer-over: var(--control-strong-stroke-default);
+ --check-box-check-background-stroke-unchecked-pressed: var(--control-strong-stroke-disabled);
+ --check-box-check-background-stroke-unchecked-disabled: var(--control-strong-stroke-disabled);
+ --check-box-check-background-stroke-checked: var(--accent-default);
+ --check-box-check-background-stroke-checked-pointer-over: var(--accent-secondary);
+ --check-box-check-background-stroke-checked-pressed: var(--accent-tertiary);
+ --check-box-check-background-stroke-checked-disabled: var(--control-strong-stroke-disabled);
+ --check-box-check-background-fill-unchecked: var(--control-alt-fill-color-secondary);
+ --check-box-check-background-fill-unchecked-pointer-over: var(--control-alt-fill-color-tertiary);
+ --check-box-check-background-fill-unchecked-pressed: var(--control-alt-fill-color-quarternary);
+ --check-box-check-background-fill-unchecked-disabled: var(--control-alt-fill-color-disabled);
+ --check-box-check-background-fill-checked: var(--accent-default);
+ --check-box-check-background-fill-checked-pointer-over: var(--accent-secondary);
+ --check-box-check-background-fill-checked-pressed: var(--accent-tertiary);
+ --check-box-check-background-fill-checked-disabled: var(--accent-disabled);
+
+ --check-box-check-glyph-foreground-unchecked: var(--text-on-accent-primary);
+ --check-box-check-glyph-foreground-unchecked-pointer-over: var(--text-on-accent-primary);
+ --check-box-check-glyph-foreground-unchecked-pressed: var(--text-on-accent-primary);
+ --check-box-check-glyph-foreground-unchecked-disabled: var(--text-on-accent-disabled);
+ --check-box-check-glyph-foreground-checked: var(--text-on-accent-primary);
+ --check-box-check-glyph-foreground-checked-pointer-over: var(--text-on-accent-primary);
+ --check-box-check-glyph-foreground-checked-pressed: var(--text-on-accent-secondary);
+ --check-box-check-glyph-foreground-checked-disabled: var(--text-on-accent-disabled);
+
+ /* RadioButton */
+ --radio-button-foreground: var(--text-fill-color-primary);
+ --radio-button-foreground-pointer-over: var(--text-fill-color-primary);
+ --radio-button-foreground-pressed: var(--text-fill-color-primary);
+ --radio-button-foreground-disabled: var(--text-fill-color-disabled);
+ --radio-button-background: var(--control-fill-color-transparent);
+ --radio-button-background-pointer-over: var(--control-fill-color-transparent);
+ --radio-button-background-pressed: var(--control-fill-color-transparent);
+ --radio-button-background-disabled: var(--control-fill-color-transparent);
+ --radio-button-border: var(--control-fill-color-transparent);
+ --radio-button-border-pointer-over: var(--control-fill-color-transparent);
+ --radio-button-border-pressed: var(--control-fill-color-transparent);
+ --radio-button-border-disabled: var(--control-fill-color-transparent);
+
+ --radio-button-outer-ellipse-stroke: var(--control-strong-stroke-default);
+ --radio-button-outer-ellipse-stroke-pointer-over: var(--control-strong-stroke-default);
+ --radio-button-outer-ellipse-stroke-pressed: var(--control-strong-stroke-disabled);
+ --radio-button-outer-ellipse-stroke-disabled: var(--control-strong-stroke-disabled);
+ --radio-button-outer-ellipse-fill: var(--control-alt-fill-color-secondary);
+ --radio-button-outer-ellipse-fill-pointer-over: var(--control-alt-fill-color-tertiary);
+ --radio-button-outer-ellipse-fill-pressed: var(--control-alt-fill-color-quarternary);
+ --radio-button-outer-ellipse-fill-disabled: var(--control-alt-fill-color-disabled);
+
+ --radio-button-outer-ellipse-checked-stroke: var(--accent-default);
+ --radio-button-outer-ellipse-checked-stroke-pointer-over: var(--accent-secondary);
+ --radio-button-outer-ellipse-checked-stroke-pressed: var(--accent-tertiary);
+ --radio-button-outer-ellipse-checked-stroke-disabled: var(--accent-disabled);
+ --radio-button-outer-ellipse-checked-fill: var(--accent-default);
+ --radio-button-outer-ellipse-checked-fill-pointer-over: var(--accent-secondary);
+ --radio-button-outer-ellipse-checked-fill-pressed: var(--accent-tertiary);
+ --radio-button-outer-ellipse-checked-fill-disabled: var(--accent-disabled);
+
+ --radio-button-check-glyph-fill: var(--text-on-accent-primary);
+ --radio-button-check-glyph-fill-pointer-over: var(--text-on-accent-primary);
+ --radio-button-check-glyph-fill-pressed: var(--text-on-accent-primary);
+ --radio-button-check-glyph-fill-disabled: var(--text-on-accent-primary);
+ --radio-button-check-glyph-stroke: var(--control-stroke-color-default);
+ --radio-button-check-glyph-stroke-pointer-over: var(--control-stroke-color-default);
+ --radio-button-check-glyph-stroke-pressed: var(--control-stroke-color-default);
+ --radio-button-check-glyph-stroke-disabled: var(--control-stroke-color-default);
+ --radio-button-check-glyph-stroke-checked: var(--control-stroke-on-accent-default);
+ --radio-button-check-glyph-stroke-checked-pointer-over: var(--control-stroke-on-accent-default);
+ --radio-button-check-glyph-stroke-checked-pressed: var(--control-stroke-on-accent-default);
+ --radio-button-check-glyph-stroke-checked-disabled: var(--control-stroke-color-default);
+
+ /* ToggleSwitch */
+ --toggle-switch-foreground: var(--text-fill-color-primary);
+ --toggle-switch-foreground-disabled: var(--text-fill-color-disabled);
+ --toggle-switch-on-stroke-thickness: 0px;
+ --toggle-switch-outer-border-stroke-thickness: 1px;
+ --toggle-switch-fill-off: var(--control-alt-fill-color-secondary);
+ --toggle-switch-fill-off-pointer-over: var(--control-alt-fill-color-tertiary);
+ --toggle-switch-fill-off-pressed: var(--control-alt-fill-color-quarternary);
+ --toggle-switch-fill-off-disabled: var(--control-alt-fill-color-disabled);
+ --toggle-switch-stroke-off: var(--control-strong-stroke-default);
+ --toggle-switch-stroke-off-pointer-over: var(--control-strong-stroke-default);
+ --toggle-switch-stroke-off-pressed: var(--control-strong-stroke-default);
+ --toggle-switch-stroke-off-disabled: var(--control-strong-stroke-disabled);
+ --toggle-switch-fill-on: var(--accent-default);
+ --toggle-switch-fill-on-pointer-over: var(--accent-secondary);
+ --toggle-switch-fill-on-pressed: var(--accent-tertiary);
+ --toggle-switch-fill-on-disabled: var(--accent-disabled);
+ --toggle-switch-stroke-on: var(--accent-default);
+ --toggle-switch-stroke-on-pointer-over: var(--accent-secondary);
+ --toggle-switch-stroke-on-pressed: var(--accent-tertiary);
+ --toggle-switch-stroke-on-disabled: var(--accent-disabled);
+
+ --toggle-switch-knob-fill-off: var(--text-fill-color-secondary);
+ --toggle-switch-knob-fill-off-pointer-over: var(--text-fill-color-secondary);
+ --toggle-switch-knob-fill-off-pressed: var(--text-fill-color-secondary);
+ --toggle-switch-knob-fill-off-disabled: var(--text-fill-color-disabled);
+ --toggle-switch-knob-fill-on: var(--text-on-accent-primary);
+ --toggle-switch-knob-fill-on-pointer-over: var(--text-on-accent-primary);
+ --toggle-switch-knob-fill-on-pressed: var(--text-on-accent-primary);
+ --toggle-switch-knob-fill-on-disabled: var(--text-on-accent-disabled);
+ --toggle-switch-knob-stroke-on: var(--control-border-color-default);
+
/* GridView */
--grid-view-header-border-line: rgba(255, 255, 255, 0.2);
--grid-view-item-background: var(--card-background-color);
@@ -140,6 +266,23 @@
--list-box-item-foreground-active: var(--text-fill-color-secondary);
--list-box-item-foreground-disabled: var(--text-fill-color-disabled);
+ /* Context Menu */
+ --menu-flyout-presenter-background: rgb(44, 44, 44); // Could be semi-transparent if we didn't have Mica: rgb(44, 44, 44, 0.8)
+ --menu-flyout-presenter-border: rgba(0, 0, 0, 0.2);
+ --menu-flyout-presenter-backdrop-filter: blur(50px) saturate(125%);
+ --menu-flyout-presenter-shadow: 0px 8px 16px rgba(0, 0, 0, 0.14);
+
+ /* Context Menu Item */
+ --context-menu-item-background: var(--subtle-fill-transparent);
+ --context-menu-item-background-disabled: var(--subtle-fill-transparent);
+ --context-menu-item-background-pointer-over: var(--subtle-fill-secondary);
+ --context-menu-item-background-active: var(--subtle-fill-tertiary);
+ --context-menu-item-foreground: var(--text-fill-color-primary);
+ --context-menu-item-foreground-active: var(--text-fill-color-secondary);
+ --context-menu-item-foreground-disabled: var(--text-fill-color-disabled);
+ --context-menu-item-key-accelerator-foreground: var(--text-fill-color-secondary);
+ --context-menu-item-key-accelerator-foreground-disabled: var(--text-fill-color-disabled);
+
/* Text Box */
--text-box-background: var(--control-fill-color-default);
--text-box-background-pointer-over: var(--control-fill-color-secondary);
@@ -161,9 +304,32 @@
/* Scrollbars */
--scrollbar-track-background-color: transparent;
- --scrollbar-track-background-color-hover: rgba(44, 44, 44, 0.96);
- --scrollbar-thumb-border-color: transparent;
- --scrollbar-thumb-border-color-hover: rgba(44, 44, 44, 0.96);
- --scrollbar-thumb-background-color: rgba(255, 255, 255, 0.5442);
- --scrollbar-thumb-background-color-hover: rgba(255, 255, 255, 0.5442);
+ --scrollbar-track-background-color-hover: rgba(31, 31, 31, 0.9);
+ --scrollbar-thumb-border-color: rgba(85, 85, 85, 0.231);
+ --scrollbar-thumb-border-color-hover: rgba(183, 183, 183, 0.42);
+ --scrollbar-thumb-background-color: rgb(205, 205, 205);
+ --scrollbar-thumb-background-color-hover: rgb(218, 218, 218);
+
+ /* InfoBar */
+ --info-bar-error-severity-background: var(--system-fill-color-critical-background);
+ --info-bar-warning-severity-background: var(--system-fill-color-caution-background);
+ --info-bar-success-severity-background: var(--system-fill-color-success-background);
+ --info-bar-informational-severity-background: var(--system-fill-color-attention-background);
+
+ --info-bar-error-severity-icon-background: var(--system-fill-color-critical);
+ --info-bar-warning-severity-icon-background: var(--system-fill-color-caution);
+ --info-bar-success-severity-icon-background: var(--system-fill-color-success);
+ --info-bar-informational-severity-icon-background: var(--accent-default);
+
+ --info-bar-error-severity-icon-foreground: var(--text-fill-color-inverse);
+ --info-bar-warning-severity-icon-foreground: var(--text-fill-color-inverse);
+ --info-bar-success-severity-icon-foreground: var(--text-fill-color-inverse);
+ --info-bar-informational-severity-icon-foreground: var(--text-fill-color-inverse);
+
+ --info-bar-title-foreground: var(--text-fill-color-primary);
+ --info-bar-message-foreground: var(--text-fill-color-primary);
+
+ --info-bar-border: var(--card-stroke-color-default);
+ --info-bar-border-thickness: 1px;
+ --info-bar-border-corner-radius: var(--control-corner-radius);
}
diff --git a/src/app/dev/platforms/desktop/DevToys.MacOS/DevToys.MacOS.csproj b/src/app/dev/platforms/desktop/DevToys.MacOS/DevToys.MacOS.csproj
index 04fb0bd5f..20a59f885 100644
--- a/src/app/dev/platforms/desktop/DevToys.MacOS/DevToys.MacOS.csproj
+++ b/src/app/dev/platforms/desktop/DevToys.MacOS/DevToys.MacOS.csproj
@@ -64,4 +64,8 @@
<ProjectReference Include="..\..\..\DevToys.Localization\DevToys.Localization.csproj" />
</ItemGroup>
+ <ItemGroup>
+ <Content Include="$(RepoRoot)\src\app\dev\platforms\desktop\DevToys.Windows\wwwroot\index.html" Link="wwwroot\index.html" />
+ </ItemGroup>
+
</Project>
diff --git a/src/app/dev/platforms/desktop/DevToys.MacOS/wwwroot/index.html b/src/app/dev/platforms/desktop/DevToys.MacOS/wwwroot/index.html
deleted file mode 100644
index 0e4bad595..000000000
--- a/src/app/dev/platforms/desktop/DevToys.MacOS/wwwroot/index.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="utf-8" />
- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover" />
- <title>DevToys</title>
- <base href="/" />
-
- <script src="_content/DevToys.Blazor/js/require.js"></script>
- <script src="_content/DevToys.Blazor/js/devtoys.js" type="text/javascript"></script>
- <script src="_content/DevToys.Blazor/js/devtoys.g.js" type="text/javascript"></script>
- <script src="_content/DevToys.Blazor/js/simplebar-modified.js" type="text/javascript"></script>
-
- <link href="_content/DevToys.Blazor/css/app.css" rel="stylesheet" />
- <link href="_content/DevToys.Blazor/css/devtoys.g.css" rel="stylesheet" />
-</head>
-
-<body>
-
- <div class="status-bar-safe-area"></div>
-
- <div id="app">Loading...</div>
-
- <div id="blazor-error-ui">
- An unhandled error has occurred.
- <a href="" class="reload">Reload</a>
- <a class="dismiss">🗙</a>
- </div>
-
- <script src="_content/DevToys.Blazor/lib/monaco-editor/min/vs/loader.js"></script>
- <script src="_content/DevToys.Blazor/lib/monaco-editor/min/vs/editor/editor.main.js"></script>
- <!-- TODO: Looks like autostart isn't necessary and we can reuse the same file from the Windows project? -->
- <script src="_framework/blazor.webview.js" autostart="false"></script>
- <!-- <script src="_framework/blazor.webview.js"></script> -->
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/wwwroot/index.html b/src/app/dev/platforms/desktop/DevToys.Windows/wwwroot/index.html
index 367fd5945..e15e0160e 100644
--- a/src/app/dev/platforms/desktop/DevToys.Windows/wwwroot/index.html
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/wwwroot/index.html
@@ -29,7 +29,6 @@
<script src="_content/DevToys.Blazor/lib/monaco-editor/min/vs/loader.js"></script>
<script src="_content/DevToys.Blazor/lib/monaco-editor/min/vs/editor/editor.main.js"></script>
- <!--<script src="_framework/blazor.webview.js" autostart="false"></script>-->
<script src="_framework/blazor.webview.js"></script>
</body>