Merge remote-tracking branch 'refs/remotes/origin/master' into pr/1517

# Conflicts:
#	js/languages/ru.json

Author: jjeffryes

css/obBase.css

@@ -1056,7 +1056,7 @@ label.fieldItem {
   top: 0;
   left: 0;
   right: 0;
-  z-index: 7;
+  z-index: 1;
 }
 
 .modal-child {
@@ -4010,6 +4010,16 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   transition: width .35s cubic-bezier(0, 0, 0.2, 1);
 }
 
+.customizePrimaryColorRecommendations.show,
+.customizeSecondaryColorRecommendations.show,
+.customizeBackgroundColorRecommendations.show  {
+  width: 273px;
+}
+
+.customizeTextColorRecommendations.show {
+  width: 121px;
+}
+
 .customColorChoice {
   background: #fff;
   display: inline-block;
@@ -4291,6 +4301,39 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   z-index: 14;
 }
 
+#ov1 #loadingModal.hide {
+  height: 0; /* kludge to allow top bar to fade in. Transitions don't work if display is none */
+  padding: 0;
+  overflow: hidden;
+  display: block;
+}
+
+#loadingModal #loadingModalContent {
+  position: absolute;
+  right: 0;
+  left: 0;
+  top: 50%;
+  margin-top: 120px;
+  opacity: 1;
+  transition: opacity 1s 5s ease;
+  box-sizing: border-box;
+  padding: 9px;
+  text-align: center;
+}
+
+#loadingModal #loadingModalBtns {
+  opacity: 1;
+  transition: opacity 1s 5s ease;
+  /* this seems redundant, but if you don't also have a transition on the button container, for some reason the normal
+  background color will be used instead of the background color from the custCol-secondary class until the parent
+  transition is complete on Win64 10. */
+}
+
+#loadingModal.hide #loadingModalContent,
+#loadingModal.hide #loadingModalBtns {
+  opacity: 0;
+}
+
 #ov1 .server-connect-modal {
   z-index: 15;
 }
@@ -4345,10 +4388,6 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   bottom: 0;
 }
 
-#loadingModal .btn {
-  -webkit-app-region: no-drag;
-}
-
 .pill {
   border-radius: 2px;
   padding: 5px 7px;
@@ -4876,7 +4915,8 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   border-bottom: solid 2px rgba(255,255,255,0.08);
 }
 
-#ov1  .textOpacity0 {
+#ov1  .textOpacity0,
+#ov1 .opacity0 {
   opacity: 0;
 }
 
@@ -5716,9 +5756,6 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   width: 260px;
 }
 
-#ov1 .width270 {
-  width: 270px;
-}
 #ov1 .width380 {
   width: 380px;
 }
@@ -5827,13 +5864,21 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   -webkit-filter: blur(20px) grayscale(1) contrast(0.5);
 }
 
+/* to fade out a visible element, add the fadeOut class */
+/* to fade in an element with opacity 0, add the fadeIn class */
 
 #ov1 .fadeOut {
   opacity: 0;
   pointer-events: none;
   transition: opacity .3s cubic-bezier(0, 0, 0.2, 1);
 }
 
+#ov1 .fadeIn {
+  opacity: 1;
+  pointer-events: auto;
+  transition: opacity .3s cubic-bezier(0, 0, 0.2, 1);
+}
+
 #ov1 .foldIn {
   height: 0;
   padding: 0;
@@ -6103,7 +6148,8 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
 #ov1.notFancy #userPage .js-modal-close [class *= "ion-"]:before,
 #ov1.notFancy #obContainer .js-modal-close [class *= "ion-"]:before,
 #ov1.notFancy #modalHolder .js-modal-close [class *= "ion-"]:before,
-#ov1.notFancy #messageModal .js-modal-close [class *= "ion-"]:before{
+#ov1.notFancy #messageModal .js-modal-close [class *= "ion-"]:before,
+#ov1 #modalHolder .js-closeBuyWizardModal [class *= "ion-"]:before {
   text-shadow: 0 0 1px rgba(0,0,0,1), 0 0 2px rgba(255,255,255, 1) !important;
 }
 

