Skip to content

Commit 969e59b

Browse files
committedMar 11, 2025
systemd: Update "Limited access" Alert to PF6
1 parent ad4a61d commit 969e59b

File tree

2 files changed

+46
-70
lines changed

2 files changed

+46
-70
lines changed
 

‎pkg/systemd/overview.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ class OverviewPage extends React.Component {
153153

154154
return (
155155
<Page className='no-masthead-sidebar'>
156-
<PageSection hasBodyWrapper={false} padding={{ default: 'noPadding' }}>
156+
<PageSection hasBodyWrapper={false} padding={{ default: 'padding' }}>
157157
<SuperuserAlert />
158158
</PageSection>
159159
<PageSection hasBodyWrapper={false} className='ct-overview-header' padding={{ default: 'padding' }}>

‎pkg/systemd/overview.scss

+45-69
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@
55
@import "@patternfly/patternfly/components/Table/table.scss";
66

77
.ct-limited-access-alert {
8-
--pf-v5-c-alert--GridTemplateColumns: auto auto 1fr;
9-
10-
// Set the right padding so that the button aligns with the other alerts in the page on the side
11-
padding-inline-end: var(--pf-v5-c-page__main-section--PaddingRight);
8+
--pf-v6-c-alert--GridTemplateAreas: "icon title action" ". description description";
129

1310
// Deconstruct nicely on small screen sizes (especially mobile)
1411
// This will not be needed in a future PF4 update
@@ -33,10 +30,6 @@
3330
}
3431

3532
.ct-overview-header {
36-
align-items: center;
37-
display: flex;
38-
flex: none;
39-
4033
&,
4134
&-hostname {
4235
flex-wrap: wrap;
@@ -51,11 +44,9 @@
5144
&-hostname {
5245
align-items: baseline;
5346
flex: auto;
54-
/* Collapse down to 15rem, to help preserve button on the right */
55-
flex-basis: 15rem;
5647

5748
> h1 {
58-
font-size: var(--pf-v5-global--FontSize--2xl) !important;
49+
font-size: var(--pf-t--global--font--size--2xl) !important;
5950
}
6051
}
6152

@@ -69,7 +60,7 @@
6960
}
7061

7162
&-subheading {
72-
font-size: var(--pf-v5-global--FontSize--md);
63+
font-size: var(--pf-t--global--font--size--md);
7364
}
7465
}
7566

@@ -199,66 +190,51 @@
199190
/* Embiggen subheading & card headings when there's space */
200191

201192
.pf-v6-l-gallery.ct-system-overview .pf-v6-c-card__title-text {
202-
font-size: var(--pf-v5-global--FontSize--2xl);
193+
font-size: var(--pf-t--global--font--size--2xl);
203194
}
204195

205196
.ct-overview-header-subheading {
206-
font-size: var(--pf-v5-global--FontSize--lg);
197+
font-size: var(--pf-t--global--font--size--lg);
207198
}
208199
}
209200

210-
.pf-v6-c-table tr > * {
211-
vertical-align: top;
212-
}
213-
214-
.ct-inline-list .pf-v6-c-list.pf-m-inline {
215-
display: inline-flex;
216-
margin-inline-start: 1rem;
217-
}
218-
219-
/* Add a subtle dropshadow to the alerts, to separate them from the background, similar to the cards on the page */
220-
.pf-v6-c-page__main-section:not(.ct-overview-header),
221-
.pf-v6-l-gallery {
222-
> .pf-v6-c-alert {
223-
box-shadow: var(--pf-v5-global--BoxShadow--sm);
224-
225-
// Default PF4 blue and background grey are too close in shade
226-
// So: Lighten up the blue to provide a touch more contrast
227-
// (Based on default's light green, but in a blue shade)
228-
&.pf-m-info {
229-
--pf-v5-c-alert--BackgroundColor: #f1f8fe;
230-
}
231-
}
232-
}
233-
234-
#motd-box > .pf-v6-c-alert {
235-
/* Spacing between the MOTD is handled by the .pf-v6-l-gallery grid */
236-
margin-block-end: 0;
237-
}
238-
239-
.pf-v6-c-alert .pf-v6-c-alert__description a {
240-
padding-inline-start: 15px;
241-
}
242-
243-
// Stretch modal content to fill body
244-
// This redirects scrolling from the modal body to the select widget
245-
.ct-m-stretch-body {
246-
// Use flex to let children fully expand to the content
247-
.pf-v6-c-modal-box__body {
248-
&, > :only-child {
249-
// Let children fully stretch to content
250-
display: flex;
251-
}
252-
253-
> :only-child,
254-
.pf-v6-c-menu__content {
255-
// Get squishy with children and the menu content
256-
flex: auto;
257-
}
258-
259-
.pf-v6-c-menu__content {
260-
// Relax the height constraint
261-
--pf-v5-c-menu__content--MaxHeight: 100%;
262-
}
263-
}
264-
}
201+
// .pf-v6-c-table tr > * {
202+
// vertical-align: top;
203+
// }
204+
205+
// .ct-inline-list .pf-v6-c-list.pf-m-inline {
206+
// display: inline-flex;
207+
// margin-inline-start: 1rem;
208+
// }
209+
210+
// #motd-box > .pf-v6-c-alert {
211+
// /* Spacing between the MOTD is handled by the .pf-v6-l-gallery grid */
212+
// margin-block-end: 0;
213+
// }
214+
215+
// .pf-v6-c-alert .pf-v6-c-alert__description a {
216+
// padding-inline-start: 15px;
217+
// }
218+
219+
// // Stretch modal content to fill body
220+
// // This redirects scrolling from the modal body to the select widget
221+
// .ct-m-stretch-body {
222+
// // Use flex to let children fully expand to the content
223+
// .pf-v6-c-modal-box__body {
224+
// &, > :only-child {
225+
// // Let children fully stretch to content
226+
// display: flex;
227+
// }
228+
229+
// > :only-child,
230+
// .pf-v6-c-menu__content {
231+
// // Get squishy with children and the menu content
232+
// flex: auto;
233+
// }
234+
235+
// .pf-v6-c-menu__content {
236+
// // Relax the height constraint
237+
// --pf-v6-c-menu__content--MaxHeight: 100%;
238+
// }
239+
// }
240+
// }

0 commit comments

Comments
 (0)