A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Enabled SASS in components
Etienne Baudoux92af9f9da6ec
diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Assets/sass/features/_control.scss b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Assets/sass/features/_control.scssindex 485105858..b6dc4bc76 100644--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Assets/sass/features/_control.scss+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Assets/sass/features/_control.scss@@ -1,4 +1,4 @@-@use "../mixins/index" as mixins;+/*@use "../mixins/index" as mixins;@use "../configs/variables" as variables;button {@@ -23,3 +23,4 @@ button {&.stealth {}}+*/\ No newline at end of filediff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Control/Button.razor b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Control/Button.razorindex a4bd85984..18768c0a5 100644--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Control/Button.razor+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Control/Button.razor@@ -1,5 +1,5 @@@namespace DevToys.MauiBlazor.Components-@inherits MefLayoutComponentBase+@inherits StyledLayoutComponentBase<CascadingValue Value="this" IsFixed="true"><button id=@Iddiff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Control/Button.razor.cs b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Control/Button.razor.csindex 0e46df8f1..eeb9459fc 100644--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Control/Button.razor.cs+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Control/Button.razor.cs@@ -2,7 +2,7 @@namespace DevToys.MauiBlazor.Components;-public partial class Button : MefLayoutComponentBase+public partial class Button : StyledLayoutComponentBase{[Parameter]public ButtonType Type { get; set; } = ButtonType.Button;diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Control/Button.razor.scss b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Control/Button.razor.scssnew file mode 100644index 000000000..8c00e5234--- /dev/null+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Control/Button.razor.scss@@ -0,0 +1,21 @@+@use "../../Assets/sass/mixins/index" as mixins;+@use "../../Assets/sass/configs/variables" as variables;++button {+ padding: 7px 9px;+ border-radius: 3px;+ border-width: 1px;+ border-style: solid;++ @include mixins.transition( color variables.$transition-base, background-color variables.$transition-base, border-color variables.$transition-base );++ &.icon {+ font-size: 16px;+ line-height: 16px;+ font-style: normal;+ font-weight: 400;+ }++ &.stealth {+ }+}diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/MefLayoutComponentBase.cs b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/MefLayoutComponentBase.csindex e053eb704..ed03b5022 100644--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/MefLayoutComponentBase.cs+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/MefLayoutComponentBase.cs@@ -1,60 +1,15 @@-using System.Globalization;-using DevToys.Api;-using Microsoft.Fast.Components.FluentUI;+using DevToys.Api;namespace DevToys.MauiBlazor.Components;-public abstract class MefLayoutComponentBase : LayoutComponentBase+public abstract class MefLayoutComponentBase : StyledLayoutComponentBase{- protected HashSet<string>? Classes = null;-[Inject]protected IMefProvider MefProvider { get; set; } = default!;- protected ClassHelper ClassHelper { get; private set; }-- public ElementReference Element { get; set; }-- [Parameter]- public string Id { get; set; } = Identifier.NewId();-- [Parameter]- public string Class { get; set; } = string.Empty;-- public string CssClasses => ClassHelper.Classes;-- [Parameter(CaptureUnmatchedValues = true)]- public virtual IReadOnlyDictionary<string, object>? AdditionalAttributes { get; set; }-- protected MefLayoutComponentBase()- {- ClassHelper = new ClassHelper(AppendClasses);- }-protected override void OnInitialized(){MefProvider.SatisfyImports(this);base.OnInitialized();}-- protected override void OnParametersSet()- {- if (!string.IsNullOrWhiteSpace(Class))- {- Classes = new HashSet<string>(Class.Split(' '), StringComparer.InvariantCultureIgnoreCase);- }-- base.OnParametersSet();- }-- protected virtual void ClassesHasChanged()- => ClassHelper.HasChanged();-- protected virtual void AppendClasses(ClassHelper helper)- {- if (Classes is not null)- {- helper.Append(Classes);- }- }}diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/Navbar.razor b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/Navbar.razorindex ae9d30087..b8539ec6f 100644--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/Navbar.razor+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/Navbar.razor@@ -1,6 +1,6 @@@namespace DevToys.MauiBlazor.Components@using DevToys.Core.Tools.ViewItems;-@inherits MefLayoutComponentBase+@inherits StyledLayoutComponentBase<CascadingValue Value="this" Name="NavMenu" IsFixed="true"><CascadingValue Value="Collapsed" Name="NavMenuExpanded" IsFixed="true">diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/Navbar.razor.cs b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/Navbar.razor.csindex 3ecebeee0..d07b11a64 100644--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/Navbar.razor.cs+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/Navbar.razor.cs@@ -2,7 +2,7 @@namespace DevToys.MauiBlazor.Components;-public partial class Navbar : MefLayoutComponentBase+public partial class Navbar : StyledLayoutComponentBase{private readonly Dictionary<string, NavbarItem> _items = new();diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarItem.razor b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarItem.razorindex ac0825733..3874fe32c 100644--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarItem.razor+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarItem.razor@@ -1,5 +1,5 @@@namespace DevToys.MauiBlazor.Components-@inherits MefLayoutComponentBase+@inherits StyledLayoutComponentBase<CascadingValue Value="this" IsFixed="true"><li id="@Id" class="@CssClasses">diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarItem.razor.cs b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarItem.razor.csindex f7c881e85..dcfcc9aca 100644--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarItem.razor.cs+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/Navbar/NavbarItem.razor.cs@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Components.Web;namespace DevToys.MauiBlazor.Components;-public partial class NavbarItem : MefLayoutComponentBase+public partial class NavbarItem : StyledLayoutComponentBase{private const string DefaultActiveClass = "active";private bool _selected;diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/StyledLayoutComponentBase.cs b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/StyledLayoutComponentBase.csnew file mode 100644index 000000000..b4192c432--- /dev/null+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/Components/StyledLayoutComponentBase.cs@@ -0,0 +1,49 @@+using Microsoft.Fast.Components.FluentUI;++namespace DevToys.MauiBlazor.Components;++public abstract class StyledLayoutComponentBase : LayoutComponentBase+{+ protected HashSet<string>? Classes = null;++ protected ClassHelper ClassHelper { get; private set; }++ public ElementReference Element { get; set; }++ [Parameter]+ public string Id { get; set; } = Identifier.NewId();++ [Parameter]+ public string Class { get; set; } = string.Empty;++ public string CssClasses => ClassHelper.Classes;++ [Parameter(CaptureUnmatchedValues = true)]+ public virtual IReadOnlyDictionary<string, object>? AdditionalAttributes { get; set; }++ protected StyledLayoutComponentBase()+ {+ ClassHelper = new ClassHelper(AppendClasses);+ }++ protected override void OnParametersSet()+ {+ if (!string.IsNullOrWhiteSpace(Class))+ {+ Classes = new HashSet<string>(Class.Split(' '), StringComparer.InvariantCultureIgnoreCase);+ }++ base.OnParametersSet();+ }++ protected virtual void ClassesHasChanged()+ => ClassHelper.HasChanged();++ protected virtual void AppendClasses(ClassHelper helper)+ {+ if (Classes is not null)+ {+ helper.Append(Classes);+ }+ }+}diff --git a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/gulpfile.js b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/gulpfile.jsindex ba7274f3f..690e2cd75 100644--- a/src/app/dev/platforms/desktop/DevToys.MauiBlazor/gulpfile.js+++ b/src/app/dev/platforms/desktop/DevToys.MauiBlazor/gulpfile.js@@ -7,6 +7,7 @@ const gulpSass = require('gulp-sass');const sass = gulpSass(dartSass);const del = require('del');+var concat = require("gulp-concat");var sourcemaps = require('gulp-sourcemaps');var source = require('vinyl-source-stream');var buffer = require('vinyl-buffer');@@ -20,7 +21,7 @@ var nodeResolve = require('@rollup/plugin-node-resolve');// Cache needs to be initialized outside of the Gulp taskvar devtoysCache;const paths = {- devtoysScss: './Assets/sass/**/*.scss',+ devtoysScss: ['./Assets/sass/**/*.scss', './Components/**/*.scss'],devtoysScssOut: './wwwroot/css',devtoysJavascript: './Assets/javascript',devtoysJavascriptOut: './wwwroot/js'@@ -29,7 +30,7 @@ const paths = {function devtoysSass() {return gulp.src(paths.devtoysScss).pipe(sass())- .pipe(rename("devtoys.g.css"))+ .pipe(concat("devtoys.g.css")).pipe(gulp.dest(paths.devtoysScssOut)).pipe(cleanCSS({ compatibility: 'ie8' })).pipe(gulp.dest(paths.devtoysScssOut));