Skip to content

Commit 988edec

Browse files
committed
Docs: fix Bar items alignment
1 parent 5be5c84 commit 988edec

3 files changed

Lines changed: 91 additions & 49 deletions

File tree

Documentation/Blazorise.Docs/Components/DocsVersionMenu.razor

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@
88
{
99
@if ( IsActiveUrl( version.BaseUrl ) )
1010
{
11-
<BarDropdownItem To="@version.DocsUrl" Flex="Flex.InlineFlex.JustifyContent.Between.AlignItems.Center" Border="Border.Is1.OnTop.Is1.OnBottom">
12-
<Span>@version.Name</Span>
13-
@if ( IsActiveUrl( version.BaseUrl ) )
14-
{
15-
<Icon Name="IconName.Check" Padding="Padding.Is2.FromStart" TextColor="TextColor.Primary" />
16-
}
11+
<BarDropdownItem To="@version.DocsUrl" Border="Border.Is1.OnTop.Is1.OnBottom">
12+
<Span Display="Display.Flex" Flex="Flex.JustifyContent.Between.AlignItems.Center" Width="Width.Is100">
13+
<Span>@version.Name</Span>
14+
@if ( IsActiveUrl( version.BaseUrl ) )
15+
{
16+
<Icon Name="IconName.Check" Padding="Padding.Is2.FromStart" TextColor="TextColor.Primary" />
17+
}
18+
</Span>
1719
</BarDropdownItem>
1820
}
1921
else
@@ -36,4 +38,4 @@
3638
[Inject] public NavigationManager NavigationManager { get; set; }
3739

3840
[Inject] public DocsVersionOptions VersionOptions { get; set; }
39-
}
41+
}

Documentation/Blazorise.Docs/Components/TopMenuEnd.razor

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<BarItem>
1313
<BarLink To="https://github.com/Megabit/Blazorise" Target="Target.Blank" aria-label="Star Blazorise on GitHub">
1414
<Div Display="Display.Flex.Row.Block.OnDesktop" Flex="Flex.Default.OnWidescreen.Flex.AlignItems.Center">
15-
<Icon Name="IconName.Star" IconStyle="IconStyle.Regular" IconSize="IconSize.Large" TextColor="TextColor.Warning"/>
15+
<Icon Name="IconName.Star" IconStyle="IconStyle.Regular" IconSize="IconSize.Large" TextColor="TextColor.Warning" />
1616
<Span Margin="Margin.Is2.FromStart" Display="Display.Block.OnMobile.None.OnDesktop.Block.OnWidescreen">
1717
Star us on GitHub
1818
</Span>
@@ -36,14 +36,20 @@
3636
}
3737
</BarDropdownToggle>
3838
<BarDropdownMenu>
39-
<BarDropdownItem Clicked="@(()=>ThemeService.SetLightTheme())" Flex="Flex.AlignItems.Center">
40-
<Icon Name="IconName.Sun" Margin="Margin.Is2.FromEnd" /> Light <Icon Name="IconName.Check" Margin="Margin.IsAuto.FromStart" Visibility="@(ThemeService.IsLight ? Visibility.Visible : Visibility.Invisible)" />
39+
<BarDropdownItem Clicked="@(() => ThemeService.SetLightTheme())">
40+
<Span Display="Display.Flex" Flex="Flex.AlignItems.Center" Width="Width.Is100">
41+
<Icon Name="IconName.Sun" Margin="Margin.Is2.FromEnd" /> Light <Icon Name="IconName.Check" Margin="Margin.IsAuto.FromStart" Visibility="@(ThemeService.IsLight ? Visibility.Visible : Visibility.Invisible)" />
42+
</Span>
4143
</BarDropdownItem>
42-
<BarDropdownItem Clicked="@(()=>ThemeService.SetDarkTheme())" Flex="Flex.AlignItems.Center">
43-
<Icon Name="IconName.Moon" Margin="Margin.Is2.FromEnd" /> Dark <Icon Name="IconName.Check" Margin="Margin.IsAuto.FromStart" Visibility="@(ThemeService.IsDark ? Visibility.Visible : Visibility.Invisible)" />
44+
<BarDropdownItem Clicked="@(() => ThemeService.SetDarkTheme())">
45+
<Span Display="Display.Flex" Flex="Flex.AlignItems.Center" Width="Width.Is100">
46+
<Icon Name="IconName.Moon" Margin="Margin.Is2.FromEnd" /> Dark <Icon Name="IconName.Check" Margin="Margin.IsAuto.FromStart" Visibility="@(ThemeService.IsDark ? Visibility.Visible : Visibility.Invisible)" />
47+
</Span>
4448
</BarDropdownItem>
45-
<BarDropdownItem Clicked="@(()=>ThemeService.SetSystemTheme())" Flex="Flex.AlignItems.Center">
46-
<Icon Name="IconName.Adjust" Margin="Margin.Is2.FromEnd" /> System <Icon Name="IconName.Check" Margin="Margin.IsAuto.FromStart" Visibility="@(ThemeService.IsSystem ? Visibility.Visible : Visibility.Invisible)" />
49+
<BarDropdownItem Clicked="@(() => ThemeService.SetSystemTheme())">
50+
<Span Display="Display.Flex" Flex="Flex.AlignItems.Center" Width="Width.Is100">
51+
<Icon Name="IconName.Adjust" Margin="Margin.Is2.FromEnd" /> System <Icon Name="IconName.Check" Margin="Margin.IsAuto.FromStart" Visibility="@(ThemeService.IsSystem ? Visibility.Visible : Visibility.Invisible)" />
52+
</Span>
4753
</BarDropdownItem>
4854
</BarDropdownMenu>
4955
</BarDropdown>
@@ -65,6 +71,6 @@
6571

6672
void OnThemeChanged( object sender, string theme )
6773
{
68-
InvokeAsync(StateHasChanged);
74+
InvokeAsync( StateHasChanged );
6975
}
7076
}

0 commit comments

Comments
 (0)