Skip to content

Commit

Permalink
net8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@Jimmys20
Jimmys20 committed Nov 17, 2023
1 parent 63c5a49 commit 2770dae
Show file tree
Hide file tree
Showing 26 changed files with 125 additions and 868 deletions.
10 changes: 5 additions & 5 deletions demo/Jimmys20.BlazorComponents.Demo/Jimmys20.BlazorComponents.Demo.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BlazorPro.BlazorSize" Version="6.2.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.5" PrivateAssets="all" />
<PackageReference Include="BlazorPro.BlazorSize" Version="6.2.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
0 ...orComponents.Demo/Shared/MainLayout.razor → ...orComponents.Demo/Layout/MainLayout.razor
View file
File renamed without changes.
6 changes: 1 addition & 5 deletions ...mponents.Demo/Shared/MainLayout.razor.css → ...mponents.Demo/Layout/MainLayout.razor.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,7 @@ main {
}

@media (max-width: 640.98px) {
.top-row:not(.auth) {
display: none;
}

.top-row.auth {
.top-row {
justify-content: space-between;
}

Expand Down
8 changes: 4 additions & 4 deletions ...lazorComponents.Demo/Shared/NavMenu.razor → ...lazorComponents.Demo/Layout/NavMenu.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
<nav class="nav flex-column">
<div class="nav-item px-3">
<NavLink class="nav-link" href="" Match="NavLinkMatch.All">
<span class="oi oi-home" aria-hidden="true"></span> Home
<span class="bi bi-house-door-fill-nav-menu" aria-hidden="true"></span> Home
</NavLink>
</div>
<div class="nav-item px-3">
<NavLink class="nav-link" href="counter">
<span class="oi oi-plus" aria-hidden="true"></span> Counter
<span class="bi bi-plus-square-fill-nav-menu" aria-hidden="true"></span> Counter
</NavLink>
</div>
<div class="nav-item px-3">
<NavLink class="nav-link" href="fetchdata">
<span class="oi oi-list-rich" aria-hidden="true"></span> Fetch data
<NavLink class="nav-link" href="weather">
<span class="bi bi-list-nested-nav-menu" aria-hidden="true"></span> Weather
</NavLink>
</div>
</nav>
Expand Down
83 changes: 83 additions & 0 deletions demo/Jimmys20.BlazorComponents.Demo/Layout/NavMenu.razor.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
.navbar-toggler {
background-color: rgba(255, 255, 255, 0.1);
}

.top-row {
height: 3.5rem;
background-color: rgba(0,0,0,0.4);
}

.navbar-brand {
font-size: 1.1rem;
}

.bi {
display: inline-block;
position: relative;
width: 1.25rem;
height: 1.25rem;
margin-right: 0.75rem;
top: -1px;
background-size: cover;
}

.bi-house-door-fill-nav-menu {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-house-door-fill' viewBox='0 0 16 16'%3E%3Cpath d='M6.5 14.5v-3.505c0-.245.25-.495.5-.495h2c.25 0 .5.25.5.5v3.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5Z'/%3E%3C/svg%3E");
}

.bi-plus-square-fill-nav-menu {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-plus-square-fill' viewBox='0 0 16 16'%3E%3Cpath d='M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm6.5 4.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3a.5.5 0 0 1 1 0z'/%3E%3C/svg%3E");
}

.bi-list-nested-nav-menu {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M4.5 11.5A.5.5 0 0 1 5 11h10a.5.5 0 0 1 0 1H5a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 1 3h10a.5.5 0 0 1 0 1H1a.5.5 0 0 1-.5-.5z'/%3E%3C/svg%3E");
}

.nav-item {
font-size: 0.9rem;
padding-bottom: 0.5rem;
}

.nav-item:first-of-type {
padding-top: 1rem;
}

.nav-item:last-of-type {
padding-bottom: 1rem;
}

.nav-item ::deep a {
color: #d7d7d7;
border-radius: 4px;
height: 3rem;
display: flex;
align-items: center;
line-height: 3rem;
}

.nav-item ::deep a.active {
background-color: rgba(255,255,255,0.37);
color: white;
}

.nav-item ::deep a:hover {
background-color: rgba(255,255,255,0.1);
color: white;
}

@media (min-width: 641px) {
.navbar-toggler {
display: none;
}

.collapse {
/* Never collapse the sidebar for wide screens */
display: block;
}

.nav-scrollable {
/* Allow sidebar to scroll for tall menus */
height: calc(100vh - 3.5rem);
overflow-y: auto;
}
}
2 changes: 1 addition & 1 deletion ...0.BlazorComponents.Demo/Pages/Index.razor → ...20.BlazorComponents.Demo/Pages/Home.razor
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@page "/"
@inject IDialogService Dialog

<PageTitle>Index</PageTitle>
<PageTitle>Home</PageTitle>

<div class="h-100 d-flex flex-column">
<div class="mb-1">
Expand Down
6 changes: 3 additions & 3 deletions ...azorComponents.Demo/Pages/FetchData.razor → ...BlazorComponents.Demo/Pages/Weather.razor
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@page "/fetchdata"
@page "/weather"
@inject HttpClient Http

<PageTitle>Weather forecast</PageTitle>
<PageTitle>Weather</PageTitle>

<h1>Weather forecast</h1>
<h1>Weather</h1>

<p>This component demonstrates fetching data from the server.</p>

Expand Down
0 ...0.BlazorComponents.Demo/Client/Program.cs → ...Jimmys20.BlazorComponents.Demo/Program.cs
View file
File renamed without changes.
1 change: 1 addition & 0 deletions demo/Jimmys20.BlazorComponents.Demo/Properties/launchSettings.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://json.schemastore.org/launchsettings.json",
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
Expand Down
68 changes: 0 additions & 68 deletions demo/Jimmys20.BlazorComponents.Demo/Shared/NavMenu.razor.css
View file

This file was deleted.

2 changes: 1 addition & 1 deletion demo/Jimmys20.BlazorComponents.Demo/_Imports.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
@using Jimmys20.BlazorComponents.Demo
@using Jimmys20.BlazorComponents.Demo.Models
@using Jimmys20.BlazorComponents.Demo.Services
@using Jimmys20.BlazorComponents.Demo.Shared
@using Jimmys20.BlazorComponents.Demo.Layout
@using BlazorPro.BlazorSize
8 changes: 5 additions & 3 deletions demo/Jimmys20.BlazorComponents.Demo/wwwroot/css/app.css
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');

html, body {
html, body {
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
}

Expand Down Expand Up @@ -100,6 +98,10 @@ a, .btn-link {
content: var(--blazor-load-percentage-text, "Loading");
}

code {
color: #c02d76;
}

.jm-dropzone {
border: 1px dashed var(--bs-secondary);
border-radius: 0.2rem;
Expand Down
86 changes: 0 additions & 86 deletions demo/Jimmys20.BlazorComponents.Demo/wwwroot/css/open-iconic/FONT-LICENSE
View file

This file was deleted.

21 changes: 0 additions & 21 deletions demo/Jimmys20.BlazorComponents.Demo/wwwroot/css/open-iconic/ICON-LICENSE
View file

This file was deleted.

Loading

0 comments on commit 2770dae

Please sign in to comment.