A number of fixes for loading screen, recent rebase

FREEBIE
8 years ago · eaf31705cc
parent 854374dc7c
commit eaf31705cc
5 changed files with 14 additions and 6 deletions
--- 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>
--- 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');
--- 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));
--- 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;
--- 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 */