Merge branch 'main' into feature/admin
This commit is contained in:
commit
8925f07f31
|
@ -15,11 +15,9 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
|
|||
COPY --from=build-deps /src/OliverBooth/wwwroot /src/OliverBooth/wwwroot
|
||||
WORKDIR /src
|
||||
COPY ["OliverBooth/OliverBooth.csproj", "OliverBooth/"]
|
||||
RUN dotnet restore "OliverBooth/OliverBooth.csproj"
|
||||
COPY . .
|
||||
|
||||
WORKDIR "/src/OliverBooth"
|
||||
RUN dotnet build "OliverBooth.csproj" -c Release -o /app/build
|
||||
|
||||
FROM build AS publish
|
||||
RUN dotnet publish "OliverBooth.csproj" -c Release -o /app/publish /p:UseAppHost=false
|
||||
|
|
|
@ -10,25 +10,25 @@
|
|||
<ItemGroup>
|
||||
<PackageReference Include="Alexinea.Extensions.Configuration.Toml" Version="7.0.0"/>
|
||||
<PackageReference Include="Asp.Versioning.Mvc" Version="8.0.0"/>
|
||||
<PackageReference Include="AspNetCore.ReCaptcha" Version="1.7.0"/>
|
||||
<PackageReference Include="AspNetCore.ReCaptcha" Version="1.8.1"/>
|
||||
<PackageReference Include="BCrypt.Net-Core" Version="1.6.0"/>
|
||||
<PackageReference Include="HtmlAgilityPack" Version="1.11.59"/>
|
||||
<PackageReference Include="Humanizer.Core" Version="2.14.1"/>
|
||||
<PackageReference Include="MailKit" Version="4.3.0"/>
|
||||
<PackageReference Include="MailKitSimplified.Sender" Version="2.8.0"/>
|
||||
<PackageReference Include="Markdig" Version="0.34.0"/>
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0"/>
|
||||
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.0"/>
|
||||
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0"/>
|
||||
<PackageReference Include="MailKitSimplified.Sender" Version="2.9.0"/>
|
||||
<PackageReference Include="Markdig" Version="0.35.0"/>
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.2"/>
|
||||
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.2"/>
|
||||
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.2"/>
|
||||
<PackageReference Include="NetBarcode" Version="1.7.0"/>
|
||||
<PackageReference Include="Otp.NET" Version="1.3.0"/>
|
||||
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0"/>
|
||||
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0"/>
|
||||
<PackageReference Include="Serilog" Version="3.1.1"/>
|
||||
<PackageReference Include="Serilog.AspNetCore" Version="8.0.0"/>
|
||||
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1"/>
|
||||
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0"/>
|
||||
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1"/>
|
||||
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0"/>
|
||||
<PackageReference Include="SmartFormat.NET" Version="3.3.0"/>
|
||||
<PackageReference Include="SmartFormat.NET" Version="3.3.2"/>
|
||||
<PackageReference Include="X10D" Version="3.3.1"/>
|
||||
<PackageReference Include="X10D.Hosting" Version="3.3.1"/>
|
||||
<PackageReference Include="ZString" Version="2.5.1"/>
|
||||
|
|
|
@ -1,12 +1,17 @@
|
|||
@page
|
||||
|
||||
<main class="container">
|
||||
<h1 class="display-4">Hi, I'm Oliver.</h1>
|
||||
<p class="lead">I'm a tech enthusiast, coffee drinker, and software developer.</p>
|
||||
|
||||
<p class="text-center">
|
||||
<img src="~/img/headshot_512x512_2023.jpg" style="width: 512px; max-width: 100%;">
|
||||
</p>
|
||||
<div class="row align-items-center mb-3">
|
||||
<div id="landing-page-intro" class="col-sm-12 col-md-6">
|
||||
<h1 class="display-4">Hi, I'm Oliver.</h1>
|
||||
<p class="lead">
|
||||
Coffee enthusiast with a love for all things tech. Tech enthusiast with a love for all things coffee.
|
||||
</p>
|
||||
</div>
|
||||
<div id="landing-page-headshot" class="col-sm-12 col-md-6 justify-content-right">
|
||||
<img src="~/img/headshot_512x512_2023.jpg" class="rounded-circle" style="width: 50%; max-width: 512px;" alt="Headshot">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p>
|
||||
My primary focus is C#, though I have dabbled in several other languages such as Java, Kotlin, VB, C/C++,
|
||||
|
|
|
@ -60,6 +60,7 @@
|
|||
<link href="https://fonts.googleapis.com/css2?family=Roboto+Mono:wght@100;400;700&display=swap" rel="stylesheet">
|
||||
<link href="https://fonts.googleapis.com/css2?family=Poppins:wght@200;400;700&display=swap" rel="stylesheet">
|
||||
<link href="https://fonts.googleapis.com/css2?family=Gabarito:wght@400;500;600;700;800;900&display=swap" rel="stylesheet">
|
||||
<link href="https://fonts.googleapis.com/css2?family=Titillium+Web:ital,wght@0,200;0,300;0,400;0,600;0,700;0,900;1,200;1,300;1,400;1,600;1,700&display=swap" rel="stylesheet">
|
||||
<link rel="stylesheet" href="~/css/prism.min.css" asp-append-version="true">
|
||||
<link rel="stylesheet" href="~/css/prism.vs.min.css" asp-append-version="true">
|
||||
<link rel="stylesheet" href="~/css/app.min.css" asp-append-version="true">
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -367,6 +367,7 @@ td.trim-p p:last-child {
|
|||
background-size: cover;
|
||||
border-radius: 10px;
|
||||
cursor: pointer;
|
||||
|
||||
* {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
@ -384,6 +385,7 @@ td.trim-p p:last-child {
|
|||
&:first-child {
|
||||
border-left: none;
|
||||
}
|
||||
|
||||
&:last-child {
|
||||
border-right: none;
|
||||
}
|
||||
|
@ -392,7 +394,7 @@ td.trim-p p:last-child {
|
|||
|
||||
.post-tags a.badge {
|
||||
transition: color 250ms, background-color 250ms;
|
||||
|
||||
|
||||
&:link, &:visited, &:active {
|
||||
background-color: #2D2D2D !important;
|
||||
color: #fff;
|
||||
|
@ -407,12 +409,50 @@ td.trim-p p:last-child {
|
|||
.mastodon-update-card.card {
|
||||
background-color: desaturate(darken(#6364FF, 50%), 50%);
|
||||
margin-bottom: 50px;
|
||||
|
||||
|
||||
p:last-child {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
|
||||
button.btn.btn-mastodon {
|
||||
background-color: #6364FF;
|
||||
}
|
||||
}
|
||||
|
||||
#landing-page-intro {
|
||||
text-align: left;
|
||||
|
||||
h1.display-4 {
|
||||
font-family: "Titillium Web", sans-serif;
|
||||
font-weight: 600;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
p.lead {
|
||||
font-family: "Titillium Web", sans-serif;
|
||||
font-weight: 400;
|
||||
font-style: normal;
|
||||
}
|
||||
}
|
||||
|
||||
#landing-page-headshot {
|
||||
text-align: right;
|
||||
|
||||
img {
|
||||
transition: border-radius .4s;
|
||||
|
||||
&:hover {
|
||||
border-radius: 5px !important;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 768px) {
|
||||
#landing-page-intro {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
#landing-page-headshot {
|
||||
text-align: center;
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue