Merge branch 'dev' of https://github.com/microsoft/fluentui-blazor in…

…to dev
microsoft · Apr 12, 2024 · f023d90 · f023d90
2 parents 284caae + fb63351
commit f023d90
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 18 deletions.
diff --git a/examples/Demo/Shared/Pages/Highlighter/Examples/HighlighterDefault.razor b/examples/Demo/Shared/Pages/Highlighter/Examples/HighlighterDefault.razor
@@ -1,6 +1,6 @@
 @namespace FluentUI.Demo.Shared
 
-<input type="text" @bind-Value="@Highlight" @bind-Value:event="oninput" />
+<FluentTextField @bind-Value="@Highlight" Immediate="true" />
 <br />
 <br />
 
@@ -11,4 +11,4 @@
 @code 
 {
     public string Highlight = "";
-}
+}
diff --git a/examples/Demo/Shared/Pages/KeyCode/Examples/KeyCodeGlobalExample.razor.css b/examples/Demo/Shared/Pages/KeyCode/Examples/KeyCodeGlobalExample.razor.css
@@ -11,6 +11,7 @@
     text-align: center;
     font-weight: bold;
     font-size: 14px;
+    color: black;
     cursor: pointer;
 }
 

diff --git a/examples/Demo/Shared/Pages/Progress/Examples/ProgressStrokeExample.razor b/examples/Demo/Shared/Pages/Progress/Examples/ProgressStrokeExample.razor
@@ -1,8 +1,8 @@
 <h4>Stroke and Color</h4>
 
-<FluentSelect Label="Width" Items="@(new [] { Microsoft.FluentUI.AspNetCore.Components.ProgressStroke.Small, Microsoft.FluentUI.AspNetCore.Components.ProgressStroke.Normal, Microsoft.FluentUI.AspNetCore.Components.ProgressStroke.Large })" @bind-SelectedOption="@Stroke" Width="60px" />
+<FluentSelect Label="Width" Items="@(new [] { Microsoft.FluentUI.AspNetCore.Components.ProgressStroke.Small, Microsoft.FluentUI.AspNetCore.Components.ProgressStroke.Normal, Microsoft.FluentUI.AspNetCore.Components.ProgressStroke.Large })" @bind-SelectedOption="@Stroke" Width="100px" />
 <FluentCheckbox Label="Indeterminate" @bind-Value="@Indeterminate" />
-<FluentSelect Label="Color" Items="@(Enum.GetValues<OfficeColor>())" @bind-SelectedOption="@Color" Width="100px" Height="200px" />
+<FluentSelect Label="Color" Items="@(Enum.GetValues<OfficeColor>())" @bind-SelectedOption="@Color" Width="120px" Height="200px" />
 <FluentSlider Min="0" Max="100" Step="5" @bind-Value="@Percentage" Style="max-width: 200px; margin: 20px 0px;" Disabled="@Indeterminate" />
 
 <FluentStack Style="margin: 30px;">
@@ -20,4 +20,4 @@
     int Percentage = 30;
     bool Indeterminate = false;
     OfficeColor Color = OfficeColor.Default;
-}
+}
diff --git a/examples/Demo/Shared/Pages/ProgressRing/Examples/ProgressRingStroke.razor b/examples/Demo/Shared/Pages/ProgressRing/Examples/ProgressRingStroke.razor
@@ -1,8 +1,8 @@
 <h4>Stroke and Color</h4>
 
-<FluentSelect Label="Width" Items="@(new [] { ProgressStroke.Small, ProgressStroke.Normal, ProgressStroke.Large })" @bind-SelectedOption="@Stroke" Width="160px" />
+<FluentSelect Label="Width" Items="@(new [] { ProgressStroke.Small, ProgressStroke.Normal, ProgressStroke.Large })" @bind-SelectedOption="@Stroke" Width="100px" />
 <FluentCheckbox Label="Indeterminate" @bind-Value="@Indeterminate" />
-<FluentSelect Label="Color" Items="@(Enum.GetValues<OfficeColor>())" @bind-SelectedOption="@Color" Width="160px" Height="200px" />
+<FluentSelect Label="Color" Items="@(Enum.GetValues<OfficeColor>())" @bind-SelectedOption="@Color" Width="120px" Height="200px" />
 <FluentSlider Min="0" Max="100" Step="5" @bind-Value="@Percentage" Style="max-width: 200px; margin: 20px 0px;" Disabled="@Indeterminate" />
 
 <FluentStack Style="margin: 30px;">

diff --git a/examples/Demo/Shared/Shared/DemoMainLayout.razor b/examples/Demo/Shared/Shared/DemoMainLayout.razor
@@ -47,16 +47,18 @@
                 <SiteSettings />
             </div>
 
-            <FluentProfileMenu Image="@DataSource.ImageFaces[3]"
-                               Status="@PresenceStatus.Available"
-                               TopCorner="true"
-                               Initials="OS"
-                               FullName="Olivia Smith"
-                               EMail="sam@my-company.com"
-                               Style="min-width: 330px;">
-                               <HeaderTemplate><FluentLabel Typo="Typography.Body">My Company Corp</FluentLabel></HeaderTemplate>
-                               <FooterTemplate></FooterTemplate>
-            </FluentProfileMenu>
+             <div class="profile">
+                <FluentProfileMenu Image="@DataSource.ImageFaces[3]"
+                                   Status="@PresenceStatus.Available"
+                                   TopCorner="true"
+                                   Initials="OS"
+                                   FullName="Olivia Smith"
+                                   EMail="sam@my-company.com"
+                                   Style="min-width: 330px;">
+                                   <HeaderTemplate><FluentLabel Typo="Typography.Body">My Company Corp</FluentLabel></HeaderTemplate>
+                                   <FooterTemplate></FooterTemplate>
+                </FluentProfileMenu>
+            </div>
         </FluentHeader>
 
         <FluentStack Class="body-stack" Orientation="Orientation.Horizontal" Width="100%" HorizontalGap="0">

diff --git a/examples/Demo/Shared/wwwroot/css/site.css b/examples/Demo/Shared/wwwroot/css/site.css
@@ -35,13 +35,18 @@ body {
     }
 
     .siteheader .settings {
-        padding-right: 6px;
         display: flex;
         align-items: center;
         margin-left: 0;
         margin-right: 10px;
     }
 
+    .siteheader .profile {
+        padding-right: 16px;
+        margin-left: 0;
+        margin-right: 10px;
+    }
+
 [dir="rtl"] .siteheader .settings {
     padding: 0 0 0 6px;
     margin-left: 10px;