Skip to content

Commit 293dc0b

Browse files
Merge pull request #128 from NessieCanCode/improve-css-and-branding
Align plugin styling with PatternFly branding
2 parents bd731eb + 98c7bf0 commit 293dc0b

File tree

2 files changed

+30
-25
lines changed

2 files changed

+30
-25
lines changed

src/slurmcostmanager.css

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
body {
2-
font-family: sans-serif;
2+
/* Use Cockpit/PatternFly's default font so the plugin matches the host UI */
3+
font-family: var(--pf-global--FontFamily--sans-serif);
34
margin: 0;
45
padding: 0;
56
}
67

78
nav {
8-
background: #333;
9+
background: var(--pf-global--BackgroundColor--dark-200);
910
padding: 0.5em;
1011
display: flex;
1112
flex-wrap: wrap;
@@ -14,15 +15,15 @@ nav {
1415
nav button {
1516
margin-right: 0.5em;
1617
padding: 0.5em 1em;
17-
color: #fff;
18-
background: #555;
18+
color: var(--pf-global--palette--white);
19+
background: var(--pf-global--palette--black-700);
1920
border: none;
20-
border-radius: 3px;
21+
border-radius: var(--pf-global--BorderRadius--sm);
2122
cursor: pointer;
2223
}
2324

2425
nav button:hover {
25-
background: #777;
26+
background: var(--pf-global--palette--black-600);
2627
}
2728

2829
.app {
@@ -50,7 +51,7 @@ nav button:hover {
5051
.details-table td,
5152
.summary-table th,
5253
.summary-table td {
53-
border: 1px solid #ccc;
54+
border: 1px solid var(--pf-global--BorderColor--100);
5455
padding: 0.25em 0.5em;
5556
}
5657

@@ -62,7 +63,7 @@ nav button:hover {
6263
.link-btn {
6364
background: none;
6465
border: none;
65-
color: #0066cc;
66+
color: var(--pf-global--primary-color--100);
6667
cursor: pointer;
6768
text-decoration: underline;
6869
padding: 0;
@@ -71,17 +72,17 @@ nav button:hover {
7172
.invoice-frame {
7273
width: 100%;
7374
height: 60vh;
74-
border: 1px solid #ccc;
75+
border: 1px solid var(--pf-global--BorderColor--100);
7576
margin-top: 1em;
7677
}
7778

7879
.error {
79-
color: red;
80+
color: var(--pf-global--danger-color--100);
8081
}
8182

8283
.error-details {
83-
border: 1px solid #ccc;
84-
background: #fdd;
84+
border: 1px solid var(--pf-global--BorderColor--100);
85+
background: var(--pf-global--palette--red-50);
8586
padding: 0.5em;
8687
white-space: pre-wrap;
8788
margin-top: 0.5em;
@@ -99,7 +100,7 @@ nav button:hover {
99100

100101
.users-table th,
101102
.users-table td {
102-
border: 1px solid #ccc;
103+
border: 1px solid var(--pf-global--BorderColor--100);
103104
padding: 0.25em 0.5em;
104105
}
105106

@@ -111,7 +112,7 @@ nav button:hover {
111112

112113
.jobs-table th,
113114
.jobs-table td {
114-
border: 1px solid #ccc;
115+
border: 1px solid var(--pf-global--BorderColor--100);
115116
padding: 0.25em 0.5em;
116117
}
117118

@@ -127,7 +128,7 @@ nav button:hover {
127128

128129
.rates-table th,
129130
.rates-table td {
130-
border: 1px solid #ccc;
131+
border: 1px solid var(--pf-global--BorderColor--100);
131132
padding: 0.25em 0.5em;
132133
}
133134

@@ -153,12 +154,12 @@ nav button:hover {
153154
}
154155

155156
.collapsible-panel {
156-
border: 1px solid #ccc;
157+
border: 1px solid var(--pf-global--BorderColor--100);
157158
margin-top: 1em;
158159
}
159160

160161
.collapsible-header {
161-
background: #f5f5f5;
162+
background: var(--pf-global--BackgroundColor--light-200);
162163
padding: 0.5em;
163164
cursor: pointer;
164165
display: flex;
@@ -173,20 +174,20 @@ nav button:hover {
173174
.save-cancel-bar {
174175
position: sticky;
175176
bottom: 0;
176-
background: #fff;
177+
background: var(--pf-global--BackgroundColor--100);
177178
padding: 0.5em;
178-
border-top: 1px solid #ccc;
179+
border-top: 1px solid var(--pf-global--BorderColor--100);
179180
text-align: right;
180181
}
181182

182183
.required {
183-
color: red;
184+
color: var(--pf-global--danger-color--100);
184185
margin-left: 0.25em;
185186
}
186187

187188
.help-icon {
188189
cursor: help;
189-
color: #555;
190+
color: var(--pf-global--palette--black-600);
190191
margin-left: 0.25em;
191192
}
192193

@@ -203,9 +204,9 @@ nav button:hover {
203204
margin-bottom: 1em;
204205
}
205206
.kpi-tile {
206-
background: #f5f5f5;
207-
border: 1px solid #ccc;
208-
border-radius: 4px;
207+
background: var(--pf-global--BackgroundColor--light-200);
208+
border: 1px solid var(--pf-global--BorderColor--100);
209+
border-radius: var(--pf-global--BorderRadius--sm);
209210
padding: 1em;
210211
flex: 0 0 200px;
211212
position: relative;
@@ -215,7 +216,7 @@ nav button:hover {
215216
}
216217
.kpi-label {
217218
font-size: 0.9em;
218-
color: #555;
219+
color: var(--pf-global--palette--black-600);
219220
}
220221
.kpi-value {
221222
font-size: 2em;

src/slurmcostmanager.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
<meta charset="UTF-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
66
<title>SlurmCostManager</title>
7+
<!-- Load Cockpit and PatternFly styles so that the plugin inherits
8+
the host branding and the standard PatternFly components. -->
9+
<link rel="stylesheet" href="../base1/patternfly.css" />
10+
<link rel="stylesheet" href="../base1/cockpit.css" />
711
<link rel="stylesheet" href="slurmcostmanager.css" />
812
</head>
913
<body>

0 commit comments

Comments
 (0)