Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove outline on menu items and caret on keybind inputs #469

Merged
merged 2 commits into from
Jan 18, 2025
Merged

Remove outline on menu items and caret on keybind inputs #469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f40ff99
Remove outline on menu items and caret on keybind inputs
domialex Jan 8, 2025
bc4f510
Adjusted menu focus styles
leMicin Jan 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Sidekick.Common.Blazor/Settings/Components/KeybindEditor.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
OnBlur="Blur"
Label="@Label"
Value="@InputValue"
AdditionalClasses="cursor-default caret-transparent"
spellcheck="false">
<AdornmentContent>
<ButtonSecondary OnClick="Delete">@Resources["Reset"]</ButtonSecondary>
Expand Down
5 changes: 4 additions & 1 deletion src/Sidekick.Common.Ui/Forms/FormInput.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
@onfocus="OnFocus"
@onblur="OnBlur"
value="@Value"
class="@UiClasses.FormInputClasses p-2 text-base min-w-0 grow"/>
class="@UiClasses.FormInputClasses p-2 text-base min-w-0 grow @AdditionalClasses" />
@AdornmentContent
</div>

Expand All @@ -40,6 +40,9 @@
[Parameter(CaptureUnmatchedValues = true)]
public Dictionary<string, object>? InputAttributes { get; set; }

[Parameter]
public string? AdditionalClasses { get; set; }

private string Id { get; } = UiUtilities.GenerateId();

private async Task OnChange(ChangeEventArgs args)
Expand Down
6 changes: 2 additions & 4 deletions src/Sidekick.Common.Ui/Menu/MenuItem.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<a href="@Href"
class="@UiClasses.FocusClasses px-4 py-2 text-base font-medium tracking-wide text-white transition-colors duration-200 @(IsActive ? "bg-violet-700 hover:bg-violet-500" : "bg-transparent hover:text-violet-500")">
class="focus:outline-none focus:ring-inset focus:ring-2 focus:ring-offset-2 dark:focus:ring-violet-400 px-4 py-2 text-base font-medium tracking-wide text-white transition-colors duration-200 @(IsActive ? "bg-violet-700 hover:bg-violet-500" : "bg-transparent hover:text-violet-500")">
@ChildContent
</a>

Expand All @@ -13,8 +13,6 @@
[Parameter]
public RenderFragment? ChildContent { get; set; }

private bool IsActive => NavigationManager.ToAbsoluteUri(NavigationManager.Uri)
.AbsolutePath
== Href;
private bool IsActive => NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsolutePath == Href;

}
65 changes: 12 additions & 53 deletions src/Sidekick.Common.Ui/wwwroot/css/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1500,11 +1500,6 @@ video {
margin-bottom: 0px;
}

.my-1 {
margin-top: 0.25rem;
margin-bottom: 0.25rem;
}

.my-2 {
margin-top: 0.5rem;
margin-bottom: 0.5rem;
Expand Down Expand Up @@ -1536,10 +1531,6 @@ video {
margin-bottom: 0.75rem;
}

.mb-4 {
margin-bottom: 1rem;
}

.ml-0 {
margin-left: 0px;
}
Expand All @@ -1564,22 +1555,10 @@ video {
margin-left: auto;
}

.mr-1 {
margin-right: 0.25rem;
}

.mr-2 {
margin-right: 0.5rem;
}

.mr-3 {
margin-right: 0.75rem;
}

.mr-4 {
margin-right: 1rem;
}

.mt-1 {
margin-top: 0.25rem;
}
Expand All @@ -1596,10 +1575,6 @@ video {
margin-top: 1rem;
}

.mt-6 {
margin-top: 1.5rem;
}

.mt-9 {
margin-top: 2.25rem;
}
Expand Down Expand Up @@ -1940,10 +1915,6 @@ video {
flex-grow: 1;
}

.flex-grow-0 {
flex-grow: 0;
}

.grow {
flex-grow: 1;
}
Expand Down Expand Up @@ -3332,10 +3303,6 @@ video {
padding-bottom: 1rem;
}

.pb-0 {
padding-bottom: 0px;
}

.pb-2 {
padding-bottom: 0.5rem;
}
Expand All @@ -3352,10 +3319,6 @@ video {
padding-bottom: 4px;
}

.pl-12 {
padding-left: 3rem;
}

.pl-2 {
padding-left: 0.5rem;
}
Expand All @@ -3372,22 +3335,6 @@ video {
padding-right: 0.5rem;
}

.pr-4 {
padding-right: 1rem;
}

.pt-0 {
padding-top: 0px;
}

.pt-2 {
padding-top: 0.5rem;
}

.pt-4 {
padding-top: 1rem;
}

.pt-\[4px\] {
padding-top: 4px;
}
Expand Down Expand Up @@ -3806,6 +3753,10 @@ video {
-moz-osx-font-smoothing: auto;
}

.caret-transparent {
caret-color: transparent;
}

.opacity-0 {
opacity: 0;
}
Expand Down Expand Up @@ -4304,10 +4255,18 @@ video {
box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);
}

.focus\:ring-inset:focus {
--tw-ring-inset: inset;
}

.focus\:ring-offset-0:focus {
--tw-ring-offset-width: 0px;
}

.focus\:ring-offset-2:focus {
--tw-ring-offset-width: 2px;
}

.focus\:hover\:text-center:hover:focus {
text-align: center;
}
Expand Down
Loading