MAAS

Merge ~ya-bo-ng/maas:networking-space-masked into maas:master

  1. Git
  2. lp:~ya-bo-ng/maas
  3. networking-space-masked
  4. Merge into master
Proposed by Anthony Dillon
Status: Merged
Approved by: Anthony Dillon
Approved revision: 949ed0875c38162bd8f70904963359a792cd2546
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~ya-bo-ng/maas:networking-space-masked
Merge into: maas:master
Diff against target: 184 lines (+51/-34)
4 files modified
src/maasserver/static/partials/pod-details.html (+22/-25)
src/maasserver/static/scss/_base_forms.scss (+7/-0)
src/maasserver/static/scss/_base_tables.scss (+16/-7)
src/maasserver/static/scss/_tables.scss (+6/-2)
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
MAAS Lander Approve
Lilyana Videnova (community) Approve
Review via email: mp+360167@code.launchpad.net

Commit message

LP: #1806686 - Pods networking configuration: fix "space" selector

Description of the change

Added some select table styling to make them uniform thought-out the application.

Screenshot: https://drive.google.com/file/d/1uiqgMt8rvhmoC2PU2ZqaK_FYCRM-vpHf/view

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b networking-space-masked lp:~ya-bo-ng/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 7febc26496f04d4b6bb237c744f38c57678fc3de

review: Approve
~ya-bo-ng/maas:networking-space-masked updated
73e1e71... by Anthony Dillon

Align the table elements

Revision history for this message
Martin Storey (cassiocassio) wrote :

Update the tour screenshot when these tweaks are done ? Non-urgent.

~ya-bo-ng/maas:networking-space-masked updated
16d953a... by Anthony Dillon

Revert CSS

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b networking-space-masked lp:~ya-bo-ng/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 73e1e71397f009b53585f9e4b2a63c5482b99124

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b networking-space-masked lp:~ya-bo-ng/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 16d953a39f6c4773de7e65b4e4ddc42d538b0af0

review: Approve
~ya-bo-ng/maas:networking-space-masked updated
f1119e9... by Anthony Dillon

Fix small alignment in tables

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b networking-space-masked lp:~ya-bo-ng/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/4616/console
COMMIT: f1119e9e6058c8d5152b6470a7b340c7fc150537

review: Needs Fixing
Revision history for this message
Lilyana Videnova (lilyanavidenova) wrote :

LGTM, thanks Ant! :)

review: Approve
~ya-bo-ng/maas:networking-space-masked updated
949ed08... by Anthony Dillon

Whitespace to kick off the Lander

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b networking-space-masked lp:~ya-bo-ng/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 949ed0875c38162bd8f70904963359a792cd2546

review: Approve
Revision history for this message
Andres Rodriguez (andreserl) wrote :

