merging in @wolf's changes

Author: rmisio

css/obBase.css

@@ -3775,7 +3775,7 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
 .modal .homeModal-heroText {
   position: absolute;
   bottom: 0px;
-  top: 210px;
+  top: 200px;
   color: #fff;
   font-size: 20px;
   line-height: 22px;
@@ -4267,10 +4267,12 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
 }
 
 #ov1 .server-connect-modal .message-bar > div {
-  background-color: red;
-  padding: 8px 10px;
+  background-color: #C62D2D;
+  padding: 8px 20px;
   line-height: 2.2;
   display: inline-block;
+  border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 4px;
 }
 
 #ov1 .server-connect-modal .message-bar .message-bar-close {
@@ -4298,8 +4300,8 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
 #ov1 .server-config-row .connection-failed::after {
   content: '';
   position: absolute;
-  width: 10px;
-  background-color: red;
+  width: 6px;
+  background-color: #C62D2D;
   top: 0;
   left: 0;
   bottom: 0;

js/templates/baseModal.html

@@ -1,4 +1,4 @@
-<div class="js-modal-inner-wrap <%= ob.innerWrapperClass %>">
+<div class="js-modal-inner-wrap color-primary custCol-primary <%= ob.innerWrapperClass %>">
   <div class="js-modal-close <%= ob.closeButtonClass %> <% !ob.showCloseButton && print('hide') %>">
     <h2 class="ion-android-close clickable"></h2>
   </div>    

js/templates/serverConfigRow.html

@@ -1,4 +1,4 @@
-<div class="rowItem padding2015 positionRelative <% ob.status === 'failed' && print('connection-failed') %>">
+<div class="rowItem padding15 positionRelative <% ob.status === 'failed' && print('connection-failed') %>">
   <div class="flexRow">
     <div class="table">
       <div>
@@ -14,15 +14,15 @@
               <% print(ob.status === 'not-connected' ? polyglot.t('serverConnectModal.connect') : polyglot.t('Retry')) %>
             </a>
               <% if (!ob.default) { %>
-              <a class="btn btn-txt btn-secondary custCol-secondary pull-right marginLeft5 positionWrapper js-edit-config">
+              <a class="btn btn-txt btn-secondary custCol-secondary pull-right marginLeft5 positionWrapper js-edit-config tooltip" data-tooltip="Edit Configuration">
                 <span class="ion-ios-gear textOpacity1 fullCentered"></span>
               </a>
-              <a class="btn btn-txt btn-secondary custCol-secondary pull-right fontSize13 positionWrapper js-delete-config">
+              <a class="btn btn-txt btn-secondary custCol-secondary pull-right fontSize13 positionWrapper js-delete-config tooltip" data-tooltip="Delete Configuration">
                 <span class="ion-ios-trash textOpacity1 fullCentered"></span>
               </a>
               <% } %>
             <% } else if (ob.status === 'connected') { %>
-            <span class="ion-connection-bars textOpacity1"></span> <%= polyglot.t('serverConnectModal.connected') %>
+            <span class="ion-checkmark textOpacity1"></span> <%= polyglot.t('serverConnectModal.connected') %>
             <% } else if (ob.status === 'connecting') { %>
             <span class="vertAlignMid"><%= polyglot.t('serverConnectModal.connecting') %>...</span> 
             <a class="btn btn-txt btn-secondary custCol-secondary fontSize13 marginLeft10 js-cancel">

js/templates/serverConnectModal.html

@@ -1,7 +1,7 @@
 <div class="message-bar positionFixed alignCenter slide-out js-msg-bar">
   <div>
-    <span class="message-bar-close clickable positionRelative pull-right alignCenter js-msg-bar-close">X</span>
-    <span class="ion-alert"></span>
+    <span class="message-bar-close ion-android-close clickable marginLeft15 marginTop7 pull-right textOpacity75 alignCenter js-msg-bar-close"></span>
+    <!-- <span class="ion-alert marginRight5"></span> -->
     <span class="js-message-bar-content"></span>
   </div>
 </div>