Skip to content

Commit

Permalink
Merge branch 'dev' into users/vnbaaij/fix-issue-#1847
Browse files Browse the repository at this point in the history
  • Loading branch information
vnbaaij authored Apr 12, 2024
2 parents 750f8f4 + 638b86d commit bccd622
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
6 changes: 6 additions & 0 deletions examples/Demo/Shared/Pages/DataGrid/DataGridPage.razor
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@
.
</p>

<h2 id="sorting">Sorting</h2>
<p>
The DataGrid supports sorting by clicking on the column headers. The default sort direction is ascending. Clicking on the same column header again will toggle the sort direction.
A sort can be removed by right clicking on the header column (with exception of the default sort).
</p>

<h2 id="example">Examples</h2>

<DemoSection Title="Get started" Component="@typeof(DataGridGetStarted)">
Expand Down
2 changes: 1 addition & 1 deletion examples/Demo/Shared/Shared/DemoNavMenu.razor
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="navmenu">
<input type="checkbox" title="Menu expand/collapse toggle" id="navmenu-toggle" class="navmenu-icon" />
<label for="navmenu-toggle" class="navmenu-icon"><FluentIcon Value="@(new Icons.Regular.Size20.Navigation())" Color="Color.Neutral" /></label>
<nav class="sitenav" aria-labelledby="main-menu" onclick="document.getElementById('navmenu-toggle').click()">
<nav class="sitenav" aria-labelledby="main-menu">
<FluentNavMenu Id="main-menu" Title="Main menu">
@foreach(var item in NavProvider.NavMenuItems)
{
Expand Down

0 comments on commit bccd622

Please sign in to comment.