index.html

@@ -40,58 +40,28 @@ <h2 class="ion-android-close custCol-text clickable"></h2>
       </div>
     </div>
   </div>
-  <!--
-  <div class="modal modal-opaque hide js-loadingMessageModal">
-    <div class="modal-child modal-childMain">
-      <div class="btn-corner btn-cornerTR js-closeIndexModal">
-        <h2 class="ion-close-circled"></h2>
-      </div>
-      <h1 class="txt-center rowTop20"><i class="ion-android-sync spinner"></i> Loading...</h1>
-      <p class="txt-center js-indexLoadingMsg1"></p>
-      <p class="txt-center js-indexLoadingMsg2"></p>
-      <p class="txt-center js-indexLoadingMsg3"></p>
-      <h2 class="txt-center">
-        &nbsp;<span class="js-indexLoadingMsg4"></span>&nbsp;
-      </h2>
-      <div class="rowTop20 width100 positionWrapper pad50">
-        <div class="txtFieldWrapper">
-          <input type="text" class="txtField borderRadius3 placeholder-dark" placeholder="http://serverIPorURL/api/v1/"
-                 style="height: 32px; text-indent: 10px;" name="newServer" id="indexNewServer" />
-          <a class="btn btn-txt btn-insideInput js-newServerIndexApp">Set New Server</a>
-        </div>
-      </div>
-      <div class="rowTop20 width100 positionWrapper pad50">
-        <div class="txtFieldWrapper">
-          <a class="btn btn-txtOnly js-defaultServerIndexApp">Set to http://localhost:18469/api/v1/</a>
-          <a class="btn btn-txt btn-insideInput pull-right js-defaultServerIndexApp">Set to Default</a>
-        </div>
-      </div>
-      <div class="positionBottom row60 width100">
-        <a class="btn btn-txt hCentered js-closeIndexApp">Close Application</a>
-      </div>
-      </div>
-    </div>
-  </div>
-  -->
   <div id="statusBar"></div>
   <div id="pageNav" class="bar navBar navBar-main custCol-secondary padding0"></div>
   <!-- the loading modal must be on top of the page nav or the reload button is hidden -->
   <div id="loadingModal" class="modal modal-opaque js-loadingModal top0 hide">
     <div class="spinner-with-logo fullCentered">
       <i class="ion-android-sync spinner fontSize30 spinner-with-logo-icon"></i>
     </div>
-    <div class="width100 positionTop">
-      <a class="btn btn-txt rowTop10 marginRight10 pull-right js-indexReload"><i class="ion-android-sync"></i> <span class="js-translate" data-translate="Reload"></span></a>
-      <a class="btn btn-txt rowTop10 marginRight10 pull-right" href="#home"><i class="ion-home"></i> <span class="js-translate" data-translate="LoadIndex"></span></a>
+    <div id="loadingModalContent">
+      <p class="fontSize16 js-translate" data-translate="errorMessages.loadingViewError"></p>
+      <div id="loadingModalBtns">
+        <a class="btn btn-large marginRight10 custCol-secondary custCol-text js-indexReload"><i class="ion-android-sync"></i> <span class="js-translate" data-translate="Reload"></span></a>
+        <a class="btn btn-large custCol-secondary custCol-text" href="#home"><i class="ion-eye"></i> <span class="js-translate" data-translate="LoadIndex"></span></a>
+      </div>
+
     </div>
   </div>
 
   <!--TODO: modularize non-modular scripts -->
   <script src="js/utils/list.min.js"></script>
 
   <script>
-    var app = require('./js/main'),
-        remote = require('remote');
+    var app = require('./js/start');
 
     window.translateIndex = function(){
       $('.js-translate').each(function() {

js/App.js

@@ -18,7 +18,7 @@ function App() {
   // TODO: rather than attach the serverConfigs CL
   // in main.js, pass in the instance here so the
   // dependency is more explicit.
-};
+}
 
 App.prototype.connectHeartbeatSocket = function() {
   var activeServer = this.serverConfigs.getActive();