Skip to content

Commit 4bbb9d1

Browse files
authored
Removed forehead on macOS (#1424)
1 parent d50a877 commit 4bbb9d1

File tree

13 files changed

+67
-7
lines changed

13 files changed

+67
-7
lines changed

src/app/dev/DevToys.Blazor/Assets/sass/theme/linux/dark.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,4 +423,8 @@
423423
/* Hero */
424424
--hero-background-image: url("../img/hero/dark-theme-tile.png");
425425
--hero-background-color: rgba(91, 42, 134, 0.5);
426+
427+
/* Tool Page */
428+
--tool-page-padding: 40px;
429+
--tool-page-top-right-toolbar-margin-right: 0;
426430
}

src/app/dev/DevToys.Blazor/Assets/sass/theme/linux/light.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,4 +423,8 @@
423423
/* Hero */
424424
--hero-background-image: url("../img/hero/light-theme-tile.png");
425425
--hero-background-color: rgba(131, 0, 255, 0.35);
426+
427+
/* Tool Page */
428+
--tool-page-padding: 40px;
429+
--tool-page-top-right-toolbar-margin-right: 0;
426430
}

src/app/dev/DevToys.Blazor/Assets/sass/theme/macos/dark.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,4 +423,8 @@
423423
/* Hero */
424424
--hero-background-image: url("../img/hero/dark-theme-tile.png");
425425
--hero-background-color: rgba(91, 42, 134, 0.5);
426+
427+
/* Tool Page */
428+
--tool-page-padding: 16px;
429+
--tool-page-top-right-toolbar-margin-right: 36px;
426430
}

src/app/dev/DevToys.Blazor/Assets/sass/theme/macos/light.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,4 +423,8 @@
423423
/* Hero */
424424
--hero-background-image: url("../img/hero/light-theme-tile.png");
425425
--hero-background-color: rgba(131, 0, 255, 0.35);
426+
427+
/* Tool Page */
428+
--tool-page-padding: 16px;
429+
--tool-page-top-right-toolbar-margin-right: 36px;
426430
}

src/app/dev/DevToys.Blazor/Assets/sass/theme/windows/dark.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,4 +423,8 @@
423423
/* Hero */
424424
--hero-background-image: url("../img/hero/dark-theme-tile.png");
425425
--hero-background-color: rgba(91, 42, 134, 0.5);
426+
427+
/* Tool Page */
428+
--tool-page-padding: 40px;
429+
--tool-page-top-right-toolbar-margin-right: 0;
426430
}

src/app/dev/DevToys.Blazor/Assets/sass/theme/windows/light.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,4 +423,8 @@
423423
/* Hero */
424424
--hero-background-image: url("../img/hero/light-theme-tile.png");
425425
--hero-background-color: rgba(131, 0, 255, 0.35);
426+
427+
/* Tool Page */
428+
--tool-page-padding: 40px;
429+
--tool-page-top-right-toolbar-margin-right: 0;
426430
}

src/app/dev/DevToys.Blazor/Components/Menu/NavBar/NavBar.razor.scss

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,30 @@ $sidebar-hidden-width: 0px;
44
$sidebar-collapsed-width: 49px;
55
$sidebar-expanded-width: 320px;
66
$sidebar-expanded-overlay-zindex: 10000;
7-
$sidebar-top-bar-height: 48px;
7+
8+
:root {
9+
--sidebar-top-bar-height-hard: 48px;
10+
--sidebar-top-bar-height: var(--sidebar-top-bar-height-hard);
11+
--sidebar-margin-top: 0px;
12+
}
13+
14+
div[data-theme='macos-dark-theme'], div[data-theme='macos-light-theme'] {
15+
--sidebar-top-bar-height: 0px;
16+
--sidebar-margin-top: var(--sidebar-top-bar-height-hard);
17+
}
18+
19+
div[data-compactmode] {
20+
div[data-theme='macos-dark-theme'], div[data-theme='macos-light-theme'] {
21+
--sidebar-top-bar-height: var(--sidebar-top-bar-height-hard);
22+
}
23+
}
824

925
.nav-bar-root {
1026
pointer-events: auto;
1127
height: 100%;
1228
display: grid;
1329
grid-template-columns: auto 1fr;
14-
grid-template-rows: $sidebar-top-bar-height calc(100vh - $sidebar-top-bar-height);
30+
grid-template-rows: var(--sidebar-top-bar-height) calc(100vh - var(--sidebar-top-bar-height));
1531
gap: 0px 0px;
1632
grid-template-areas:
1733
"header header"
@@ -35,13 +51,16 @@ $sidebar-top-bar-height: 48px;
3551

3652
.nav-bar-header {
3753
grid-area: header;
54+
height: var(--sidebar-top-bar-height-hard);
3855
z-index: calc($sidebar-expanded-overlay-zindex + 1);
56+
pointer-events: none;
3957
}
4058

4159
nav {
4260
grid-area: sidebar;
4361
width: $sidebar-expanded-width;
4462
max-width: $sidebar-expanded-width;
63+
margin-top: var(--sidebar-margin-top);
4564
overflow: hidden;
4665
display: grid;
4766
grid-template-columns: 1fr;
@@ -71,7 +90,7 @@ $sidebar-top-bar-height: 48px;
7190
&.expanded-overlay {
7291
z-index: $sidebar-expanded-overlay-zindex;
7392
position: absolute;
74-
padding-top: $sidebar-top-bar-height;
93+
padding-top: var(--sidebar-top-bar-height);
7594
height: 100%;
7695
width: $sidebar-expanded-width;
7796
max-width: $sidebar-expanded-width;

src/app/dev/DevToys.Blazor/Pages/Index.razor

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@
106106
IsEnabled="@compactOverlayModeAllowed"
107107
IsVisible="@WindowService.IsCompactOverlayModeSupportedByPlatform"
108108
ToolTip="@(WindowService.IsCompactOverlayMode ? MainWindow.PictureInPictureExpand : MainWindow.PictureInPictureContract)"
109+
Class="compact-overlay-button"
109110
@onclick="@OnToggleCompactOverlayModeButtonClick">
110111
<FontIcon Glyph="@(WindowService.IsCompactOverlayMode ? '\uF42C' : '\uF364')"
111112
Rotation="@(WindowService.IsCompactOverlayMode ? -90 : 180)"/>

src/app/dev/DevToys.Blazor/Pages/Index.razor.scss

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,20 @@
1515
}
1616
}
1717

18+
div[data-theme='macos-dark-theme'], div[data-theme='macos-light-theme'] {
19+
.compact-overlay-button {
20+
margin-top: 16px;
21+
}
22+
}
1823

1924
// Compact mode
2025
div[data-compactmode] {
26+
div[data-theme='macos-dark-theme'], div[data-theme='macos-light-theme'] {
27+
.compact-overlay-button {
28+
margin-top: 8px;
29+
}
30+
}
31+
2132
.sidebar-footer-button {
2233
min-block-size: 32px !important;
2334
padding-block: 4px 6px !important;

src/app/dev/DevToys.Blazor/Pages/SubPages/ToolGroup.razor.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
}
6666

6767
.tool-group-grid-view {
68-
padding: 40px;
68+
padding: var(--tool-page-padding);
6969
transform: translateZ(0);
7070

7171
.tool-group-grid-view-item {

0 commit comments

Comments
 (0)