Skip to content

Commit

Permalink
update loading screen logo
Browse files Browse the repository at this point in the history
  • Loading branch information
Bilb committed Jan 15, 2020
1 parent 76305bf commit 3dd175f
Show file tree
Hide file tree
Showing 6 changed files with 80 additions and 31 deletions.
13 changes: 8 additions & 5 deletions background.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,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' />
<p class='session-logo-text'>SESSION</p>
<img src='images/session/full-logo.svg' class='session-full-logo' />
</div>
</script>

<script type='text/x-tmpl-mustache' id='conversation-loading-screen'>
<div class='content'>
<img src='images/session/full-logo.svg' class='session-full-logo' />
</div>
</script>

<script type='text/x-tmpl-mustache' id='two-column'>
Expand All @@ -50,9 +52,7 @@
<div class='conversation-header'></div>
<div class='container'>
<div class='content'>
<img src='images/session/brand.svg' class='session-filter-color-green session-logo-128' />
<p class='session-logo-text'>SESSION</p>

<img src='images/session/full-logo.svg' class='session-full-logo' />
</div>
</div>
</div>
Expand Down Expand Up @@ -618,6 +618,9 @@ <h3>{{ message }}</h3>
</head>
<body>
<div class='app-loading-screen'>
<div class='content'>
<img src='images/session/full-logo.svg' class='session-full-logo' />
</div>
</div>

<script type='text/javascript' src='js/background.js'></script>
Expand Down
64 changes: 64 additions & 0 deletions images/session/full-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
<body id="signal-container" class='signal index'>
<div class='app-loading-screen'>
<div class='content'>
<img src='images/session/brand.svg' class='session-filter-color-green session-logo-128' />
<p class='session-logo-text'>SESSION</p>
<img src='images/session/full-logo.svg' class='session-full-logo' />
</div>
</div>
<script type="text/javascript" src="js/index.js"></script>
Expand Down
5 changes: 1 addition & 4 deletions password.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,7 @@ <h2>{{ title }}</h2>
<body>
<div class='app-loading-screen'>
<div class='content'>
<img src='images/session/brand.svg' class='session-filter-color-green session-logo-128' />
<div class='session-content-accent-text'>
<p class='title'>SESSION</p>
</div>
<img src='images/session/full-logo.svg' class='session-full-logo' />
</div>
</div>
<script type='text/javascript' src='js/password_start.js'></script>
Expand Down
17 changes: 3 additions & 14 deletions stylesheets/_session_theme_dark_left_pane.scss
Original file line number Diff line number Diff line change
Expand Up @@ -243,20 +243,9 @@ $session-compose-margin: 20px;
}
}

.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;
}
.session-full-logo {
width: 250px;
height: 250px;
}

.app-loading-screen {
Expand Down
9 changes: 3 additions & 6 deletions test/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,13 @@

<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' />
<p class='session-logo-text'>SESSION</p>
<img src='images/session/full-logo.svg' class='session-full-logo' />
</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' />
<p class='session-logo-text'>SESSION</p>
<img src='images/session/full-logo.svg' class='session-full-logo' />
</div>
</script>

Expand All @@ -41,8 +39,7 @@
<div class='conversation-header'></div>
<div class='container'>
<div class='content'>
<img src='images/session/brand.svg' class='session-filter-color-green session-logo-128' />
<p class='session-logo-text'>SESSION</p>
<img src='images/session/full-logo.svg' class='session-full-logo' />
</div>
</div>
</div>
Expand Down

0 comments on commit 3dd175f

Please sign in to comment.