keejef
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop
2
0
Fork 0
Code Issues 8 Projects Releases Wiki Activity

Added a section below conversation list.

Browse Source 
Fixed scrolling on conversations.
pull/64/head
Mikunj 6 years ago
parent f900fc496d
commit 62135a1810
8 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File

13
background.html
Unescape Escape View File

@ -20,7 +20,7 @@
style-src 'self' 'unsafe-inline';"
>
<title>Loki Messenger</title>
<link href='images/icon_128.png' rel='shortcut icon'>
<link href='images/loki/loki_icon_128.png' rel='shortcut icon'>
<link href="stylesheets/manifest.css" rel="stylesheet" type="text/css" />
<!--
@ -29,7 +29,7 @@
<script type='text/x-tmpl-mustache' id='app-loading-screen'>
<div class='content'>
<img src='images/icon_128.png'>
<img src='images/loki/loki_icon_128.png'>
<div class='container'>
<span class='dot'></span>
<span class='dot'></span>
@ -40,7 +40,7 @@
</script>
<script type='text/x-tmpl-mustache' id='conversation-loading-screen'>
<div class='content'>
<img src='images/icon_128.png'>
<img src='images/loki/loki_icon_128.png'>
<div class='container'>
<span class='dot'></span>
<span class='dot'></span>
@ -62,6 +62,9 @@
<div class='new-contact contact hide'></div>
</div>
</div>
<div class='loki'>
<img src='images/loki/loki_icon_text.png'>
</div>
</div>
<div class='identity-key-placeholder'></div>
<div class='underneathIdentityWrapper'>
@ -70,7 +73,7 @@
<div class='conversation-header'></div>
<div class='container'>
<div class='content'>
<img src='images/icon_128.png' />
<img src='images/loki/loki_icon_128.png' />
<h3>{{ welcomeToSignal }}</h3>
<p>{{ selectAContact }}</p>
</div>
@ -673,7 +676,7 @@
<body>
<div class='app-loading-screen'>
<div class='content'>
<img src='images/icon_128.png'>
<img src='images/loki/loki_icon_128.png'>
<div class='container'>
<span class='dot'></span>
<span class='dot'></span>

BIN
images/loki/loki_icon.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 131 KiB

BIN
images/loki/loki_icon_128.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.7 KiB

BIN
images/loki/loki_icon_text.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 80 KiB

4
index.html
Unescape Escape View File

@ -7,14 +7,14 @@
<title>Signal</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href='/images/icon_128.png' rel='shortcut icon'>
<link href='/images/loki/loki_icon_128.png' rel='shortcut icon'>
<link href="/stylesheets/manifest.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="js/chromium.js"></script>
</head>
<body id="signal-container" class='signal index'>
<div class='app-loading-screen'>
<div class='content'>
<img src='/images/icon_128.png'>
<img src='/images/loki/loki_icon_128.png'>
<div class='container'>
<span class='dot'></span>
<span class='dot'></span>

3
js/background.js
Unescape Escape View File

@ -72,7 +72,6 @@
'hourglass_empty.svg',
'hourglass_full.svg',
'icon_1024.png',
'icon_128.png',
'icon_16.png',
'icon_250.png',
'icon_256.png',
@ -118,6 +117,8 @@
'warning.svg',
'x.svg',
'x_white.svg',
'loki/loki_icon_text.png',
'loki/loki_icon_128.png',
]);
// We add this to window here because the default Node context is erased at the end

21
stylesheets/_index.scss
Unescape Escape View File

@ -29,11 +29,32 @@
border: 2px solid $color-gray-02;
}
display: flex;
flex-direction: column;
float: left;
width: 300px;
.tool-bar {
margin-top: 8px;
}
.content {
overflow-y: scroll;
max-height: calc(100% - 88px);
min-height: 0px;
flex: 1 1 auto;
}
.loki {
display: flex;
justify-content: center;
align-items: center;
height: 70px;
background: $color-light-35;
img {
max-width: 60%;
max-height: 60%;
}
}
}
.network-status-container {

6
test/index.html
Unescape Escape View File

@ -18,7 +18,7 @@
</div>
<script type='text/x-tmpl-mustache' id='app-loading-screen'>
<div class='content'>
<img src='/images/icon_128.png'>
<img src='/images/loki/loki_icon_128.png'>
<div class='container'>
<span class='dot'></span>
<span class='dot'></span>
@ -28,7 +28,7 @@
</script>
<script type='text/x-tmpl-mustache' id='conversation-loading-screen'>
<div class='content'>
<img src='/images/icon_128.png'>
<img src='/images/loki/loki_icon_128.png'>
<div class='container'>
<span class='dot'></span>
<span class='dot'></span>
@ -57,7 +57,7 @@
<div class='conversation placeholder'>
<div class='conversation-header'></div>
<div class='content'>
<img src='/images/icon_128.png' />
<img src='/images/loki/loki_icon_128.png' />
<h3>{{ welcomeToSignal }}</h3>
<p>{{ selectAContact }}</p>
</div>

Write Preview
Loading…
Cancel
Save