Skip to content

Commit 1cd649b

Browse files
teauxfuteauxfu
committed
cosmetic fixes
1 parent 7478eaf commit 1cd649b

File tree

9 files changed

+94
-72
lines changed

9 files changed

+94
-72
lines changed

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project>
22
<PropertyGroup>
3-
<Version>0.1.3.1</Version>
3+
<Version>0.1.4.1</Version>
44
</PropertyGroup>
55
</Project>

‎FilterStash.UI/DisplayPackageDetail.razor.css‎

Whitespace-only changes.

‎FilterStash.UI/DisplayPackagesGrid.razor‎

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ else
2727
@context.Package.Name
2828
</a>
2929
}
30-
3130
</div>
3231
</TemplateColumn>
3332
<TemplateColumn Title="Last updated">
@@ -40,19 +39,21 @@ else
4039
<span>never</span>
4140
}
4241
</TemplateColumn>
43-
<TemplateColumn>
44-
@if (context.Package.Name == GetCurrentlyInstalledPackageName())
45-
{
46-
<button onclick=@(async () => await HandleOnUninstallPackageAsync(context.Package.Name))>
47-
❌ uninstall
48-
</button>
49-
}
50-
else
51-
{
52-
<button onclick=@(async () => await HandleOnInstallPackageAsync(context.Package.Name))>
53-
🛠 install
54-
</button>
55-
}
42+
<TemplateColumn Class="button-column">
43+
<div>
44+
@if (context.Package.Name == GetCurrentlyInstalledPackageName())
45+
{
46+
<button onclick=@(async () => await HandleOnUninstallPackageAsync(context.Package.Name))>
47+
❌ uninstall
48+
</button>
49+
}
50+
else
51+
{
52+
<button onclick=@(async () => await HandleOnInstallPackageAsync(context.Package.Name))>
53+
🛠 install
54+
</button>
55+
}
56+
</div>
5657
</TemplateColumn>
5758
<TemplateColumn Class="button-column">
5859
<div>
@@ -67,18 +68,21 @@ else
6768
</div>
6869
</TemplateColumn>
6970
<TemplateColumn Class="button-column">
70-
<button @onclick=@(async() => await HandleOnUpdatePackage(context.Package.Name))>
71-
<div style="display:flex; flex-direction: row; gap: 2px;">
72-
📥 update package
73-
@if(UpdatesPending.Contains(context.Package.Name))
74-
{
75-
<div class="ping-container" title="update available">
76-
<div class="ping-animation"></div>
77-
<div class="ping-circle"></div>
78-
</div>
79-
}
80-
</div>
81-
</button>
71+
<div>
72+
<button @onclick=@(async() => await HandleOnUpdatePackage(context.Package.Name))>
73+
<div style="display:flex; flex-direction: row; gap: 2px;">
74+
📥 update
75+
@if (UpdatesPending.Contains(context.Package.Name))
76+
{
77+
<span>pending</span>
78+
<div class="ping-container" title="update available">
79+
<div class="ping-animation"></div>
80+
<div class="ping-circle"></div>
81+
</div>
82+
}
83+
</div>
84+
</button>
85+
</div>
8286
</TemplateColumn>
8387
<TemplateColumn Class="button-column">
8488
<HeaderTemplate>
@@ -87,9 +91,11 @@ else
8791
</button>
8892
</HeaderTemplate>
8993
<ChildContent>
90-
<button @onclick=@(async () => await HandleOnDeletePackageAsync(context.Package.Name))>
91-
🗑️ delete
92-
</button>
94+
<div>
95+
<button @onclick=@(async () => await HandleOnDeletePackageAsync(context.Package.Name))>
96+
🗑️ delete
97+
</button>
98+
</div>
9399
</ChildContent>
94100
</TemplateColumn>
95101
</QuickGrid>

‎FilterStash.UI/DisplayPackagesGrid.razor.css‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎FilterStash.UI/wwwroot/css/app.css‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,44 @@ h1:focus {
101101
animation: spin 1s linear infinite;
102102
}
103103

104-
.ping {
104+
.button-column {
105+
padding: 0 !important;
106+
}
107+
108+
.button-column div {
109+
display: flex;
110+
justify-content: center;
111+
}
112+
113+
114+
.ping-container {
115+
position: relative;
116+
height: 12px; /* h-3 in Tailwind */
117+
width: 12px; /* w-3 in Tailwind */
118+
display: inline-block;
119+
}
120+
121+
.ping-animation {
122+
position: absolute;
123+
top: 0;
124+
left: 0;
125+
height: 100%;
126+
width: 100%;
127+
border-radius: 9999px; /* rounded-full in Tailwind */
128+
background-color: #38bdf8; /* bg-sky-400 in Tailwind */
129+
opacity: 0.75;
105130
animation: ping 1s cubic-bezier(0, 0, 0.2, 1) infinite;
106131
}
107132

133+
.ping-circle {
134+
position: relative;
135+
height: 12px; /* h-3 in Tailwind */
136+
width: 12px; /* w-3 in Tailwind */
137+
border-radius: 9999px; /* rounded-full in Tailwind */
138+
background-color: #0ea5e9; /* bg-sky-500 in Tailwind */
139+
}
140+
141+
/* Keyframes for the ping animation */
108142
@keyframes ping {
109143
75%, 100% {
110144
transform: scale(2);

‎FilterStash.WinForms/Form1.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using System.Reflection;
99
using System.Text;
1010
using Octokit;
11+
using Microsoft.Web.WebView2.WinForms;
1112

1213
namespace WinFormsShell
1314
{
@@ -32,6 +33,7 @@ private void LoadBlazor()
3233

3334
var services = new ServiceCollection();
3435
services.AddWindowsFormsBlazorWebView();
36+
services.AddBlazorWebViewDeveloperTools();
3537

3638
// try to move this stuff to program.cs
3739
services.AddSingleton(_bridge);

‎FilterStash.WinForms/version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
#define MyAppVersion "0.1.3.1"
1+
#define MyAppVersion "0.1.4"

‎FilterStash.WinForms/wwwroot/index.html‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,30 @@
55
<meta charset="utf-8" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover" />
77
<base href="/" />
8-
<link rel="stylesheet" href="" />
9-
<link rel="stylesheet" href="FilterStash.styles.css" />
108
<!--todo move this to @import in site.css instead later (eg. if adding tailwind)-->
9+
<link rel="stylesheet" href="winforms.css" />
1110
<link rel="stylesheet" href="_content/FilterStash.UI/FilterStash.UI.styles.css" />
1211
<link rel="stylesheet" href="_content/FilterStash.UI/css/bootstrap/bootstrap.min.css" />
1312
<link rel="stylesheet" href="_content/FilterStash.UI/css/app.css" />
1413
<link rel="icon" href="data:,">
14+
15+
<style>
16+
.ping {
17+
animation: ping 1s cubic-bezier(0, 0, 0.2, 1) infinite;
18+
}
19+
20+
@keyframes ping {
21+
0% {
22+
transform: scale(1);
23+
opacity: 1;
24+
}
25+
26+
75%, 100% {
27+
transform: scale(2);
28+
opacity: 0;
29+
}
30+
}
31+
</style>
1532
</head>
1633
<body style="background-color: gainsboro">
1734
<div class="status-bar-safe-area"></div>

‎FilterStash.WinForms/wwwroot/winforms.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@import('_content/FilterStash.UI/FilterStash.styles.css');

0 commit comments

Comments
 (0)