diff --git a/ReactWithDotNet.WebSite/Components/PlayButton.cs b/ReactWithDotNet.WebSite/Components/PlayButton.cs index 126ed0b3..22936afa 100644 --- a/ReactWithDotNet.WebSite/Components/PlayButton.cs +++ b/ReactWithDotNet.WebSite/Components/PlayButton.cs @@ -84,8 +84,8 @@ protected override Element render() for (var i = 300; i < 700; i += 50) { - style.Add(WhenMediaWidthGreaterThan(i, Width(i - 50))); - style.Add(WhenMediaWidthGreaterThan(i, Height(h * i / w))); + style.Add(WhenMediaMinWidth(i, Width(i - 50))); + style.Add(WhenMediaMinWidth(i, Height(h * i / w))); } return new Backdrop diff --git a/ReactWithDotNet.WebSite/Extensions.cs b/ReactWithDotNet.WebSite/Extensions.cs index 94be6600..54386abe 100644 --- a/ReactWithDotNet.WebSite/Extensions.cs +++ b/ReactWithDotNet.WebSite/Extensions.cs @@ -11,7 +11,7 @@ static partial class Extensions public static StyleModifier BorderRadiusForPaper => BorderRadius(4); - public static StyleModifier DisplayNoneWhenMobile => WhenMediaWidthLessThan(MD,DisplayNone); + public static StyleModifier DisplayNoneWhenMobile => WhenMediaMaxWidth(MD,DisplayNone); public static StyleModifier DisplayNoneWhenNotMobile => MD(DisplayNone); diff --git a/ReactWithDotNet.WebSite/HeaderComponents/HeaderMenuBar.cs b/ReactWithDotNet.WebSite/HeaderComponents/HeaderMenuBar.cs index bf172615..a16fb54b 100644 --- a/ReactWithDotNet.WebSite/HeaderComponents/HeaderMenuBar.cs +++ b/ReactWithDotNet.WebSite/HeaderComponents/HeaderMenuBar.cs @@ -14,7 +14,7 @@ protected override Element render() { new Logo(), SpaceX(24), - new nav(DisplayFlex, AlignItemsCenter, WhenMediaWidthLessThan(MD, DisplayNone)) + new nav(DisplayFlex, AlignItemsCenter, WhenMediaMaxWidth(MD, DisplayNone)) { MenuAccess.MenuList.Select(x => new MenuView { Model = x }) } @@ -52,7 +52,7 @@ protected override Element render() } }; - return new FlexRow(Gap(15), AlignItemsCenter, MarginRight(50), WhenMediaWidthLessThan(MD, DisplayNone)) + return new FlexRow(Gap(15), AlignItemsCenter, MarginRight(50), WhenMediaMaxWidth(MD, DisplayNone)) { socialMediaLinks.Select(x => new a(Href(x.Link)) { diff --git a/ReactWithDotNet.WebSite/Pages/PageMain.cs b/ReactWithDotNet.WebSite/Pages/PageMain.cs index ab137a15..b2401dee 100644 --- a/ReactWithDotNet.WebSite/Pages/PageMain.cs +++ b/ReactWithDotNet.WebSite/Pages/PageMain.cs @@ -25,7 +25,7 @@ protected override Element render() { return new FlexColumn(AlignItemsCenter) { - new div(FontFamily_PlusJakartaSans_ExtraBold, FontSize40, LG(FontSize50), FontWeight800, WhenMediaWidthLessThan(MD, TextAlignCenter)) + new div(FontFamily_PlusJakartaSans_ExtraBold, FontSize40, LG(FontSize50), FontWeight800, WhenMediaMaxWidth(MD, TextAlignCenter)) { LineHeight(50), LG(LineHeight(60)), diff --git a/ReactWithDotNet.WebSite/Pages/PageMileStones.cs b/ReactWithDotNet.WebSite/Pages/PageMileStones.cs index 8bff96e8..5598b1be 100644 --- a/ReactWithDotNet.WebSite/Pages/PageMileStones.cs +++ b/ReactWithDotNet.WebSite/Pages/PageMileStones.cs @@ -78,7 +78,7 @@ class Progressbar : PureComponent protected override Element render() { - return new div(SizeFull, BorderRadius(4), Border(1, solid, Blue300), Size(200, 25), WhenMediaWidthGreaterThan(450, Width(300))) + return new div(SizeFull, BorderRadius(4), Border(1, solid, Blue300), Size(200, 25), WhenMediaMinWidth(450, Width(300))) { new FlexRowCentered(Width(Value, 100), Background(linear_gradient(90, Blue100, Blue300)), HeightFull, FontSize11, BorderRadius(4)), diff --git a/ReactWithDotNet/Mixin.6.MediaQueries.cs b/ReactWithDotNet/Mixin.6.MediaQueries.cs index 2d00daea..031741a0 100644 --- a/ReactWithDotNet/Mixin.6.MediaQueries.cs +++ b/ReactWithDotNet/Mixin.6.MediaQueries.cs @@ -47,7 +47,7 @@ public static StyleModifier WhenMediaWidthBetween(int minWidthAsPixel, int maxWi /// /// min-width: + 'px' /// - public static StyleModifier WhenMediaWidthGreaterThan(int widthAsPixel, params StyleModifier[] styleModifiers) + public static StyleModifier WhenMediaMinWidth(int widthAsPixel, params StyleModifier[] styleModifiers) { return MediaQuery($"(min-width: {widthAsPixel}px)", styleModifiers); } @@ -55,18 +55,18 @@ public static StyleModifier WhenMediaWidthGreaterThan(int widthAsPixel, params S /// /// Sample Usage: /// - /// WhenMediaWidthGreaterThan(SM, BorderRadius(8)) + /// WhenMediaMinWidth(SM, BorderRadius(8)) /// /// - public static StyleModifier WhenMediaWidthGreaterThan(Func breakpoint, params StyleModifier[] styleModifiers) + public static StyleModifier WhenMediaMinWidth(Func breakpoint, params StyleModifier[] styleModifiers) { - return WhenMediaWidthGreaterThan(ConvertToNumber(breakpoint), styleModifiers); + return WhenMediaMinWidth(ConvertToNumber(breakpoint), styleModifiers); } /// /// max-width: + 'px' /// - public static StyleModifier WhenMediaWidthLessThan(int widthAsPixel, params StyleModifier[] styleModifiers) + public static StyleModifier WhenMediaMaxWidth(int widthAsPixel, params StyleModifier[] styleModifiers) { return MediaQuery($"(max-width: {widthAsPixel}px)", styleModifiers); } @@ -74,12 +74,12 @@ public static StyleModifier WhenMediaWidthLessThan(int widthAsPixel, params Styl /// /// Sample Usage: /// - /// WhenMediaWidthLessThan(SM, BorderRadius(8)) + /// WhenMediaMaxWidth(SM, BorderRadius(8)) /// /// - public static StyleModifier WhenMediaWidthLessThan(Func breakpoint, params StyleModifier[] styleModifiers) + public static StyleModifier WhenMediaMaxWidth(Func breakpoint, params StyleModifier[] styleModifiers) { - return WhenMediaWidthLessThan(ConvertToNumber(breakpoint), styleModifiers); + return WhenMediaMaxWidth(ConvertToNumber(breakpoint), styleModifiers); } ///