From d0477622179a90bbf39f43d554cc8be5d920b641 Mon Sep 17 00:00:00 2001
From: lvuch <laurenvuchetich@gmail.com>
Date: Mon, 6 Feb 2017 13:22:10 -0700
Subject: [PATCH] lacsso polish

---
 app/admin-tab/accounts/new/template.hbs       |  2 +-
 app/admin-tab/auth/azuread/template.hbs       |  6 +--
 app/admin-tab/auth/github/template.hbs        |  2 +-
 app/admin-tab/auth/localauth/template.hbs     |  6 +--
 app/components/api-field/template.hbs         |  2 +-
 app/components/edit-account/template.hbs      |  2 +-
 app/components/edit-apikey/template.hbs       |  2 +-
 app/components/edit-host/template.hbs         |  6 +--
 app/components/edit-stack/template.hbs        |  2 +-
 .../form-balancer-rules/template.hbs          |  2 +-
 .../form-name-description/template.hbs        |  4 +-
 app/components/form-networking/template.hbs   |  2 +-
 app/components/form-ports/template.hbs        |  2 +-
 app/components/form-secrets/template.hbs      |  2 +-
 app/components/form-security/template.hbs     |  2 +-
 .../form-ssl-termination/template.hbs         |  2 +-
 app/components/form-targets/template.hbs      |  4 +-
 app/components/host-settings/template.hbs     |  2 +-
 .../machine/driver-amazonec2/template.hbs     |  6 +--
 .../machine/driver-azure/template.hbs         |  2 +-
 .../machine/driver-digitalocean/template.hbs  |  2 +-
 .../machine/driver-exoscale/template.hbs      |  4 +-
 .../machine/driver-packet/template.hbs        |  2 +-
 .../machine/driver-rackspace/template.hbs     |  2 +-
 .../machine/driver-ubiquity/template.hbs      |  2 +-
 .../modal-container-stop/template.hbs         |  2 +-
 app/components/modal-edit-driver/template.hbs |  6 +--
 .../modal-edit-setting/template.hbs           |  2 +-
 app/components/new-catalog/template.hbs       |  4 +-
 app/components/page-header/template.hbs       |  2 +-
 .../settings/catalog-url/template.hbs         |  6 +--
 .../settings/danger-zone/template.hbs         |  2 +-
 .../settings/host-registration/template.hbs   |  2 +-
 app/components/site-access/template.hbs       |  2 +-
 app/components/view-edit-project/template.hbs |  2 +-
 app/registries/new/template.hbs               |  2 +-
 app/stacks/new/template.hbs                   |  2 +-
 app/styles/components/_page-header.scss       | 29 ++++++++++---
 app/styles/lacsso/base/_helpers.scss          |  8 ++++
 app/styles/lacsso/base/_typography.scss       |  4 +-
 app/styles/lacsso/components/_forms.scss      | 42 +++++++++++++------
 app/styles/lacsso/components/_nav.scss        |  6 +--
 app/styles/totrash/base/_rancher.scss         |  7 +++-
 app/templates/ldap-config.hbs                 | 14 +++----
 public/assets/images/dropdown-arrow.svg       |  9 ++++
 45 files changed, 141 insertions(+), 84 deletions(-)
 create mode 100644 public/assets/images/dropdown-arrow.svg

diff --git a/app/admin-tab/accounts/new/template.hbs b/app/admin-tab/accounts/new/template.hbs
index 25ce6e65d..714a87a7b 100644
--- a/app/admin-tab/accounts/new/template.hbs
+++ b/app/admin-tab/accounts/new/template.hbs
@@ -18,7 +18,7 @@
     </div>
     <div class="col span-7">
       {{schema/input-password value=model.credential.secretValue}}
-      <div class="help-block">{{validateDescription}}</div>
+      <div class="text-info">{{validateDescription}}</div>
     </div>
   </div>
 
diff --git a/app/admin-tab/auth/azuread/template.hbs b/app/admin-tab/auth/azuread/template.hbs
index 491bb704c..14303898e 100644
--- a/app/admin-tab/auth/azuread/template.hbs
+++ b/app/admin-tab/auth/azuread/template.hbs
@@ -41,7 +41,7 @@
         <div class="form-group">
           <label>{{t 'authPage.azuread.configure.tenantId.label'}}*</label>
           {{input type="text" value=model.tenantId placeholder=(t 'authPage.azuread.configure.tenantId.placeholder') classNames="form-control"}}
-          <p class="help-block">{{t 'authPage.azuread.configure.tenantId.help'}}</p>
+          <p class="text-info">{{t 'authPage.azuread.configure.tenantId.help'}}</p>
         </div>
       </div>
       <div class="col span-4">
@@ -63,7 +63,7 @@
         <div class="form-group">
           <label>{{t 'authPage.azuread.configure.adminAccountUsername.label'}}*</label>
           {{input type="text" value=model.adminAccountUsername placeholder=(t 'authPage.azuread.configure.adminAccountUsername.placeholder') classNames="form-control"}}
-          <p class="help-block">{{t 'authPage.azuread.configure.adminAccountUsername.help'}}</p>
+          <p class="text-info">{{t 'authPage.azuread.configure.adminAccountUsername.help'}}</p>
         </div>
       </div>
       <div class="col span-6">
@@ -78,7 +78,7 @@
   <section class="well">
     <h3>{{t 'authPage.azuread.test.header'}}</h3>
     <hr/>
-    <p class="help-block">{{t 'authPage.azuread.test.help'}}</p>
+    <p class="text-info">{{t 'authPage.azuread.test.help'}}</p>
     {{top-errors errors=errors}}
 
     <div class="row">
