update loading screens with session subtitle

winter0019 · Jan 3, 2020 · 634aaa3 · 634aaa3
1 parent 9f2fe45
commit 634aaa3
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 53 deletions.
diff --git a/background.html b/background.html
@@ -30,23 +30,14 @@
   <script type='text/x-tmpl-mustache' id='app-loading-screen'>
     <div class='content'>
       <img src='images/session/brand.svg' class='session-filter-color-green session-logo-128' />
-      <div class='container'>
-        <span class='dot'></span>
-        <span class='dot'></span>
-        <span class='dot'></span>
-      </div>
-      <div class='message'>{{ message }}</div>
+        <p class='session-logo-text'>SESSION</p>
     </div>
   </script>
 
   <script type='text/x-tmpl-mustache' id='conversation-loading-screen'>
     <div class='content'>
       <img src='images/session/brand.svg' class='session-filter-color-green session-logo-128' />
-      <div class='container'>
-        <span class='dot'></span>
-        <span class='dot'></span>
-        <span class='dot'></span>
-      </div>
+      <p class='session-logo-text'>SESSION</p>
     </div>
   </script>
 
@@ -63,8 +54,7 @@
         <div class='container'>
           <div class='content'>
             <img src='images/session/brand.svg' class='session-filter-color-green session-logo-128' />
-            <h3>{{ welcomeToSignal }}</h3>
-            <p>{{ selectAContact }}</p>
+            <p class='session-logo-text'>SESSION</p>
           </div>
         </div>
       </div>
@@ -738,13 +728,7 @@ <h3>{{ message }}</h3>
   <div class='app-loading-screen'>
     <div class='content'>
       <img src='images/session/brand.svg' class='session-filter-color-green session-logo-128' />
-      <div class='container'>
-        <span class='dot'></span>
-        <span class='dot'></span>
-        <span class='dot'></span>
-      </div>
-      <div class='message'></div>
-    </div>
+      <p class='session-logo-text'>SESSION</p>
   </div>
 
   <script type='text/javascript' src='js/background.js'></script>

diff --git a/index.html b/index.html
@@ -15,12 +15,7 @@
         <div class='app-loading-screen'>
             <div class='content'>
               <img src='images/session/brand.svg' class='session-filter-color-green session-logo-128' />
-              <div class='container'>
-                <span class='dot'></span>
-                <span class='dot'></span>
-                <span class='dot'></span>
-              </div>
-              <div class='message'></div>
+              <p class='session-logo-text'>SESSION</p>
             </div>
         </div>
         <script type="text/javascript" src="js/index.js"></script>

diff --git a/js/views/inbox_view.js b/js/views/inbox_view.js
@@ -66,11 +66,7 @@
   Whisper.AppLoadingScreen = Whisper.View.extend({
     templateName: 'app-loading-screen',
     className: 'app-loading-screen',
-    updateProgress(count) {
-      if (count > 0) {
-        const message = i18n('loadingMessages', count.toString());
-        this.$('.message').text(message);
-      }
+    updateProgress() {
     },
     render_attributes: {
       message: i18n('loading'),

diff --git a/password.html b/password.html
@@ -78,12 +78,9 @@ <h2>{{ title }}</h2>
   <div class='app-loading-screen'>
       <div class='content'>
         <img src='images/session/brand.svg' class='session-filter-color-green session-logo-128' />
-        <div class='container'>
-          <span class='dot'></span>
-          <span class='dot'></span>
-          <span class='dot'></span>
+        <div class='session-content-accent-text'>
+          <p class='title'>SESSION</p>
         </div>
-        <div class='message'></div>
       </div>
     </div>
     <script type='text/javascript' src='js/password_start.js'></script>

diff --git a/stylesheets/_session_theme_dark_left_pane.scss b/stylesheets/_session_theme_dark_left_pane.scss
@@ -235,12 +235,25 @@ $session-compose-margin: 20px;
   }
 }
 
-.session-logo-128 {
-  @include session-filter-color-green();
-  width: 128px;
-  height: 128px;
+.session-logo{
+
+  &-128 {
+    @include session-filter-color-green();
+    width: 128px;
+    height: 128px;
+  }
+
+  &-text {
+    font-size: 70px;
+    font-weight: bold;
+    margin:0px;
+    color: $session-color-white;
+    font-family: $session-font-family;
+  }
 }
 
+
+
 .app-loading-screen {
   @include session-dark-background;
 }

diff --git a/test/index.html b/test/index.html
@@ -20,23 +20,14 @@
   <script type='text/x-tmpl-mustache' id='app-loading-screen'>
     <div class='content'>
         <img src='images/session/brand.svg' class='session-filter-color-green session-logo-128' />
-        <div class='container'>
-        <span class='dot'></span>
-        <span class='dot'></span>
-        <span class='dot'></span>
-      </div>
-      <div class='message'>{{ message }}</div>
+        <p class='session-logo-text'>SESSION</p>
     </div>
   </script>
 
   <script type='text/x-tmpl-mustache' id='conversation-loading-screen'>
     <div class='content'>
       <img src='images/session/brand.svg' class='session-filter-color-green session-logo-128' />
-            <div class='container'>
-        <span class='dot'></span>
-        <span class='dot'></span>
-        <span class='dot'></span>
-      </div>
+      <p class='session-logo-text'>SESSION</p>
     </div>
   </script>
 
@@ -51,8 +42,7 @@
         <div class='container'>
           <div class='content'>
             <img src='images/session/brand.svg' class='session-filter-color-green session-logo-128' />
-            <h3>{{ welcomeToSignal }}</h3>
-            <p>{{ selectAContact }}</p>
+            <p class='session-logo-text'>SESSION</p>
           </div>
         </div>
       </div>