cherry pick 1b3b771ca0

app/styles/components/_page-header.scss

@@ -148,7 +148,7 @@ $nav-spacing: 4px;
     .user-auth {
       line-height: initial;
       padding: 10px 20px 10px 10px;
-      background: lighten($accent-two, 20);
+      background: $accent;
     }
   }
 

app/styles/layout/_layout.scss

@@ -46,8 +46,8 @@ MAIN {
 
   > h4 {
     border-bottom: solid 2px darken($border, 5%);
-    margin-bottom: 10px;
-    padding-bottom: 5px;
+    margin-bottom: 20px;
+    padding-bottom: 15px;
     text-transform: capitalize;
   }
 

lib/global-admin/addon/clusters/new/rke/controller.js

@@ -30,6 +30,12 @@ const headersAll = [
     translationKey: 'generic.name',
     scope: 'embedded',
   },
+  {
+    name: 'all',
+    sort: false,
+    searchField: null,
+    translationKey: 'clustersPage.addPage.rke.new.headers.labels.all',
+  },
   {
     name: 'etcd',
     sort: false,
@@ -49,12 +55,6 @@ const headersAll = [
     translationKey: 'clustersPage.addPage.rke.new.headers.labels.worker',
     scope: 'embedded',
   },
-  {
-    name: 'all',
-    sort: false,
-    searchField: null,
-    translationKey: 'clustersPage.addPage.rke.new.headers.labels.all',
-  },
 ];
 
 const workerHeaders = headersAll.filter((x) => x.scope === 'embedded');

lib/global-admin/addon/clusters/new/rke/template.hbs

@@ -51,6 +51,11 @@
           <td data-title="{{dt.name}}">
             {{host.displayName}}
           </td>
+          {{#if (eq scope "dedicated")}}
+            <td data-title="{{dt.all}}">
+              {{input type="checkbox" checked=(array-includes host.role 'worker' 'controlplane' 'etcd') change=(action 'selectAllRoles' host)}}
+            </td>
+          {{/if}}
           {{#if (eq scope "dedicated")}}
             <td data-title="{{dt.etcd}}">
               {{!-- disabled=(not-eq host.state "active") --}}
@@ -65,11 +70,7 @@
             {{!-- disabled=(not-eq host.state "active") --}}
             {{input type="checkbox" checked=(array-includes host.role 'worker') change=(action 'addRole' host 'worker')}}
           </td>
-          {{#if (eq scope "dedicated")}}
-            <td data-title="{{dt.all}}">
-              {{input type="checkbox" checked=(array-includes host.role 'worker' 'controlplane' 'etcd') change=(action 'selectAllRoles' host)}}
-            </td>
-          {{/if}}
+
         </tr>
       {{else if (eq kind "nomatch")}}
         <tr><td colspan="{{sortable.fullColspan}}" class="text-center text-muted lacsso pt-20 pb-20">{{t 'nodesPage.table.noMatch'}}</td></tr>

lib/shared/addon/components/form-name-description/template.hbs

@@ -1,7 +1,7 @@
 <div class="{{rowClass}}">
   <div class="{{if (or hasBlock descriptionExpanded) bothColClass colClass}}">
 
-      <label for="{{concat elementId '-form-name'}}" class="pb-5 acc-label">{{t nameLabel}}{{#if nameRequired}}{{field-required}}{{/if}}</label>
+      <label for="{{concat elementId '-form-name'}}" class="pb-5">{{t nameLabel}}{{#if nameRequired}}{{field-required}}{{/if}}</label>
       {{#if (and descriptionShown (not descriptionExpanded))}}
         <div class="pull-right text-small">
           <a role="button" class="btn bg-transparent p-0" {{action "expandDescription"}}>{{t expandDescriptionAction}}</a>
@@ -20,10 +20,10 @@
   {{#if (and descriptionShown descriptionExpanded)}}
     <div class="{{if (or hasBlock descriptionExpanded) bothColClass colClass}}">
       <div>
-        <label for="{{concat elementId '-form-description'}}" class="pb-5 acc-label desc-label">{{t descriptionLabel}}{{#if descriptionRequired}}{{field-required}}{{/if}}</label>
+        <label for="{{concat elementId '-form-description'}}" class="pb-5 desc-label">{{t descriptionLabel}}{{#if descriptionRequired}}{{field-required}}{{/if}}</label>
       </div>
       {{textarea-autogrow id=(concat elementId '-form-description') value=_description classNames="form-control no-resize description" rows="1" placeholder=descriptionPlaceholder disabled=descriptionDisabled}}
       {{#if descriptionHelp}}<p class="text-info">{{t descriptionHelp}}</p>{{/if}}
     </div>
   {{/if}}
-</div>
+</div>

lib/shared/addon/components/modal-add-cluster/template.hbs

@@ -6,7 +6,7 @@
   }}
   <div class="footer-actions">
     <button {{action 'add'}} class="btn bg-primary">{{t 'generic.save'}}</button>
-    <button {{action "cancel"}} class="btn bg-primary">{{t 'generic.cancel'}}</button>
+    <button {{action "cancel"}} class="btn {{cancelColor}}">{{t 'generic.cancel'}}</button>
   </div>
 {{else if (eq mode 'launch')}}
   {{cloud-host-add-or-edit