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

Drop old pf overrides 🧹 #20982

Merged
merged 3 commits into from
Sep 10, 2024
Merged

Drop old pf overrides 🧹 #20982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
740a5c0
systemd: drop old line-height unset
jelly Sep 5, 2024
d2bde9d
test: drop workaround for duplicate modal ids
jelly Sep 5, 2024
19c1766
lib: drop override for wrongly colored select in dark theme
jelly Sep 5, 2024
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
7 changes: 0 additions & 7 deletions pkg/lib/patternfly/patternfly-5-overrides.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,6 @@ select.pf-v5-c-form-control {
}
}

// Workaround the transparent background for HTML select options
// https://github.com/patternfly/patternfly/issues/5695
.pf-v5-c-form-control option {
background-color: var(--pf-v5-c-form-control--BackgroundColor);
color: var(--pf-v5-c-form-control--Color);
}

garrett marked this conversation as resolved.
Show resolved Hide resolved
// Fix the double-spacing issue in the non-deprecated split buttons
// https://github.com/patternfly/patternfly/issues/6632
.pf-m-split-button .pf-v5-c-menu-toggle__controls {
Expand Down
6 changes: 0 additions & 6 deletions pkg/systemd/overview.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@
// Set the right padding so that the button aligns with the other alerts in the page on the side
padding-inline-end: var(--pf-v5-c-page__main-section--PaddingRight);

// Fix vertical alignment
// Unset the H4 line-height (as PF3/Bootstrap/etc. sets it; PF4 doesn't)
> .pf-v5-c-alert__title {
line-height: unset;
}

garrett marked this conversation as resolved.
Show resolved Hide resolved
// Deconstruct nicely on small screen sizes (especially mobile)
// This will not be needed in a future PF4 update
//
Expand Down
10 changes: 3 additions & 7 deletions test/verify/check-metrics
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ class TestHistoryMetrics(testlib.MachineCase):
super().setUp()
# start with a clean slate and avoid running into restart limits
self.machine.execute("systemctl stop pmlogger pmproxy; systemctl reset-failed pmlogger pmproxy 2>/dev/null || true")
# HACK: PF modal can have multiple id's in certain scenario's https://github.com/patternfly/patternfly-react/issues/9399
self.pcp_dialog_selector = "#pcp-settings-modal:first-child"
self.pcp_dialog_selector = "#pcp-settings-modal"

def waitStream(self, current_max):
# should only have at most <current_max> valid minutes, the rest should be empty
Expand Down Expand Up @@ -1249,8 +1248,7 @@ BEGIN {{

@testlib.skipImage("TODO: Arch Linux packagekit support", "arch")
class TestMetricsPackages(packagelib.PackageCase):
# HACK: PF modal can have multiple id's in certain scenario's https://github.com/patternfly/patternfly-react/issues/9399
pcp_dialog_selector = "#pcp-settings-modal:first-child"
pcp_dialog_selector = "#pcp-settings-modal"

def testBasic(self):
b = self.browser
Expand Down Expand Up @@ -1441,9 +1439,7 @@ class TestGrafanaClient(testlib.MachineCase):
m = self.machine
b = self.browser
mg = self.machines['services']

# HACK: PF modal can have multiple id's in certain scenario's https://github.com/patternfly/patternfly-react/issues/9399
pcp_dialog_selector = "#pcp-settings-modal:first-child"
pcp_dialog_selector = "#pcp-settings-modal"

# avoid dynamic host name changes during PCP data collection, and start from clean slate
m.execute("""systemctl stop pmlogger || true
Expand Down