lgtm!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/src/maasserver/static/partials/pod-details.html b/src/maasserver/static/partials/pod-details.html
index f2fedcc..a9396be 100644
--- a/src/maasserver/static/partials/pod-details.html
+++ b/src/maasserver/static/partials/pod-details.html
@@ -139,7 +139,7 @@
139 </div>139 </div>
140 </div>140 </div>
141 </td>141 </td>
142 <td class="u-vertically-center">142 <td class="p-table--action-cell">
143 <div data-ng-if="iface.name !== 'default'">143 <div data-ng-if="iface.name !== 'default'">
144 <div data-ng-if="spaces.length == 0">144 <div data-ng-if="spaces.length == 0">
145 (undefined)145 (undefined)
@@ -155,7 +155,7 @@
155 </select>155 </select>
156 </div>156 </div>
157 </td>157 </td>
158 <td style="overflow: visible">158 <td class="p-table--action-cell">
159 <div data-ng-if="iface.name !== 'default'" class="form__group-input">159 <div data-ng-if="iface.name !== 'default'" class="form__group-input">
160 <div class="form__group-input">160 <div class="form__group-input">
161 <div class="p-option-selector" tabindex="0"161 <div class="p-option-selector" tabindex="0"
@@ -240,36 +240,32 @@
240 </div>240 </div>
241 </td>241 </td>
242 <td>242 <td>
243 <div data-ng-if="iface.name !== 'default'">243 <p class="u-min-margin--bottom" data-ng-if="iface.name !== 'default'">
244 {$ iface.fabric.name $}244 {$ iface.fabric.name $}
245 </div>245 </p>
246 </td>246 </td>
247 <td>247 <td>
248 <div data-ng-if="iface.name !== 'default'">248 <p class="u-min-margin--bottom" ng-switch on="iface.vlan.vid" data-ng-if="iface.name !== 'default'">
249 <div ng-switch on="iface.vlan.vid">249 <span ng-switch-when="0">untagged</span>
250 <div ng-switch-when="0">untagged</div>250 <span ng-switch-default>
251 <div ng-switch-default>251 <span>{$ iface.vlan.vid $}</span>
252 <span>{$ iface.vlan.vid $}</span>252 <span data-ng-if="iface.vlan.name">({$ iface.vlan.name $})</span>
253 <span data-ng-if="iface.vlan.name">({$ iface.vlan.name $})</span>253 </span>
254 </div>254 </p>
255 </div>
256 </div>
257 </td>255 </td>
258 <td class="u-vertically-center">256 <td>
259 <div data-ng-if="iface.name !== 'default'">257 <p class="u-min-margin--bottom" data-ng-if="iface.name !== 'default'" ng-switch on="iface.pxe">
260 <div ng-switch on="iface.pxe">258 <span ng-switch-when="true">
261 <div ng-switch-when="true">259 <i class="p-icon--success"></i>
262 <i class="p-icon--success"></i>260 </span>
263 </div>261 <span ng-switch-when="false">
264 <div ng-switch-when="false">262 <i class="p-icon--error"></i>
265 <i class="p-icon--error"></i>263 </span>
266 </div>264 </p>
267 </div>
268 </div>
269 </td>265 </td>
270 </tr>266 </tr>
271 <tr data-ng-show="availableSubnets.length > 0">267 <tr data-ng-show="availableSubnets.length > 0">
272 <td colspan="7">268 <td colspan="8">
273 <button class="p-button--base u-td-outdent-focusable--left p-button--narrow" data-ng-click="composeAddInterface()">269 <button class="p-button--base u-td-outdent-focusable--left p-button--narrow" data-ng-click="composeAddInterface()">
274 <i class="p-icon--plus"></i>270 <i class="p-icon--plus"></i>
275 <span class="u-off-screen">Add another interface</span>271 <span class="u-off-screen">Add another interface</span>
@@ -279,6 +275,7 @@
279 </tr>275 </tr>
280 </tbody>276 </tbody>
281 </table>277 </table>
278
282 </div>279 </div>
283 </div>280 </div>
284 </div>281 </div>
diff --git a/src/maasserver/static/scss/_base_forms.scss b/src/maasserver/static/scss/_base_forms.scss
index 96aba6d..9b1b0d7 100644
--- a/src/maasserver/static/scss/_base_forms.scss
+++ b/src/maasserver/static/scss/_base_forms.scss
@@ -30,7 +30,10 @@
30 margin-bottom: $spv-inter--scaleable + $sp-unit - $spv-nudge * 2;30 margin-bottom: $spv-inter--scaleable + $sp-unit - $spv-nudge * 2;
31 padding-bottom: $spv-nudge - $px;31 padding-bottom: $spv-nudge - $px;
32 padding-top: $spv-nudge - $px;32 padding-top: $spv-nudge - $px;
33 min-height: 2.3rem;
34 min-width: auto;
33 }35 }
36
34 .is-small & {37 .is-small & {
35 margin-bottom: $spv-nudge-compensation;38 margin-bottom: $spv-nudge-compensation;
36 padding-bottom: $spv-nudge - $sp-unit * .5 - $px;39 padding-bottom: $spv-nudge - $sp-unit * .5 - $px;
@@ -42,6 +45,10 @@
42 }45 }
43 }46 }
4447
48 p.u-min-margin--bottom {
49 margin-bottom: map-get($sp-after, default-text) - map-get($nudges, nudge--p);
50 }
51
45 // fix checkbox so it doesn't get misaligned when next to a label with a different padding-top than the default label52 // fix checkbox so it doesn't get misaligned when next to a label with a different padding-top than the default label
46 input[type="checkbox"] {53 input[type="checkbox"] {
47 & + label {54 & + label {
diff --git a/src/maasserver/static/scss/_base_tables.scss b/src/maasserver/static/scss/_base_tables.scss
index 3371b10..155d4d3 100644
--- a/src/maasserver/static/scss/_base_tables.scss
+++ b/src/maasserver/static/scss/_base_tables.scss
@@ -1,4 +1,14 @@
1@mixin maas-tables {1@mixin maas-tables {
2
3 %ellipse-text {
4 @media (min-width: $breakpoint-small) {
5 text-overflow: ellipsis;
6 overflow-x: hidden;
7 overflow-y: visible;
8 white-space: nowrap;
9 }
10 }
11
2 table {12 table {
3 overflow-x: visible;13 overflow-x: visible;
4 input[type="radio"],14 input[type="radio"],
@@ -25,17 +35,12 @@
2535
26 th,36 th,
27 td {37 td {
38 @extend %ellipse-text;
28 display: table-cell !important;39 display: table-cell !important;
29 flex-basis: auto !important;40 flex-basis: auto !important;
30 flex-grow: 0;41 flex-grow: 0;
31 vertical-align: top;42 vertical-align: top;
3243 padding-bottom: 0.05rem;
33 @media (min-width: $breakpoint-small) {
34 text-overflow: ellipsis;
35 overflow-x: hidden;
36 overflow-y: visible;
37 white-space: nowrap;
38 }
3944
40 &:first-of-type {45 &:first-of-type {
41 padding-left: $sph-intra--condensed;46 padding-left: $sph-intra--condensed;
@@ -45,6 +50,10 @@
45 padding-right: $sph-intra--condensed;50 padding-right: $sph-intra--condensed;
46 }51 }
47 }52 }
53
54 p {
55 @extend %ellipse-text;
56 }
48 }57 }
4958
50 tr {59 tr {
diff --git a/src/maasserver/static/scss/_tables.scss b/src/maasserver/static/scss/_tables.scss
index ea3174d..bcdfbc6 100644
--- a/src/maasserver/static/scss/_tables.scss
+++ b/src/maasserver/static/scss/_tables.scss
@@ -174,11 +174,15 @@
174 }174 }
175175
176 &:nth-child(6) {176 &:nth-child(6) {
177 width: 17%;177 width: 10%;
178 }178 }
179179
180 &:nth-child(7) {180 &:nth-child(7) {
181 width: 10%;181 width: 12%;
182 }
183
184 &:nth-child(8) {
185 width: 5%;
182 }186 }
183 }187 }
184 }188 }

Subscribers

People subscribed via source and target branches