From eaf31705cc5b685a108855c1923770f8bfd9a000 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@nonnenberg.com>
Date: Thu, 27 Jul 2017 18:38:41 -0700
Subject: [PATCH] A number of fixes for loading screen, recent rebase

FREEBIE
---
 background.html          | 6 +++---
 js/background.js         | 1 +
 js/views/app_view.js     | 2 +-
 stylesheets/_global.scss | 2 +-
 stylesheets/manifest.css | 9 ++++++++-
 5 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/background.html b/background.html
index 255a66ab03..469005a2bb 100644
--- a/background.html
+++ b/background.html
@@ -46,7 +46,7 @@
   </script>
   <script type='text/x-tmpl-mustache' id='app-loading-screen'>
     <div class='content'>
-      <img src='/images/icon_128.png'>
+      <img src='images/icon_128.png'>
       <div class='container'>
         <span class='dot'></span>
         <span class='dot'></span>
@@ -57,7 +57,7 @@
   </script>
   <script type='text/x-tmpl-mustache' id='conversation-loading-screen'>
     <div class='content'>
-      <img src='/images/icon_128.png'>
+      <img src='images/icon_128.png'>
       <div class='container'>
         <span class='dot'></span>
         <span class='dot'></span>
@@ -832,7 +832,7 @@
 <body>
   <div class='app-loading-screen'>
     <div class='content'>
-      <img src='/images/icon_128.png'>
+      <img src='images/icon_128.png'>
       <div class='container'>
         <span class='dot'></span>
         <span class='dot'></span>
diff --git a/js/background.js b/js/background.js
index 420e77768c..7258ca52e3 100644
--- a/js/background.js
+++ b/js/background.js
@@ -12,6 +12,7 @@
     console.log('environment:', window.config.environment);
 
     var initialLoadComplete = false;
+    window.owsDesktopApp = {};
 
     // start a background worker for ecc
     textsecure.startWorker('js/libsignal-protocol-worker.js');
diff --git a/js/views/app_view.js b/js/views/app_view.js
index 1d2ed39d21..10b15d2434 100644
--- a/js/views/app_view.js
+++ b/js/views/app_view.js
@@ -63,7 +63,7 @@
                 this.inboxView = new Whisper.InboxView({
                   model: self,
                   window: window,
-                  initialLoadComplete: initialLoadComplete
+                  initialLoadComplete: options.initialLoadComplete
                 });
                 this.openView(this.inboxView);
             }.bind(this));
diff --git a/stylesheets/_global.scss b/stylesheets/_global.scss
index c960f31644..d4ef135031 100644
--- a/stylesheets/_global.scss
+++ b/stylesheets/_global.scss
@@ -557,7 +557,7 @@ input[type=text], input[type=search], textarea {
 }
 
 .app-loading-screen {
-  z-index: 1000;
+  z-index: 99;
   position: absolute;
   left: 0;
   right: 0;
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index ba8c0645a4..2bfe1101b9 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -502,8 +502,9 @@ input[type=text]:active, input[type=text]:focus, input[type=search]:active, inpu
     opacity: 1; }
   100% {
     opacity: 0; } }
+
 .app-loading-screen {
-  z-index: 1000;
+  z-index: 99;
   position: absolute;
   left: 0;
   right: 0;
@@ -3562,4 +3563,10 @@ li.entry .error-icon-container {
         margin: 0;
         text-align: left; }
 
+.intl-tel-input .country-list {
+  text-align: left; }
+
+.intl-tel-input .country-list .country .country-name {
+  color: #000; }
+
 /*# sourceMappingURL=manifest.css.map */
\ No newline at end of file
