Skip to content

Limit opacity override to resource select controls #2670

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

Merged
tlmii merged 1 commit into from
Mar 6, 2024
Merged

Limit opacity override to resource select controls #2670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/Aspire.Dashboard/Components/Pages/ConsoleLogs.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<h1 class="page-header">@Loc[nameof(Dashboard.Resources.ConsoleLogs.ConsoleLogsHeader)]</h1>
<FluentToolbar Orientation="Orientation.Horizontal">
<FluentSelect @ref="_resourceSelectComponent"
Class="resource-list"
Items="@_resources"
OptionValue="@(c => c.Id?.InstanceId)"
OptionDisabled="@(c => c.Id?.Type is Otlp.Model.OtlpApplicationType.ReplicaSet)"
Expand Down
1 change: 1 addition & 0 deletions src/Aspire.Dashboard/Components/Pages/Metrics.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<h1 class="page-header">@Loc[nameof(Dashboard.Resources.Metrics.MetricsHeader)]</h1>
<FluentToolbar Orientation="Orientation.Horizontal">
<FluentSelect Items="@_applications"
Class="resource-list"
OptionDisabled="@(c => c.Id?.Type is OtlpApplicationType.ReplicaSet)"
OptionValue="@(c => c.Id?.InstanceId)"
@bind-SelectedOption="PageViewModel.SelectedApplication"
Expand Down
1 change: 1 addition & 0 deletions src/Aspire.Dashboard/Components/Pages/StructuredLogs.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<h1 class="page-header">@Loc[nameof(Dashboard.Resources.StructuredLogs.StructuredLogsHeader)]</h1>
<FluentToolbar Orientation="Orientation.Horizontal">
<FluentSelect Items="@_applicationViewModels"
Class="resource-list"
OptionValue="@(c => c.Id?.InstanceId)"
OptionDisabled="@(c => c.Id?.Type is OtlpApplicationType.ReplicaSet)"
@bind-SelectedOption="PageViewModel.SelectedApplication"
Expand Down
1 change: 1 addition & 0 deletions src/Aspire.Dashboard/Components/Pages/Traces.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<h1 class="page-header">@Loc[nameof(Dashboard.Resources.Traces.TracesHeader)]</h1>
<FluentToolbar Orientation="Orientation.Horizontal">
<FluentSelect Items="@_applicationViewModels"
Class="resource-list"
OptionValue="@(c => c.Id?.InstanceId)"
OptionDisabled="@(c => c.Id?.Type is OtlpApplicationType.ReplicaSet)"
@bind-SelectedOption="_selectedApplication"
Expand Down
14 changes: 10 additions & 4 deletions src/Aspire.Dashboard/wwwroot/css/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ fluent-toolbar[orientation=horizontal] {
--error-counter-badge-foreground-color: var(--neutral-fill-rest);
--kbd-background-color: var(--neutral-layer-4);

/* overrides of default fluentui-blazor styling */
--disabled-opacity: 0.7 !important;

--layout-toolbar-padding: calc(var(--design-unit) * 1.5px);
}

Expand All @@ -66,7 +63,6 @@ fluent-toolbar[orientation=horizontal] {

/* overrides of default fluentui-blazor styling */
--error: #E10B11 !important;
--disabled-opacity: 0.85 !important;

color-scheme: dark;
}
Expand All @@ -75,6 +71,16 @@ fluent-toolbar[orientation=horizontal] {
color-scheme: light;
}

fluent-select.resource-list {
/* overrides of default fluentui-blazor styling */
--disabled-opacity: 0.7;
}

[data-theme="dark"] fluent-select.resource-list {
/* overrides of default fluentui-blazor styling */
--disabled-opacity: 0.85;
}

h1 {
font-size: var(--type-ramp-plus-4-font-size);
line-height: var(--type-ramp-plus-4-line-height);
Expand Down