diff --git a/app/admin-tab/auth/github/template.hbs b/app/admin-tab/auth/github/template.hbs
index 80fe626a8..699aa965a 100644
--- a/app/admin-tab/auth/github/template.hbs
+++ b/app/admin-tab/auth/github/template.hbs
@@ -22,7 +22,7 @@
       <div><b>{{t 'authPage.github.authenticated.header.enterpriseHostName'}} </b> <span class="text-muted">{{githubConfig.hostname}}</span></div>
     {{/if}}
     <div><b>{{t 'authPage.github.authenticated.header.clientId.text'}} </b> <span class="text-muted">{{githubConfig.clientId}}</span></div>
-    <p class="help-block">{{t 'authPage.github.authenticated.header.clientId.helpText'}}</p>
+    <p class="text-info">{{t 'authPage.github.authenticated.header.clientId.helpText'}}</p>
   </section>
 
   {{site-access
diff --git a/app/admin-tab/auth/localauth/template.hbs b/app/admin-tab/auth/localauth/template.hbs
index 55969c25b..358c0ce08 100644
--- a/app/admin-tab/auth/localauth/template.hbs
+++ b/app/admin-tab/auth/localauth/template.hbs
@@ -34,7 +34,7 @@
   <section class="well">
     <h3>{{t 'authPage.localAuth.accessDisabled.header'}}</h3>
     <hr/>
-    <p class="help-block">{{t 'authPage.localAuth.accessDisabled.helpText' appName=settings.appName}}</p>
+    <p class="text-info">{{t 'authPage.localAuth.accessDisabled.helpText' appName=settings.appName}}</p>
     <div class="row">
       <div class="col span-6">
         <div class="form-group">
@@ -54,7 +54,7 @@
         <div class="form-group">
           <label>{{t 'authPage.localAuth.accessDisabled.form.password.labelText'}}*</label>
           {{input type="password" value=adminSecretValue classNames="form-control"}}
-          <div class="help-block">{{validateDescription}}</div>
+          <div class="text-info">{{validateDescription}}</div>
         </div>
       </div>
       <div class="col span-6">
@@ -69,7 +69,7 @@
   <section class="well">
     <h3>{{t 'authPage.localAuth.accessControl.header'}}</h3>
     <hr/>
-    <p class="help-block">{{t 'authPage.localAuth.accessControl.helpText'}}</p>
+    <p class="text-info">{{t 'authPage.localAuth.accessControl.helpText'}}</p>
     {{top-errors errors=errors}}
 
     <button disabled={{createDisabled}} class="btn bg-primary" style="display: block;" {{action "test"}}>
diff --git a/app/components/api-field/template.hbs b/app/components/api-field/template.hbs
index ff59f26e4..90ff55fe0 100644
--- a/app/components/api-field/template.hbs
+++ b/app/components/api-field/template.hbs
@@ -13,5 +13,5 @@
   {{/if}}
 </div>
 <div class="col span-4">
-  <p class="form-control-static help-block">{{fieldDef.description}}</p>
+  <p class="form-control-static text-info">{{fieldDef.description}}</p>
 </div>
diff --git a/app/components/edit-account/template.hbs b/app/components/edit-account/template.hbs
index 0c1b741a7..88f8720a5 100644
--- a/app/components/edit-account/template.hbs
+++ b/app/components/edit-account/template.hbs
@@ -73,7 +73,7 @@
       </div>
       <div class="col span-7">
         {{schema/input-password value=newPassword generated="generated"}}
-        <div class="help-block">{{validateDescription}}</div>
+        <div class="text-info">{{validateDescription}}</div>
       </div>
     </div>
 
diff --git a/app/components/edit-apikey/template.hbs b/app/components/edit-apikey/template.hbs
index 38ded1637..e06396dfe 100644
--- a/app/components/edit-apikey/template.hbs
+++ b/app/components/edit-apikey/template.hbs
@@ -41,7 +41,7 @@
     {{#unless editing}}
       <div class="row">
         <div class="">
-          <p class="help-block">{{t 'editApiKey.noteOptional'}}</p>
+          <p class="text-info">{{t 'editApiKey.noteOptional'}}</p>
         </div>
       </div>
     {{/unless}}
diff --git a/app/components/edit-host/template.hbs b/app/components/edit-host/template.hbs
index 08e3a81d9..54cfe06bc 100644
--- a/app/components/edit-host/template.hbs
+++ b/app/components/edit-host/template.hbs
@@ -8,7 +8,7 @@
     </div>
     <div class="col span-8">
       {{model.hostname}}
-      <p class="help-block">{{t 'editHost.hostname.help'}}</p>
+      <p class="text-info">{{t 'editHost.hostname.help'}}</p>
     </div>
   </div>
 
@@ -18,7 +18,7 @@
     </div>
     <div class="col span-8">
       {{input type="text" value=primaryResource.name classNames="form-control" placeholder=(t 'editHost.customName.placeholder')}}
-      <p class="help-block">{{t 'editHost.customName.help'}}</p>
+      <p class="text-info">{{t 'editHost.customName.help'}}</p>
     </div>
   </div>
 
@@ -57,7 +57,7 @@
         valueLabel="editHost.ips.valueLabel"
         valuePlaceholder="editHost.ips.valuePlaceholder"
       }}
-      <p class="help-block">{{t 'editHost.ips.help'}}</p>
+      <p class="text-info">{{t 'editHost.ips.help'}}</p>
     </div>
   </div>
 </section>
diff --git a/app/components/edit-stack/template.hbs b/app/components/edit-stack/template.hbs
index 48eb20dae..05ae00476 100644
--- a/app/components/edit-stack/template.hbs
+++ b/app/components/edit-stack/template.hbs
@@ -35,7 +35,7 @@
           </ul>
         </div>
       </div>
-      <p class="help-block">{{t 'editStack.group.help'}}</p>
+      <p class="text-info">{{t 'editStack.group.help'}}</p>
     </div>
   </div>
 </section>
diff --git a/app/components/form-balancer-rules/template.hbs b/app/components/form-balancer-rules/template.hbs
index 312f295cc..dce77fa0e 100644
--- a/app/components/form-balancer-rules/template.hbs
+++ b/app/components/form-balancer-rules/template.hbs
@@ -132,7 +132,7 @@
           {{/each}}
         </tbody>
       </table>
-      <p class="help-block">
+      <p class="text-info">
         {{t 'formBalancerRules.help.prefix'}}
         {{#unless showBackend}}
           <a href="#" {{action "showBackend"}}>
diff --git a/app/components/form-name-description/template.hbs b/app/components/form-name-description/template.hbs
index baff20a26..c4f006720 100644
--- a/app/components/form-name-description/template.hbs
+++ b/app/components/form-name-description/template.hbs
@@ -4,7 +4,7 @@
       <label class="form-control-static">{{t nameLabel}}{{if nameRequired '*'}}</label>
     </div>
     {{input type="text" value=_name classNames="form-control" placeholder=(t namePlaceholder) disabled=nameDisabled}}
-    {{#if nameHelpText}}<p class="help-block">{{nameHelpText}}</p>{{/if}}
+    {{#if nameHelpText}}<p class="text-info">{{nameHelpText}}</p>{{/if}}
   </div>
 
   <div class="col span-6">
@@ -13,7 +13,7 @@
         <label class="form-control-static">{{t descriptionLabel}}{{if descriptionRequired '*'}}</label>
       </div>
       {{textarea-autogrow value=_description classNames="form-control no-resize" rows="1" placeholder=descriptionPlaceholder disabled=descriptionDisabled}}
-      {{#if descriptionHelp}}<p class="help-block">{{t descriptionHelp}}</p>{{/if}}
+      {{#if descriptionHelp}}<p class="text-info">{{t descriptionHelp}}</p>{{/if}}
     {{else}}
       {{yield}}
     {{/if}}
diff --git a/app/components/form-networking/template.hbs b/app/components/form-networking/template.hbs
index 2a2711894..2f72d3951 100644
--- a/app/components/form-networking/template.hbs
+++ b/app/components/form-networking/template.hbs
@@ -42,7 +42,7 @@
     <div class="col span-8">
       {{#input-or-display editable=editing value=requestedIp}}
         {{input type="text" value=requestedIp classNames="form-control" placeholder=(t 'formNetwork.requestedIp.placeholder')}}
-        <p class="help-block">{{t 'formNetwork.requestedIp.help'}}</p>
+        <p class="text-info">{{t 'formNetwork.requestedIp.help'}}</p>
       {{/input-or-display}}
     </div>
   </div>
diff --git a/app/components/form-ports/template.hbs b/app/components/form-ports/template.hbs
index 7c88eb3b4..6eb0cf75f 100644
--- a/app/components/form-ports/template.hbs
+++ b/app/components/form-ports/template.hbs
@@ -73,7 +73,7 @@
         {{/each}}
       </table>
       {{#unless showIp}}
-        <p class="help-block">
+        <p class="text-info">
           <a href="#" {{action "showIp"}}>
             {{t 'formPorts.showIpLink'}}
           </a>
diff --git a/app/components/form-secrets/template.hbs b/app/components/form-secrets/template.hbs
index c3a2ba44e..2be8727d0 100644
--- a/app/components/form-secrets/template.hbs
+++ b/app/components/form-secrets/template.hbs
@@ -60,7 +60,7 @@
           {{/each}}
         </tbody>
       </table>
-      <p class="help-block">
+      <p class="text-info">
         {{format-html-message 'formSecrets.help.prefix'}}
         {{#unless showPermissions}}
           <a href="#" {{action "showPermissions"}}>
diff --git a/app/components/form-security/template.hbs b/app/components/form-security/template.hbs
index c4cfeaec5..9a3a7bffc 100644
--- a/app/components/form-security/template.hbs
+++ b/app/components/form-security/template.hbs
@@ -158,7 +158,7 @@
   {{#if editing}}
     <div class="row">
       <div class="col span-8 offset-2">
-        <span class="help-block">
+        <span class="text-info">
           {{t 'formSecurity.capabilities.helpBlock.text'}}
           <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html" target="_blank">{{t 'formSecurity.capabilities.helpBlock.link'}}</a>
         </span>
diff --git a/app/components/form-ssl-termination/template.hbs b/app/components/form-ssl-termination/template.hbs
index bbc188d14..9a19286f1 100644
--- a/app/components/form-ssl-termination/template.hbs
+++ b/app/components/form-ssl-termination/template.hbs
@@ -61,7 +61,7 @@
 
     <div class="row form-group">
       <div class="col-sm-12 offset-2 col offset-8">
-        <p class="help-block">{{format-html-message 'formSslTermination.helpBlock'}}</p>
+        <p class="text-info">{{format-html-message 'formSslTermination.helpBlock'}}</p>
       </div>
     </div>
   {{else}}
diff --git a/app/components/form-targets/template.hbs b/app/components/form-targets/template.hbs
index 9123fd290..c51ea2acb 100644
--- a/app/components/form-targets/template.hbs
+++ b/app/components/form-targets/template.hbs
@@ -47,8 +47,8 @@
 {{#if isAdvanced}}
   <div class="row">
       <div class="">
-      <p class="help-block">{{t 'formTargets.advanced.help1'}}</p>
-      <p class="help-block">{{t 'formTargets.advanced.help2'}}</p>
+      <p class="text-info">{{t 'formTargets.advanced.help1'}}</p>
+      <p class="text-info">{{t 'formTargets.advanced.help2'}}</p>
     </div>
   </div>
 {{else}}
diff --git a/app/components/host-settings/template.hbs b/app/components/host-settings/template.hbs
index 1a241137a..0a77e8f92 100644
--- a/app/components/host-settings/template.hbs
+++ b/app/components/host-settings/template.hbs
@@ -10,7 +10,7 @@
 <div class="mt-10">
   <label style="width: 150px;">{{radio-button selection=customRadio value="yes"}}&nbsp;{{t 'hostSettings.hostUrl.new.labelText'}}&nbsp;&nbsp;</label>
   {{input type="text" class="form-control" value=customValue placeholder=(t 'hostSettings.hostUrl.new.placeholder') safeStyle="width: calc(100% - 170px); display: inline-block;  min-width: 300px;"}}
-  <p class="help-block">
+  <p class="text-info">
     {{format-html-message 'hostSettings.helpText.static1'}}
     {{#if settings.isRancher}}
       {{format-html-message 'hostSettings.helpText.isRancher' docsBase=settings.docsBase}}
diff --git a/app/components/machine/driver-amazonec2/template.hbs b/app/components/machine/driver-amazonec2/template.hbs
index 3c945572e..0db94834d 100644
--- a/app/components/machine/driver-amazonec2/template.hbs
+++ b/app/components/machine/driver-amazonec2/template.hbs
@@ -44,7 +44,7 @@
             <div class="form-control-static text-muted text-italic">{{t 'machine.driverAmazon.secretKey.provided'}}</div>
           {{/if}}
           {{#if isStep1}}
-            <p class="help-block">{{t 'machine.driverAmazon.accessKeyHelp'}}</p>
+            <p class="text-info">{{t 'machine.driverAmazon.accessKeyHelp'}}</p>
           {{/if}}
         </div>
       </div>
@@ -160,7 +160,7 @@
           </div>
 
           {{#if (and settings.isRancher (not isCustomSecurityGroup))}}
-            <p class="help-block ml-20"><a href="{{settings.docsBase}}/hosts/amazon/#required-ports-for-rancher-to-work" target="_blank">{{t 'machine.driverAmazon.portHelp.link'}}</a> {{t 'machine.driverAmazon.portHelp.text'}}</p>
+            <p class="text-info ml-20"><a href="{{settings.docsBase}}/hosts/amazon/#required-ports-for-rancher-to-work" target="_blank">{{t 'machine.driverAmazon.portHelp.link'}}</a> {{t 'machine.driverAmazon.portHelp.text'}}</p>
           {{/if}}
 
           <div class="radio">
@@ -262,7 +262,7 @@
       <div class="col span-4">
         {{input type="text" classNames="form-control" placeholder=(t 'machine.driverAmazon.ami.placeholder') value=amazonec2Config.ami}}
         {{#if settings.isRancher}}
-          <p class="help-block">
+          <p class="text-info">
             <a href="https://github.com/rancher/os/blob/master/README.md/#user-content-amazon" target="_blank">{{t 'machine.driverAmazon.ami.rancherList'}}</a>
           </p>
         {{/if}}
diff --git a/app/components/machine/driver-azure/template.hbs b/app/components/machine/driver-azure/template.hbs
index 49109b376..32a0e7af6 100644
--- a/app/components/machine/driver-azure/template.hbs
+++ b/app/components/machine/driver-azure/template.hbs
@@ -68,7 +68,7 @@
 
         {{input type="password" value=azureConfig.clientSecret classNames="form-control"}}
       </div>
-      <p class="col span-4 col offset-2 help-block">{{format-html-message 'machine.driverAzure.helpBlock'}}</p>
+      <p class="col span-4 col offset-2 text-info">{{format-html-message 'machine.driverAzure.helpBlock'}}</p>
 
     </div>
 
diff --git a/app/components/machine/driver-digitalocean/template.hbs b/app/components/machine/driver-digitalocean/template.hbs
index dae93e614..3e89df1ef 100644
--- a/app/components/machine/driver-digitalocean/template.hbs
+++ b/app/components/machine/driver-digitalocean/template.hbs
@@ -11,7 +11,7 @@
         </div>
         <div class="col span-10">
           {{input type="password" value=digitaloceanConfig.accessToken classNames="form-control" placeholder=(t 'machine.driverDigitalocean.accessToken.placeholder')}}
-          <p class="help-block">{{format-html-message 'machine.driverDigitalocean.accessToken.help'}}</p>
+          <p class="text-info">{{format-html-message 'machine.driverDigitalocean.accessToken.help'}}</p>
         </div>
       </div>
 
diff --git a/app/components/machine/driver-exoscale/template.hbs b/app/components/machine/driver-exoscale/template.hbs
index b845501b0..b96ba9ae7 100644
--- a/app/components/machine/driver-exoscale/template.hbs
+++ b/app/components/machine/driver-exoscale/template.hbs
@@ -28,7 +28,7 @@
             <div class="form-control-static text-muted text-italic">{{t 'machine.driverExoscale.secretKey.provided'}}</div>
           {{/if}}
           {{#if isStep1}}
-            <p class="help-block">{{t 'machine.driverExoscale.accountHelp'}}</p>
+            <p class="text-info">{{t 'machine.driverExoscale.accountHelp'}}</p>
           {{/if}}
         </div>
       </div>
@@ -72,7 +72,7 @@
           </label></div>
 
           {{#if (and settings.isRancher (not isCustomSecurityGroup))}}
-            <p class="help-block ml-20"><a href="{{settings.docsBase}}/hosts/exoscale/#required-ports-for-rancher-to-work" target="_blank">{{t 'machine.driverExoscale.portHelp.link'}}</a> {{t 'machine.driverExoscale.portHelp.text'}}</p>
+            <p class="text-info ml-20"><a href="{{settings.docsBase}}/hosts/exoscale/#required-ports-for-rancher-to-work" target="_blank">{{t 'machine.driverExoscale.portHelp.link'}}</a> {{t 'machine.driverExoscale.portHelp.text'}}</p>
           {{/if}}
 
           <div class="radio"><label>{{radio-button selection=whichSecurityGroup value="custom"}} {{t 'machine.driverExoscale.securityGroup.custom'}}</label></div>
diff --git a/app/components/machine/driver-packet/template.hbs b/app/components/machine/driver-packet/template.hbs
index 86ae6cdab..2d723a1f6 100644
--- a/app/components/machine/driver-packet/template.hbs
+++ b/app/components/machine/driver-packet/template.hbs
@@ -22,7 +22,7 @@
       </div>
       <div class="col span-10">
         {{input type="password" name="password" value=packetConfig.apiKey classNames="form-control" placeholder=(t 'machine.driverPacket.apiKey.placeholder')}}
-        <p class="help-block">{{format-html-message 'machine.driverPacket.apiKeyHelp'}}</p>
+        <p class="text-info">{{format-html-message 'machine.driverPacket.apiKeyHelp'}}</p>
       </div>
     </div>
 
diff --git a/app/components/machine/driver-rackspace/template.hbs b/app/components/machine/driver-rackspace/template.hbs
index 545792df5..5394ab52f 100644
--- a/app/components/machine/driver-rackspace/template.hbs
+++ b/app/components/machine/driver-rackspace/template.hbs
@@ -23,7 +23,7 @@
       </div>
       <div class="col span-10">
         {{input type="password" value=rackspaceConfig.apiKey classNames="form-control" placeholder=(t 'machine.driverRackspace.apiKey.placeholder')}}
-        <p class="help-block">{{t 'machine.driverRackspace.accountHelp'}}</p>
+        <p class="text-info">{{t 'machine.driverRackspace.accountHelp'}}</p>
       </div>
     </div>
 
diff --git a/app/components/machine/driver-ubiquity/template.hbs b/app/components/machine/driver-ubiquity/template.hbs
index 297f1e6ff..ede36ee54 100644
--- a/app/components/machine/driver-ubiquity/template.hbs
+++ b/app/components/machine/driver-ubiquity/template.hbs
@@ -40,7 +40,7 @@
             <div class="form-control-static text-muted text-italic">{{t 'machine.driverUbiquity.apiToken.provided'}}</div>
           {{/if}}
           {{#if isStep1}}
-            <p class="help-block">{{format-html-message 'machine.driverUbiquity.accountHelp'}}</p>
+            <p class="text-info">{{format-html-message 'machine.driverUbiquity.accountHelp'}}</p>
           {{/if}}
         </div>
       </div>
diff --git a/app/components/modal-container-stop/template.hbs b/app/components/modal-container-stop/template.hbs
index 80e23f63d..3dbab6962 100644
--- a/app/components/modal-container-stop/template.hbs
+++ b/app/components/modal-container-stop/template.hbs
@@ -18,7 +18,7 @@
     <div class="input-group-addon">{{t 'modalContainerStop.uom'}}</div>
   </div>
 </div>
-<div class="row help-block mb-20">
+<div class="row text-info mb-20">
   <div class="col-sm-12">
     {{t 'modalContainerStop.helpText'  defaultTimeout=defaultTimeout}}
   </div>
diff --git a/app/components/modal-edit-driver/template.hbs b/app/components/modal-edit-driver/template.hbs
index ebaff7417..afc4cc339 100644
--- a/app/components/modal-edit-driver/template.hbs
+++ b/app/components/modal-edit-driver/template.hbs
@@ -5,13 +5,13 @@
 <div class="form-group">
   <label>{{t 'modalEditDriver.url.label'}}*</label>
   {{input class="form-control" value=originalModel.url }}
-  <span class="help-block">{{t 'modalEditDriver.url.help'}}</span>
+  <span class="text-info">{{t 'modalEditDriver.url.help'}}</span>
 </div>
 
 <div class="form-group">
   <label>{{t 'modalEditDriver.uiUrl.label'}}</label>
   {{input class="form-control" value=originalModel.uiUrl }}
-  <span class="help-block">
+  <span class="text-info">
     {{t 'modalEditDriver.uiUrl.help'}}
     {{#if settings.isRancher}}
       {{format-html-message 'modalEditDriver.uiUrl.link'}}
@@ -22,7 +22,7 @@
 <div class="form-group">
   <label>{{t 'modalEditDriver.checksum.label'}}</label>
   {{input class="form-control" value=originalModel.checksum }}
-  <span class="help-block">{{t 'modalEditDriver.checksum.help'}}</span>
+  <span class="text-info">{{t 'modalEditDriver.checksum.help'}}</span>
 </div>
 
 {{save-cancel editing=editing save="save" cancel="cancel"}}
diff --git a/app/components/modal-edit-setting/template.hbs b/app/components/modal-edit-setting/template.hbs
index a3b52db09..ad0ef94bc 100644
--- a/app/components/modal-edit-setting/template.hbs
+++ b/app/components/modal-edit-setting/template.hbs
@@ -5,7 +5,7 @@
   <div class="row form-group">
     <label>{{t 'modalEditSetting.name.label'}}</label>
     <div class="form-control-static text-mono">{{model.key}}</div>
-    <p class="help-block">{{model.description}}</p>
+    <p class="text-info">{{model.description}}</p>
   </div>
 
   <div class="row form-group">
diff --git a/app/components/new-catalog/template.hbs b/app/components/new-catalog/template.hbs
index 9121c6059..91e68b83a 100644
--- a/app/components/new-catalog/template.hbs
+++ b/app/components/new-catalog/template.hbs
@@ -65,7 +65,7 @@
         value=selectedTemplateUrl
         disabled=loading
       }}
-      <p class="help-block">{{t (if editing selectVersionUpgrade selectVersionAdd)}}</p>
+      <p class="text-info">{{t (if editing selectVersionUpgrade selectVersionAdd)}}</p>
     </div>
   </div>
 </section>
@@ -108,7 +108,7 @@
                 <p>{{t 'newCatalog.unknownType'}} {{question.type}}</p>
               {{/if}}
 
-              <p class="help-block">{{question.description}}</p>
+              <p class="text-info">{{question.description}}</p>
             </div>
           </div>
         {{else}}
diff --git a/app/components/page-header/template.hbs b/app/components/page-header/template.hbs
index 6fce5c1d0..b42fa08eb 100644
--- a/app/components/page-header/template.hbs
+++ b/app/components/page-header/template.hbs
@@ -84,7 +84,7 @@
 
   <ul class="nav-user dropdown">
     <li>
-      <a class="btn bg-primary dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" aria-label={{t 'nav.user.label' username=session.user}}>
+      <a class="btn dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" aria-label={{t 'nav.user.label' username=session.user}}>
         {{#if accessEnabled}}
           {{identity-avatar link=false identity=access.identity}}
         {{else}}
diff --git a/app/components/settings/catalog-url/template.hbs b/app/components/settings/catalog-url/template.hbs
index 4c6db8fd6..763adb97b 100644
--- a/app/components/settings/catalog-url/template.hbs
+++ b/app/components/settings/catalog-url/template.hbs
@@ -13,7 +13,7 @@
         {{radio-button selection=enableLibrary value=false}} {{t 'generic.disabled'}}
       </label>
     </div>
-    <p class="help-block">
+    <p class="text-info">
       {{#if settings.isRancher}}
         {{t 'catalogSettings.certified.detail.rancher'}}
       {{else}}
@@ -31,7 +31,7 @@
         {{radio-button selection=enableCommunity value=false}} {{t 'generic.disabled'}}
       </label>
     </div>
-    <p class="help-block">
+    <p class="text-info">
       {{#if settings.isRancher}}
         {{t 'catalogSettings.community.detail.rancher'}}
       {{else}}
@@ -44,7 +44,7 @@
 <hr>
 
 <h5>{{t 'catalogSettings.more.header'}}</h5>
-<p class="help-block">{{format-html-message 'catalogSettings.more.helpText'}}</p>
+<p class="text-info">{{format-html-message 'catalogSettings.more.helpText'}}</p>
 
 <button class="btn-circle-text" {{action "add"}}><i class="icon icon-plus-circle"/> <span>{{t 'catalogSettings.more.addActionLabel'}}</span></button>
 
diff --git a/app/components/settings/danger-zone/template.hbs b/app/components/settings/danger-zone/template.hbs
index f887912d8..5aba28a18 100644
--- a/app/components/settings/danger-zone/template.hbs
+++ b/app/components/settings/danger-zone/template.hbs
@@ -10,7 +10,7 @@
       <div class="advanced-setting">
         <div class="edit btn btn-warning" {{action "showEdit" row.key}}><i class="icon icon-edit"></i></div>
         <div class="text-mono force-wrap mr-50 {{unless (or (not row.obj) row.obj.isDefault) 'text-bold'}}">{{row.key}}={{#if row.obj.value}}{{row.obj.value}}{{else}}<span class="text-muted">&lt;none&gt;</span>{{/if}}</div>
-        <p class="help-block">{{row.description}}</p>
+        <p class="text-info">{{row.description}}</p>
       </div>
     {{/each}}
   </div>
diff --git a/app/components/settings/host-registration/template.hbs b/app/components/settings/host-registration/template.hbs
index 717a91e37..cd0f7455d 100644
--- a/app/components/settings/host-registration/template.hbs
+++ b/app/components/settings/host-registration/template.hbs
@@ -10,7 +10,7 @@
 <div class="mt-10">
   <label style="width: 150px;">{{radio-button selection=customRadio value="yes"}}&nbsp;{{t 'hostSettings.hostUrl.new.labelText'}}&nbsp;&nbsp;</label>
   {{input type="text" class="form-control" value=customValue placeholder=(t 'hostSettings.hostUrl.new.placeholder') safeStyle="width: calc(100% - 170px); display: inline-block;  min-width: 300px;"}}
-  <p class="help-block">
+  <p class="text-info">
     {{format-html-message 'hostSettings.helpText.static1'}}
     {{#if settings.isRancher}}
       {{format-html-message 'hostSettings.helpText.isRancher' docsBase=settings.docsBase}}
diff --git a/app/components/site-access/template.hbs b/app/components/site-access/template.hbs
index 4df8ccd28..122975820 100644
--- a/app/components/site-access/template.hbs
+++ b/app/components/site-access/template.hbs
@@ -1,5 +1,5 @@
 <h3>{{t 'siteAccess.header'}}</h3>
-<p class="help-block">
+<p class="text-info">
   {{format-html-message 'siteAccess.helpText' appName=settings.appName}}
 </p>
 <hr/>
diff --git a/app/components/view-edit-project/template.hbs b/app/components/view-edit-project/template.hbs
index d78226af0..964da1040 100644
--- a/app/components/view-edit-project/template.hbs
+++ b/app/components/view-edit-project/template.hbs
@@ -120,7 +120,7 @@
       </table>
       <hr class="m-0" />
     {{else}}
-      <p class="help-block text-center">
+      <p class="text-info text-center">
         {{format-html-message 'viewEditProject.helpBlock'}}
       </p>
     {{/if}}
diff --git a/app/registries/new/template.hbs b/app/registries/new/template.hbs
index 4a24f25b5..35d0bdffb 100644
--- a/app/registries/new/template.hbs
+++ b/app/registries/new/template.hbs
@@ -20,7 +20,7 @@
       <div>
         {{input type="text" value=model.registry.serverAddress classNames="form-control" placeholder=(t 'registriesPage.new.form.custom.placeholder')}}
       </div>
-      <p class="help-block">{{t 'registriesPage.new.form.custom.help'}}</p>
+      <p class="text-info">{{t 'registriesPage.new.form.custom.help'}}</p>
     </div>
   {{/if}}
 
diff --git a/app/stacks/new/template.hbs b/app/stacks/new/template.hbs
index 323dea65e..67e341601 100644
--- a/app/stacks/new/template.hbs
+++ b/app/stacks/new/template.hbs
@@ -47,7 +47,7 @@
             </ul>
           </div>
         </div>
-        <p class="help-block">{{t 'editStack.group.help'}}</p>
+        <p class="text-info">{{t 'editStack.group.help'}}</p>
       </div>
       <div class="col span-6">
         <label class="pt-5">&nbsp;</label>
diff --git a/app/styles/components/_page-header.scss b/app/styles/components/_page-header.scss
index 24603dc38..ed37558c7 100644
--- a/app/styles/components/_page-header.scss
+++ b/app/styles/components/_page-header.scss
@@ -6,6 +6,8 @@
   NAV {
     display: table;
     width: 100%;
+    border-collapse: collapse;
+    border-spacing: 0;
   }
 
   .nav-logo {
@@ -14,19 +16,34 @@
     background-size: auto 32px;
     background-position: left center;
     background-repeat: no-repeat;
-    border-right: 20px solid transparent;
+    vertical-align: middle;
+    margin: 0;
   }
 
-  .nav-middle {
+  ul.nav-middle {
     display: table-cell;
-    width: 100%;
-    padding-left: 10px;
+    vertical-align: middle;
+    padding: 0!important;
+
+    .active {
+      color: $info;
+    }
+
+    .dropdown-menu {
+      background: $light-grey;
+      border: 0;
+      border-bottom: 3px solid rgba($mid-grey, .5);
+    }
   }
 
   .nav-user {
     display: table-cell;
-    width: 80px;
-    border-left: 20px solid transparent;
+    // width: 80px;
+    // border-left: 20px solid transparent;
+    background: mix($secondary, black, 70%);
+    border-radius: 0 3px 3px 0;
+    vertical-align: middle;
+    margin: 0;
   }
 
   .logo-oss {
diff --git a/app/styles/lacsso/base/_helpers.scss b/app/styles/lacsso/base/_helpers.scss
index 0914e3a38..0bde37cdf 100755
--- a/app/styles/lacsso/base/_helpers.scss
+++ b/app/styles/lacsso/base/_helpers.scss
@@ -57,6 +57,14 @@
   width: 1px;
 }
 
+.pull-right {
+  float: right;
+}
+
+.pull-left {
+  float: left;
+}
+
 .text-left {
   text-align: left;
 }
diff --git a/app/styles/lacsso/base/_typography.scss b/app/styles/lacsso/base/_typography.scss
index 6cd6b4ea0..bf10b7de4 100755
--- a/app/styles/lacsso/base/_typography.scss
+++ b/app/styles/lacsso/base/_typography.scss
@@ -20,11 +20,11 @@ h6 {
 }
 
 h1 {
-  font-size: 2em;
+  font-size: 1.5em;
 }
 
 h2 {
-  font-size: 1.5em;
+  font-size: 1.25em;
 }
 
 h3 {
diff --git a/app/styles/lacsso/components/_forms.scss b/app/styles/lacsso/components/_forms.scss
index 8e6c8a78e..10a56bcf8 100644
--- a/app/styles/lacsso/components/_forms.scss
+++ b/app/styles/lacsso/components/_forms.scss
@@ -8,16 +8,33 @@
 //   border-radius: 3px;
 // }
 select {
-    display: block;
+    // display: block;
+    // width: 100%;
+    // height: 50px;
+    // background-image: none;
+    // background-color: white;
+    // border: 1px solid $light-grey;
+    // font-size: 13px;
+    // line-height: 1.5;
+    // border-width: 2px;
+    // border-color: rgba(204, 209, 211, 0.5);
+        display: block;
     width: 100%;
-    height: 50px;
-    background-image: none;
-    background-color: white;
-    border: 1px solid $light-grey;
-    font-size: 13px;
-    line-height: 1.5;
+    box-sizing: border-box;
     border-width: 2px;
-    border-color: rgba(204, 209, 211, 0.5);
+    border-color: rgba($mid-grey, .4);
+    border-radius: 0;
+    background: rgba($light-grey, .3);
+    outline: none;
+    padding: 10px;
+    font-size: 15px;
+    transition: all ease-in-out .3s;
+    -webkit-appearance: none;
+    position: relative;
+    background-image: url(images/dropdown-arrow.svg);
+    background-repeat: no-repeat;
+    background-size: 15px 10px;
+    background-position: calc(100% - 10px) center;
 }
 
 form {
@@ -45,12 +62,13 @@ textarea {
     display: block;
     width: 100%;
     box-sizing: border-box;
-    border-width: 0 0 3px 0;
-    border-color: rgba($mid-grey, .2);
+    border-width: 2px;
+    border-color: $light-grey;
     border-radius: 0;
-    background: rgba($light-grey, .45);
+    border-style: solid;
+    background: rgba($light-grey, .2);
     outline: none;
-    padding: 15px 0 15px 10px;
+    padding: 10px;
     font-size: 15px;
     transition: all ease-in-out .3s;
     @include placeholder {
diff --git a/app/styles/lacsso/components/_nav.scss b/app/styles/lacsso/components/_nav.scss
index ef05224dc..e6e6eb24f 100644
--- a/app/styles/lacsso/components/_nav.scss
+++ b/app/styles/lacsso/components/_nav.scss
@@ -1,7 +1,7 @@
 nav {
    > ul {
-    background-color: $light-grey;
-    border-radius: 2px;
+    background-color: $secondary;
+    border-radius: 3px 0 0 3px;
     display: inline-block;
     padding: 0;
 
@@ -14,7 +14,7 @@ nav {
       display: inline-block;
 
       > a {
-        color: $dark-grey;
+        color: $light-grey;
         display: block;
         padding: 10px;
 
diff --git a/app/styles/totrash/base/_rancher.scss b/app/styles/totrash/base/_rancher.scss
index b27a8366c..c19ceb900 100644
--- a/app/styles/totrash/base/_rancher.scss
+++ b/app/styles/totrash/base/_rancher.scss
@@ -31,7 +31,7 @@ table{
   }
 }
 
-//header
+//header(s)
 #navbar {
   .nav {
     li {
@@ -46,6 +46,11 @@ table{
   }
 }
 
+.header {
+  border-bottom: solid 2px $light-grey;
+  padding: 15px 0;
+}
+
 //inputs
 .searchable {
   position: relative;
diff --git a/app/templates/ldap-config.hbs b/app/templates/ldap-config.hbs
index c35d3af5d..68e282210 100644
--- a/app/templates/ldap-config.hbs
+++ b/app/templates/ldap-config.hbs
@@ -19,7 +19,7 @@
   <section class="well">
     <h3>{{t 'ldap.accessEnabled.header'}}</h3>
     <hr/>
-    <p class="help-block">{{t 'ldap.accessEnabled.subtext'}}</p>
+    <p class="text-info">{{t 'ldap.accessEnabled.subtext'}}</p>
 
     <div class="row">
       <div class="col span-4">
@@ -83,7 +83,7 @@
     <h3></h3>
     <h3>{{t 'ldap.accessConfig.header' providerName=(t providerName)}}</h3>
     <hr/>
-    <p class="help-block">{{format-html-message 'ldap.accessConfig.subtext1' providerName=(t providerName)}}</p>
+    <p class="text-info">{{format-html-message 'ldap.accessConfig.subtext1' providerName=(t providerName)}}</p>
     <div class="row">
       <div class="col span-6">
         <div class="form-group">
@@ -108,7 +108,7 @@
       </div>
     </div>
 
-    <p class="help-block">{{t 'ldap.accessConfig.subtext2' appName=settings.appName}}</p>
+    <p class="text-info">{{t 'ldap.accessConfig.subtext2' appName=settings.appName}}</p>
     <div class="row">
       <div class="col span-6">
         <div class="form-group">
@@ -127,14 +127,14 @@
     <div class="row">
       <div class="col span-6">
         <div class="form-group">
-          <p class="help-block">{{t 'ldap.accessConfig.searchBase.helpText'}}</p>
+          <p class="text-info">{{t 'ldap.accessConfig.searchBase.helpText'}}</p>
           <label>{{t 'ldap.accessConfig.searchBase.labelText'}}*</label>
           {{input type="text" value=model.domain classNames="form-control" placeholder=(t 'ldap.accessConfig.searchBase.placeholder')}}
         </div>
       </div>
       {{#unless isOpenLdap}}
         <div class="col span-6">
-          <p class="help-block">{{t 'ldap.accessConfig.defaultDomain.helpText'}}</p>
+          <p class="text-info">{{t 'ldap.accessConfig.defaultDomain.helpText'}}</p>
           <div class="form-group">
             <label>{{t 'ldap.accessConfig.defaultDomain.labelText'}}</label>
             {{input type="text" value=model.loginDomain classNames="form-control" placeholder=(t 'ldap.accessConfig.defaultDomain.placeholder')}}
@@ -147,7 +147,7 @@
   <section class="well">
     <h3>{{t 'ldap.customizeSchema.header'}}</h3>
     <hr/>
-    <p class="help-block">{{t 'ldap.customizeSchema.helpText'}}</p>
+    <p class="text-info">{{t 'ldap.customizeSchema.helpText'}}</p>
     <div class="row">
       <div class="col span-6">
         <h4>{{t 'ldap.customizeSchema.users.header'}}</h4>
@@ -213,7 +213,7 @@
   <section class="well">
     <h3>{{t 'ldap.testAuth.header'}}</h3>
     <hr/>
-    <p class="help-block">{{t 'ldap.testAuth.helpText' providerName=(t providerName)}}</p>
+    <p class="text-info">{{t 'ldap.testAuth.helpText' providerName=(t providerName)}}</p>
     {{top-errors errors=errors}}
 
     <div class="row">
diff --git a/public/assets/images/dropdown-arrow.svg b/public/assets/images/dropdown-arrow.svg
new file mode 100644
index 000000000..18859c774
--- /dev/null
+++ b/public/assets/images/dropdown-arrow.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.1 18.2" style="enable-background:new 0 0 32.1 18.2;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;stroke:#99A3A8;stroke-width:3;stroke-miterlimit:10;}
+</style>
+<polyline class="st0" points="31.1,1.1 16.1,16.1 1.1,1.1 "/>
+</svg>