more fixes

app/components/container/new-edit/template.hbs

@@ -80,7 +80,7 @@
 </div>
 
 <hr class="mt-30 mb-30" />
-
+{{#accordion-list as | al expandFn | }}
   {{#unless isSidekick}}
     {{container/form-scheduling
       isService=isService
@@ -93,6 +93,8 @@
       expandAll=null
       setLabels=(action 'setLabels' 'scheduling')
       setRequestedHost=(action 'setRequestedHostId')
+      expandAll=al.expandAll
+      expandFn=expandFn
     }}
   {{/unless}}
 
@@ -103,8 +105,11 @@
       errors=healthCheckErrors
       expandAll=null
       editing=true
+      expandAll=al.expandAll
+      expandFn=expandFn
   }}
 
+  {{#advanced-section advanced=false}}
         {{container/form-volumes
         isService=isService
         isSidekick=isSidekick
@@ -113,6 +118,8 @@
         stack=stack
         errors=volumeErrors
         volumesToCreate=volumesToCreate
+        expandAll=al.expandAll
+        expandFn=expandFn
       }}
 
       {{#if (and isService (not isSidekick))}}
@@ -121,12 +128,11 @@
           instance=launchConfig
           editing=true
           isUpgrade=isUpgrade
+          expandAll=al.expandAll
+        expandFn=expandFn
         }}
       {{/if}}
 
-{{#advanced-section advanced=false}}
-  {{#accordion-list as | al expandFn | }}
-
       {{container/form-command
           classNames="accordion-wrapper"
           instance=launchConfig
@@ -199,8 +205,8 @@
           expandAll=al.expandAll
           expandFn=expandFn
       }}
-  {{/accordion-list}}
   {{/advanced-section}}
+{{/accordion-list}}
 
 {{top-errors errors=errors}}
 {{save-cancel createLabel=(if isUpgrade 'newContainer.saveUpgrade' 'newContainer.saveNew') save="save" cancel="cancel"}}

app/components/service-row/template.hbs

@@ -72,7 +72,7 @@
       {{#if (and expanded model.canScale)}}
         <div class="btn-group bg-default scale-arrow">
         <button class="btn btn-xs bg-primary" {{action "scaleDown" target=model}} disabled={{not model.canScaleDown}}><i class="icon icon-minus icon-fw"/></button>
-        <button style="margin-left:2px;" class="btn btn-xs bg-primary" {{action "scaleUp" target=model}} disabled={{not model.canScaleUp}}><i class="icon icon-plus icon-fw"/></button>
+        <button style="margin-left:-5px;" class="btn btn-xs bg-primary" {{action "scaleUp" target=model}} disabled={{not model.canScaleUp}}><i class="icon icon-plus icon-fw"/></button>
         </div>
       {{/if}}
     </td>

app/service/template.hbs

@@ -3,7 +3,7 @@
     {{t 'servicePage.header' type=service.displayType name=service.displayName}}
   </h1>
   {{#if (and service.canHaveContainers (not service.isSelector))}}
-    <div class="pull-left mt-5">
+    <div class="pull-left mt-0">
       {{info-multi-stats model=service largeTargetId="largeStats"}}
     </div>
   {{/if}}
@@ -52,7 +52,7 @@
         </span>
         <div class="btn-group btn-group-xs p-0" style="vertical-align: middle;">
           <button class="btn btn-xs bg-primary" {{action "scaleDown" target=service}} disabled={{not service.canScaleDown}}><i class="icon icon-minus icon-fw"/></button>
-          <button style="margin-left:2px;" class="btn btn-xs bg-primary" {{action "scaleUp" target=service}} disabled={{not service.canScaleUp}}><i class="icon icon-plus icon-fw"/></button>
+          <button style="margin-left: -5px;" class="btn btn-xs bg-primary" {{action "scaleUp" target=service}} disabled={{not service.canScaleUp}}><i class="icon icon-plus icon-fw"/></button>
         </div>
       </div>
     {{/if}}

app/styles/components/_badge-state.scss

@@ -33,9 +33,19 @@
     font-size: 1em;
     max-width: 110px;
     font-size: .85em;
+  }
+}
 
+.main-row td {
+  .badge-state {
+    @include tag;
+    text-transform: capitalize;
+
+    // Successful states are de-emphasized by using [text-]color instead of background-color
     &.bg-success {
-      padding: 0px 5px;
+      background-color: lighten($success, 53);
+      color: $success;
+      border: solid lighten($success, 30) 1px;
     }
   }
 }

app/styles/components/_tables.scss

@@ -10,7 +10,7 @@ $table-nested-header   : lighten($mid-grey, 32)!default;
 $table-bg-accent       : darken($light-grey, .5)!default;
 $table-bg-hover        : lighten($info, 15)!default;
 $table-bg-active       : $table-bg-hover!default;
-$table-bg-selected     : lighten($info, 30)!default;
+$table-bg-selected     : lighten($info, 32)!default;
 $table-border-color    : lighten($mid-grey, 30)!default;
 $table-body-separation : 25px;
 $group-row-height      : 50px;
@@ -206,6 +206,14 @@ TABLE {
       background: $body-bg;
     }
 
+    tr.row-selected .btn-group.bg-default {
+      background: darken($bg-default, 7);
+    }
+
+    tr.row-selected .scale-arrow:before {
+      border-bottom-color: darken($bg-default, 7);
+    }
+
     TABLE {
       > TBODY {
         @include striped;