Skip to content

A Swiss Army knife for developers.

Some cleaning

Etienne Baudouxa1a649180a84
diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Assets/sass/devtoys.scss b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Assets/sass/devtoys.scss
index a837ec419..c22e5553f 100644
--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Assets/sass/devtoys.scss
+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Assets/sass/devtoys.scss
@@ -7,12 +7,18 @@
@use "features/header";
@use "features/navbar";
@use "features/control";
+@use "features/scrollbars";
@use "features/text";
@use "features/transitions";
@use "theme/default";
html, body {
+ /* Default margin and padding */
+ padding: 0;
+ margin: 0;
+
+ /* Default fonts */
font-family:
"Segoe UI", /* Windows (Vista+) and Windows Phone. */
-apple-system, /* San Francisco in Safari (on Mac OS X and iOS); Neue Helvetica and Lucida Grande on older versions of Mac OS X. */
@@ -21,6 +27,14 @@ html, body {
Ubuntu, /* all versions of Ubuntu. */
system-ui, /* Default UI font on a given platform. */
'Helvetica Neue', Helvetica, Arial, sans-serif; /* Fallback */
+ font-style: normal;
+ font-weight: 400;
+ font-size: 14px;
+ line-height: 20px;
+ font-feature-settings: "rclt" off;
+
+ /* Default overflow behavior */
+ overflow: hidden;
}
#blazor-error-ui {
@@ -54,16 +68,6 @@ html, body {
// need to handle dynamic font depending on user settings
body {
- padding: 0;
- margin: 0;
- font-family: -apple-system, system-ui,
- BlinkMacSystemFont, "Segoe UI Variable", "Segoe UI",
- Roboto, Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif;
- font-style: normal;
- font-weight: 400;
- font-size: 14px;
- line-height: 20px;
- font-feature-settings: "rclt" off;
&:before {
content: "small";
@@ -104,7 +108,7 @@ body {
row-gap: 0;
column-gap: 0;
grid-template-columns: auto 1fr;
- grid-template-rows: variables.$header-wide-height 1.8fr;
+ /*grid-template-rows: variables.$header-wide-height 1.8fr;*/
}
}
@@ -124,41 +128,4 @@ body {
.sticky-bottom {
position: sticky;
bottom: 0;
-}
-
-
-.scrollable {
- overflow-y: overlay;
- overflow-x: overlay;
-
- &.vertical {
- overflow-y: overlay;
- overflow-x: hidden;
- }
-
- &.horizontal {
- overflow-y: hidden;
- overflow-x: overlay;
- }
- /* Works on Chrome, Edge, and Safari */
- &::-webkit-scrollbar {
- width: 3px;
- @include mixins.transition(all variables.$transition-base);
- }
-
- &::-webkit-scrollbar-track {
- border-radius: 999px;
- }
-
- &::-webkit-scrollbar-thumb {
- border-radius: 999px;
- border-width: 3px;
- border-style: solid;
- }
-
- &:hover {
- &::-webkit-scrollbar {
- width: 12px;
- }
- }
-}
+}
\ No newline at end of file
diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Assets/sass/features/_scrollbars.scss b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Assets/sass/features/_scrollbars.scss
new file mode 100644
index 000000000..1fa657c84
--- /dev/null
+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Assets/sass/features/_scrollbars.scss
@@ -0,0 +1,38 @@
+@use "../mixins/index" as mixins;
+@use "../configs/variables" as variables;
+
+.scrollable {
+ overflow-y: overlay;
+ overflow-x: overlay;
+
+ &.vertical {
+ overflow-y: overlay;
+ overflow-x: hidden;
+ }
+
+ &.horizontal {
+ overflow-y: hidden;
+ overflow-x: overlay;
+ }
+ /* Works on Chrome, Edge, and Safari */
+ &::-webkit-scrollbar {
+ width: 3px;
+ @include mixins.transition(all variables.$transition-base);
+ }
+
+ &::-webkit-scrollbar-track {
+ border-radius: 999px;
+ }
+
+ &::-webkit-scrollbar-thumb {
+ border-radius: 999px;
+ border-width: 3px;
+ border-style: solid;
+ }
+
+ &:hover {
+ &::-webkit-scrollbar {
+ width: 12px;
+ }
+ }
+}
diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Assets/sass/mixins/_index.scss b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Assets/sass/mixins/_index.scss
index 2cf2e7ee4..7450008ba 100644
--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Assets/sass/mixins/_index.scss
+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Assets/sass/mixins/_index.scss
@@ -2,7 +2,6 @@
@forward 'breakpoints';
@forward 'gradient';
@forward 'placeholder';
-@forward 'scrollbars';
@forward 'texts';
@forward 'transition';
@forward 'transform';
diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Assets/sass/mixins/_scrollbars.scss b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Assets/sass/mixins/_scrollbars.scss
deleted file mode 100644
index fefa012a0..000000000
--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Assets/sass/mixins/_scrollbars.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-@use '../configs/variables' as variables;
-
-@mixin scrollbars($width: 10px, $height: 10px, $foreground-color: #999, $background-color: #333) {
- // For Chrome & Safari
- &::-webkit-scrollbar {
- width: $width;
- height: $height;
- }
-
- &::-webkit-scrollbar-thumb {
- background: $foreground-color;
- border-radius: 10rem;
- border: 3px solid $foreground-color;
- }
-
- &::-webkit-scrollbar-track {
- background: $background-color;
- border-radius: 10rem;
- }
- // Standard version (Firefox only for now)
- scrollbar-color: $foreground-color $background-color;
-}
\ No newline at end of file
diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/GridView/GridView.razor b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/GridView/GridView.razor
index be2894c43..92100d53c 100644
--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/GridView/GridView.razor
+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/GridView/GridView.razor
@@ -5,7 +5,7 @@
<CascadingValue Value="this" IsFixed="true">
<div id=@Id
- class="@CssClasses"
+ class="grid-view scrollable vertical @(CssClasses)"
@ref=Element
@attributes="AdditionalAttributes">
diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/GridView/GridView.razor.cs b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/GridView/GridView.razor.cs
index dca6f6891..5ed2a38ad 100644
--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/GridView/GridView.razor.cs
+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/GridView/GridView.razor.cs
@@ -30,14 +30,6 @@ public partial class GridView<TKey, TElement> : StyledLayoutComponentBase, IAsyn
[Parameter]
public int ItemMinWidth { get; set; }
- protected override void AppendClasses(ClassHelper helper)
- {
- helper.Append("grid-view");
- helper.Append("scrollable");
- helper.Append("vertical");
- base.AppendClasses(helper);
- }
-
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (firstRender)
diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/GridView/GridView.razor.scss b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/GridView/GridView.razor.scss
index fea190e2c..563f170d4 100644
--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/GridView/GridView.razor.scss
+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/GridView/GridView.razor.scss
@@ -3,7 +3,6 @@
.grid-view {
position: relative;
- overflow-y: auto;
width: 100%;
height: 100%;
flex: 1;
diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/StyledLayoutComponentBase.cs b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/StyledLayoutComponentBase.cs
index b4192c432..687027ac0 100644
--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/StyledLayoutComponentBase.cs
+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/StyledLayoutComponentBase.cs
@@ -30,7 +30,7 @@ public abstract class StyledLayoutComponentBase : LayoutComponentBase
{
if (!string.IsNullOrWhiteSpace(Class))
{
- Classes = new HashSet<string>(Class.Split(' '), StringComparer.InvariantCultureIgnoreCase);
+ Classes = new HashSet<string>(Class.Split(' ', StringSplitOptions.RemoveEmptyEntries), StringComparer.InvariantCultureIgnoreCase);
}
base.OnParametersSet();