update loading screens with session subtitle

This commit is contained in:
Audric Ackermann 2020-01-03 16:42:43 +11:00
parent 9f2fe45777
commit 634aaa36d4
6 changed files with 28 additions and 53 deletions

View File

@ -30,23 +30,14 @@
<script type='text/x-tmpl-mustache' id='app-loading-screen'> <script type='text/x-tmpl-mustache' id='app-loading-screen'>
<div class='content'> <div class='content'>
<img src='images/session/brand.svg' class='session-filter-color-green session-logo-128' /> <img src='images/session/brand.svg' class='session-filter-color-green session-logo-128' />
<div class='container'> <p class='session-logo-text'>SESSION</p>
<span class='dot'></span>
<span class='dot'></span>
<span class='dot'></span>
</div>
<div class='message'>{{ message }}</div>
</div> </div>
</script> </script>
<script type='text/x-tmpl-mustache' id='conversation-loading-screen'> <script type='text/x-tmpl-mustache' id='conversation-loading-screen'>
<div class='content'> <div class='content'>
<img src='images/session/brand.svg' class='session-filter-color-green session-logo-128' /> <img src='images/session/brand.svg' class='session-filter-color-green session-logo-128' />
<div class='container'> <p class='session-logo-text'>SESSION</p>
<span class='dot'></span>
<span class='dot'></span>
<span class='dot'></span>
</div>
</div> </div>
</script> </script>
@ -63,8 +54,7 @@
<div class='container'> <div class='container'>
<div class='content'> <div class='content'>
<img src='images/session/brand.svg' class='session-filter-color-green session-logo-128' /> <img src='images/session/brand.svg' class='session-filter-color-green session-logo-128' />
<h3>{{ welcomeToSignal }}</h3> <p class='session-logo-text'>SESSION</p>
<p>{{ selectAContact }}</p>
</div> </div>
</div> </div>
</div> </div>
@ -738,13 +728,7 @@
<div class='app-loading-screen'> <div class='app-loading-screen'>
<div class='content'> <div class='content'>
<img src='images/session/brand.svg' class='session-filter-color-green session-logo-128' /> <img src='images/session/brand.svg' class='session-filter-color-green session-logo-128' />
<div class='container'> <p class='session-logo-text'>SESSION</p>
<span class='dot'></span>
<span class='dot'></span>
<span class='dot'></span>
</div>
<div class='message'></div>
</div>
</div> </div>
<script type='text/javascript' src='js/background.js'></script> <script type='text/javascript' src='js/background.js'></script>

View File

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

View File

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

View File

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

View File

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

View File

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