more fixes

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

@@ -80,127 +80,133 @@
 </div>
 
 <hr class="mt-30 mb-30" />
+{{#accordion-list as | al expandFn | }}
+  {{#unless isSidekick}}
+    {{container/form-scheduling
+      isService=isService
+      isGlobal=isGlobal
+      initialHostId=launchConfig.requestedHostId
+      initialLabels=launchConfig.labels
+      service=service
+      errors=schedulingErrors
+      editing=true
+      expandAll=null
+      setLabels=(action 'setLabels' 'scheduling')
+      setRequestedHost=(action 'setRequestedHostId')
+      expandAll=al.expandAll
+      expandFn=expandFn
+    }}
+  {{/unless}}
 
-{{#unless isSidekick}}
+  {{form-healthcheck
-  {{container/form-scheduling
+      classNames="accordion-wrapper"
-    isService=isService
+      isService=isService
-    isGlobal=isGlobal
+      healthCheck=launchConfig.healthCheck
-    initialHostId=launchConfig.requestedHostId
+      errors=healthCheckErrors
-    initialLabels=launchConfig.labels
+      expandAll=null
-    service=service
+      editing=true
-    errors=schedulingErrors
+      expandAll=al.expandAll
-    editing=true
+      expandFn=expandFn
-    expandAll=null
-    setLabels=(action 'setLabels' 'scheduling')
-    setRequestedHost=(action 'setRequestedHostId')
   }}
-{{/unless}}
 
-{{form-healthcheck
+  {{#advanced-section advanced=false}}
-    classNames="accordion-wrapper"
+        {{container/form-volumes
-    isService=isService
-    healthCheck=launchConfig.healthCheck
-    errors=healthCheckErrors
-    expandAll=null
-    editing=true
-}}
-
-{{container/form-volumes
-  isService=isService
-  isSidekick=isSidekick
-  launchConfig=launchConfig
-  service=service
-  stack=stack
-  errors=volumeErrors
-  volumesToCreate=volumesToCreate
-}}
-
-{{#if (and isService (not isSidekick))}}
-  {{container/form-upgrade
-    service=service
-    instance=launchConfig
-    editing=true
-    isUpgrade=isUpgrade
-  }}
-{{/if}}
-
-{{#advanced-section advanced=false}}
-  {{#accordion-list as | al expandFn | }}
-
-    {{container/form-command
-        classNames="accordion-wrapper"
-        instance=launchConfig
-        initialLabels=launchConfig.labels
-        errors=commandErrors
         isService=isService
-        setLabels=(action 'setLabels' 'command')
+        isSidekick=isSidekick
+        launchConfig=launchConfig
+        service=service
+        stack=stack
+        errors=volumeErrors
+        volumesToCreate=volumesToCreate
         expandAll=al.expandAll
         expandFn=expandFn
-    }}
+      }}
 
-    {{form-user-labels
+      {{#if (and isService (not isSidekick))}}
-        classNames="accordion-wrapper"
+        {{container/form-upgrade
-        initialLabels=launchConfig.labels
+          service=service
-        setLabels=(action 'setLabels' 'user')
+          instance=launchConfig
-        expandAll=al.expandAll
+          editing=true
+          isUpgrade=isUpgrade
+          expandAll=al.expandAll
         expandFn=expandFn
-    }}
+        }}
+      {{/if}}
 
-    {{#if isService}}
+      {{container/form-command
-      {{#unless isSidekick}}
+          classNames="accordion-wrapper"
-        {{container/form-service-links
+          instance=launchConfig
-            service=service
+          initialLabels=launchConfig.labels
-            changed=(action 'setServiceLinks')
+          errors=commandErrors
+          isService=isService
+          setLabels=(action 'setLabels' 'command')
+          expandAll=al.expandAll
+          expandFn=expandFn
+      }}
+
+      {{form-user-labels
+          classNames="accordion-wrapper"
+          initialLabels=launchConfig.labels
+          setLabels=(action 'setLabels' 'user')
+          expandAll=al.expandAll
+          expandFn=expandFn
+      }}
+
+      {{#if isService}}
+        {{#unless isSidekick}}
+          {{container/form-service-links
+              service=service
+              changed=(action 'setServiceLinks')
+              expandAll=al.expandAll
+              expandFn=expandFn
+          }}
+        {{/unless}}
+      {{else}}
+        {{container/form-container-links
+            editing=true
+            instance=launchConfig
+            stack=stack
             expandAll=al.expandAll
             expandFn=expandFn
         }}
-      {{/unless}}
+      {{/if}}
-    {{else}}
+
-      {{container/form-container-links
+      {{container/form-networking
           editing=true
           instance=launchConfig
-          stack=stack
+          errors=networkingErrors
+          service=service
+          isService=isService
+          isSidekick=isSidekick
+          initialLabels=launchConfig.labels
+          isUpgrade=isUpgrade
+          setLabels=(action 'setLabels' 'networking')
           expandAll=al.expandAll
           expandFn=expandFn
       }}
-    {{/if}}
 
-    {{container/form-networking
+      {{#if supportsSecrets}}
-        editing=true
+        {{container/form-secrets
-        instance=launchConfig
+            classNames="accordion-wrapper"
-        errors=networkingErrors
+            secrets=launchConfig.secrets
-        service=service
+            errors=secretErrors
-        isService=isService
+            editing=true
-        isSidekick=isSidekick
+            expandAll=al.expandAll
-        initialLabels=launchConfig.labels
+            expandFn=expandFn
-        isUpgrade=isUpgrade
+        }}
-        setLabels=(action 'setLabels' 'networking')
+      {{/if}}
-        expandAll=al.expandAll
-        expandFn=expandFn
-    }}
 
-    {{#if supportsSecrets}}
+      {{container/form-security
-      {{container/form-secrets
+          instance=launchConfig
-          classNames="accordion-wrapper"
+          isService=isService
-          secrets=launchConfig.secrets
+          errors=securityErrors editing=true
-          errors=secretErrors
+          initialLabels=launchConfig.labels
-          editing=true
+          setLabels=(action 'setLabels' 'security')
           expandAll=al.expandAll
           expandFn=expandFn
       }}
-    {{/if}}
+  {{/advanced-section}}
-
+{{/accordion-list}}
-    {{container/form-security
-        instance=launchConfig
-        isService=isService
-        errors=securityErrors editing=true
-        initialLabels=launchConfig.labels
-        setLabels=(action 'setLabels' 'security')
-        expandAll=al.expandAll
-        expandFn=expandFn
-    }}
-  {{/accordion-list}}
-{{/advanced-section}}
 
 {{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;