cleanup css and themify missing stuff

This commit is contained in:
Audric Ackermann 2020-08-25 15:57:37 +10:00
parent 031e19df63
commit 291982c2aa
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4
21 changed files with 145 additions and 351 deletions

View File

@ -28,16 +28,12 @@
-->
<script type='text/x-tmpl-mustache' id='app-loading-screen'>
<div class='content'>
<img src='images/session/full-logo.svg' class='session-full-logo' />
<div class="content session-full-logo">
<img src="images/session/brand.svg" class="session-brand-logo" />
<img src="images/session/session-text.svg" class="session-text-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'>
<div class='gutter'>
@ -49,8 +45,9 @@
<div class='conversation placeholder'>
<div class='conversation-header'></div>
<div class='container'>
<div class='content'>
<img src='images/session/full-logo.svg' class='session-full-logo' />
<div class="content session-full-logo">
<img src="images/session/brand.svg" class="session-brand-logo" />
<img src="images/session/session-text.svg" class="session-text-logo" />
</div>
</div>
</div>
@ -516,8 +513,9 @@
</head>
<body>
<div class='app-loading-screen'>
<div class='content'>
<img src='images/session/full-logo.svg' class='session-full-logo' />
<div class="content session-full-logo">
<img src="images/session/brand.svg" class="session-brand-logo" />
<img src="images/session/session-text.svg" class="session-text-logo" />
</div>
</div>

View File

@ -28,14 +28,9 @@
-->
<script type='text/x-tmpl-mustache' id='app-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='conversation-loading-screen'>
<div class='content'>
<img src='images/session/full-logo.svg' class='session-full-logo' />
<div class="content session-full-logo">
<img src="images/session/brand.svg" class="session-brand-logo" />
<img src="images/session/session-text.svg" class="session-text-logo" />
</div>
</script>
@ -49,8 +44,9 @@
<div class='conversation placeholder'>
<div class='conversation-header'></div>
<div class='container'>
<div class='content'>
<img src='images/session/full-logo.svg' class='session-full-logo' />
<div class="content session-full-logo">
<img src="images/session/brand.svg" class="session-brand-logo" />
<img src="images/session/session-text.svg" class="session-text-logo" />
</div>
</div>
</div>
@ -516,8 +512,9 @@
</head>
<body>
<div class='app-loading-screen'>
<div class='content'>
<img src='images/session/full-logo.svg' class='session-full-logo' />
<div class="content session-full-logo">
<img src="images/session/brand.svg" class="session-brand-logo" />
<img src="images/session/session-text.svg" class="session-text-logo" />
</div>
</div>

View File

@ -1,64 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 766.13068 686.10931"
height="686.10931"
width="766.13068"
xml:space="preserve"
id="svg2"
version="1.1"><metadata
id="metadata8"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
id="defs6"><clipPath
id="clipPath18"
clipPathUnits="userSpaceOnUse"><path
id="path16"
d="M 0,514.582 H 574.598 V 0 H 0 Z" /></clipPath></defs><g
transform="matrix(1.3333333,0,0,-1.3333333,0,686.10933)"
id="g10"><g
id="g12"><g
clip-path="url(#clipPath18)"
id="g14"><g
transform="translate(0.0044,25.541)"
id="g20"><path
id="path22"
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 0,0 h 19.051 c -0.105,-4.92 6.176,-10.049 21.249,-10.259 14.026,-0.104 24.807,1.78 24.807,8.27 0,14.236 -63.537,-2.407 -63.537,28.995 0,14.969 15.597,24.075 38.73,24.075 23.971,0 40.3,-10.049 40.51,-25.541 H 61.653 C 61.758,30.565 56.315,35.694 41.66,35.799 28.995,36.008 19.783,34.02 19.783,27.844 c 0,-13.713 63.434,1.465 63.434,-29.205 0,-15.074 -16.644,-24.18 -41.347,-24.18 C 16.329,-25.541 -0.314,-15.388 0,0" /></g><g
transform="translate(94.3228,74.9472)"
id="g24"><path
id="path26"
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="M 0,0 H 71.388 V -15.282 H 18.004 V -28.89 H 70.446 V -43.23 H 18.004 V -57.99 H 71.388 V -73.272 H 0 Z" /></g><g
transform="translate(175.7647,25.541)"
id="g28"><path
id="path30"
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 0,0 h 19.051 c -0.105,-4.92 6.176,-10.049 21.249,-10.259 14.026,-0.104 24.808,1.78 24.808,8.27 0,14.236 -63.538,-2.407 -63.538,28.995 0,14.969 15.597,24.075 38.73,24.075 23.971,0 40.3,-10.049 40.51,-25.541 H 61.653 c 0.106,5.025 -5.338,10.154 -19.992,10.259 -12.666,0.209 -21.878,-1.779 -21.878,-7.955 0,-13.713 63.434,1.465 63.434,-29.205 0,-15.074 -16.644,-24.18 -41.347,-24.18 C 16.329,-25.541 -0.314,-15.388 0,0" /></g><g
transform="translate(265.6855,25.541)"
id="g32"><path
id="path34"
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 0,0 h 19.051 c -0.105,-4.92 6.176,-10.049 21.249,-10.259 14.026,-0.104 24.807,1.78 24.807,8.27 0,14.236 -63.537,-2.407 -63.537,28.995 0,14.969 15.597,24.075 38.73,24.075 23.971,0 40.3,-10.049 40.51,-25.541 H 61.653 C 61.758,30.565 56.315,35.694 41.66,35.799 28.995,36.008 19.783,34.02 19.783,27.844 c 0,-13.713 63.434,1.465 63.434,-29.205 0,-15.074 -16.644,-24.18 -41.347,-24.18 C 16.329,-25.541 -0.314,-15.388 0,0" /></g><path
id="path36"
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 360.004,74.947 h 18.004 V 1.675 h -18.004 z" /><g
transform="translate(462.3799,38.3115)"
id="g38"><path
id="path40"
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="M 0,0 C 0,14.863 -10.782,23.028 -28.367,23.028 -45.849,23.028 -56.63,14.863 -56.63,0 c 0,-14.76 10.781,-23.029 28.263,-23.029 C -10.782,-23.029 0,-14.76 0,0 m -74.634,0 c 0,23.028 17.691,38.311 46.267,38.311 28.68,0 46.371,-15.283 46.371,-38.311 0,-23.029 -17.691,-38.312 -46.371,-38.312 -28.576,0 -46.267,15.283 -46.267,38.312" /></g><g
transform="translate(490.125,74.9472)"
id="g42"><path
id="path44"
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="M 0,0 H 15.073 L 66.469,-46.58 V 0 H 84.473 V -73.272 H 69.295 l -51.291,46.58 v -46.58 H 0 Z" /></g><g
transform="translate(359.124,171.1215)"
id="g46"><path
id="path48"
style="fill:#00f782;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 0,0 h -160.41 c -27.433,0 -51.071,21.037 -52.425,48.435 -1.447,29.288 21.964,53.577 50.944,53.577 h 92.385 c 5.652,0 10.234,4.582 10.234,10.234 v 75.417 L 31.62,137.296 C 55.654,123.979 70.782,98.895 71.427,71.513 72.352,32.192 39.331,0 0,0 m -173.07,183.263 c -24.034,13.317 -39.163,38.401 -39.808,65.783 -0.924,39.32 32.096,71.513 71.427,71.513 H 18.96 c 27.432,0 51.071,-21.037 52.425,-48.435 1.446,-29.288 -21.964,-53.578 -50.945,-53.578 0,0 -66.437,-0.01 -92.387,-0.015 -5.65,-0.001 -10.212,-4.581 -10.213,-10.231 l -0.018,-75.404 z M 42.719,157.329 -26.432,195.644 H 20.44 c 40.752,0 73.911,33.155 73.911,73.907 0,40.752 -33.159,73.909 -73.911,73.909 h -163.649 c -51.054,0 -92.592,-41.538 -92.592,-92.591 0,-36.412 19.785,-69.99 51.632,-87.639 l 69.15,-38.315 h -46.872 c -40.752,0 -73.91,-33.155 -73.91,-73.907 0,-40.752 33.158,-73.91 73.91,-73.91 H 1.759 c 51.054,0 92.592,41.538 92.592,92.592 0,36.412 -19.787,69.99 -51.632,87.639" /></g></g></g></g></svg>

Before

Width:  |  Height:  |  Size: 5.2 KiB

View File

@ -0,0 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1"
id="svg2" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 766.2 102.3"
style="enable-background:new 0 0 766.2 102.3;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FFFFFF;}
</style>
<g id="g12">
<g>
<g>
</g>
</g>
</g>
<g id="g14">
<g id="g20" transform="translate(0.0044,25.541)">
<path id="path22" class="st0" d="M0,42.6h25.5c-0.1,6.5,8.3,13.3,28.3,13.7c18.7,0.1,33.1-2.4,33.1-11.1
c0-18.9-84.7,3.2-84.7-38.7c0-20,20.8-32.1,51.6-32.1c32,0,53.7,13.3,54,34H82.3c0.1-6.7-7.1-13.6-26.7-13.7
C38.7-5.4,26.4-2.7,26.4,5.5c0,18.3,84.5-2,84.5,38.9c0,20.1-22.1,32.3-55.1,32.3C21.7,76.6-0.4,63.1,0,42.6"/>
</g>
<g id="g24" transform="translate(94.3228,74.9472)">
<path id="path26" class="st0" d="M31.4-72.7h95.2v20.4H55.4v18.1h69.9v19.1H55.4V4.7h71.2v20.4H31.4V-72.7z"/>
</g>
<g id="g28" transform="translate(175.7647,25.541)">
<path id="path30" class="st0" d="M58.6,42.6h25.5c-0.1,6.5,8.3,13.3,28.3,13.7c18.7,0.1,33.1-2.4,33.1-11.1
c0-18.9-84.7,3.2-84.7-38.7c0-20,20.8-32.1,51.6-32.1c32,0,53.7,13.3,54,34h-25.5c0.1-6.7-7.1-13.6-26.7-13.7
C97.3-5.4,85-2.7,85,5.5c0,18.3,84.5-2,84.5,38.9c0,20.1-22.1,32.3-55.1,32.3C80.3,76.6,58.2,63.1,58.6,42.6"/>
</g>
<g id="g32" transform="translate(265.6855,25.541)">
<path id="path34" class="st0" d="M88.6,42.6H114c-0.1,6.5,8.3,13.3,28.3,13.7c18.7,0.1,33.1-2.4,33.1-11.1
c0-18.9-84.7,3.2-84.7-38.7c0-20,20.8-32.1,51.6-32.1c32,0,53.7,13.3,54,34h-25.5c0.1-6.7-7.1-13.6-26.7-13.7
C127.2-5.4,115-2.7,115,5.5c0,18.3,84.5-2,84.5,38.9c0,20.1-22.1,32.3-55.1,32.3C110.3,76.6,88.2,63.1,88.6,42.6"/>
</g>
<path id="path36" class="st0" d="M480,2.3h24v97.6h-24V2.3z"/>
<g id="g38" transform="translate(462.3799,38.3115)">
<path id="path40" class="st0" d="M154.1,12.8c0-19.9-14.4-30.7-37.9-30.7c-23.3,0-37.7,10.9-37.7,30.7s14.4,30.7,37.7,30.7
C139.7,43.5,154.1,32.6,154.1,12.8 M54.7,12.8c0-30.7,23.6-51.1,61.7-51.1s61.7,20.4,61.7,51.1s-23.6,51.1-61.9,51.1
C78.3,63.9,54.7,43.5,54.7,12.8"/>
</g>
<g id="g42" transform="translate(490.125,74.9472)">
<path id="path44" class="st0" d="M163.4-72.7h20.1L252-10.5v-62.1h24v97.7h-20.3l-68.4-62.1v62.1h-24V-72.7z"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

@ -13,8 +13,9 @@
</head>
<body id="signal-container" class='signal index'>
<div class='app-loading-screen'>
<div class='content'>
<img src='images/session/full-logo.svg' class='session-full-logo' />
<div class="content session-full-logo">
<img src="images/session/brand.svg" class="session-brand-logo" />
<img src="images/session/session-text.svg" class="session-text-logo" />
</div>
</div>
<script type="text/javascript" src="js/index.js"></script>

View File

@ -16,7 +16,7 @@
<link href="stylesheets/manifest.css" rel="stylesheet" type="text/css" />
<style>
</style>
<script type='text/javascript' src='js/components.js'></script>
<script type='text/javascript' src='js/views/whisper_view.js'></script>
@ -25,10 +25,11 @@
</head>
<body>
<div class='app-loading-screen'>
<div class='content'>
<img src='images/session/full-logo.svg' class='session-full-logo' />
</div>
<div class="content session-full-logo">
<img src="images/session/brand.svg" class="session-brand-logo" />
<img src="images/session/session-text.svg" class="session-text-logo" />
</div>
<script type='text/javascript' src='js/password_start.js'></script>
</div>
<script type='text/javascript' src='js/password_start.js'></script>
</body>
</html>

View File

@ -265,7 +265,7 @@
box-shadow: none;
user-select: none;
cursor: pointer;
transition: 0.25s;
transition: $session-transition-duration;
&:hover {
background-color: #00d672;
@ -627,49 +627,6 @@
}
}
.conversation-loading-screen {
z-index: 99;
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
display: flex;
align-items: center;
background-color: $color-white;
.content {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
.container {
position: absolute;
left: 50%;
width: 120px;
transform: translate(-50%, 0);
}
.dot {
width: 14px;
height: 14px;
border: 3px solid $blue;
border-radius: 50%;
float: left;
margin: 0 6px;
transform: scale(0);
animation: loading 1500ms ease infinite 0ms;
&:nth-child(2) {
animation: loading 1500ms ease infinite 333ms;
}
&:nth-child(3) {
animation: loading 1500ms ease infinite 666ms;
}
}
}
.module-last-seen-indicator {
padding-top: 25px;

View File

@ -90,6 +90,7 @@ button.emoji {
&:before {
content: '';
margin-top: 5px;
display: inline-block;
width: $button-height;
height: $button-height;

View File

@ -595,7 +595,7 @@ $loading-height: 16px;
width: 100%;
height: 100%;
background-color: $blue_l;
transition: width 0.25s;
transition: width $session-transition-duration;
box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5);
}
}
@ -808,9 +808,9 @@ $loading-height: 16px;
padding: 0 1em;
background: $color-dark-85;
pointer-events: none;
-webkit-transition: 0.25s all ease;
-o-transition: 0.25s all ease;
transition: 0.25s all ease;
-webkit-transition: $session-transition-duration all ease;
-o-transition: $session-transition-duration all ease;
transition: $session-transition-duration all ease;
}
}

View File

@ -393,26 +393,6 @@ input.search {
}
}
.conversation.placeholder {
text-align: center;
user-select: none;
.container {
position: absolute;
height: 100%;
width: 100%;
display: flex;
justify-content: center;
align-items: center;
}
.content {
display: inline-block;
}
h3 {
font-size: large;
}
}
.contact.placeholder {
position: absolute;
top: 50px;

View File

@ -478,7 +478,7 @@
span {
opacity: 0.5;
transition: 0.25s;
transition: $session-transition-duration;
&:not(.module-message__metadata__badge--separator):hover {
opacity: 1;

View File

@ -106,7 +106,9 @@
margin-left: -4px;
width: 3px;
height: 6px;
background-color: $session-shade-6;
@include themify($themes) {
background: themed('clickableHovered');
}
cursor: pointer;
border-radius: 2px;
vertical-align: middle;

View File

@ -495,7 +495,9 @@ label {
.session-toast {
position: relative;
padding: $session-margin-md $session-margin-md;
background-color: rgba($session-shade-6, 0.8);
@include themify($themes) {
background: rgba(themed('cellBackground'), 0.8);
}
margin-bottom: $session-margin-md;
display: flex;
flex-direction: row;
@ -530,23 +532,31 @@ label {
line-height: $session-font-sm;
margin-bottom: $session-margin-sm;
padding-top: 0px;
color: $session-color-white;
@include themify($themes) {
color: themed('textColor');
}
padding-top: 0px;
}
.description {
font-size: $session-font-xs;
@include session-color-subtle($session-color-white);
@include themify($themes) {
@include session-color-subtle(themed('textColor'));
}
}
.toast-close {
@include session-color-subtle($session-color-white);
@include themify($themes) {
@include session-color-subtle(themed('textColor'));
}
position: absolute;
top: $session-margin-md;
right: $session-margin-md;
&:hover {
color: $session-color-white;
@include themify($themes) {
color: themed('textColor');
}
}
}
@ -577,7 +587,7 @@ label {
@include themify($themes) {
background-color: themed('modalBackground');
color: themed('textColor');
border: 1px solid themed('modalBorder');
border: 1px solid themed('borderActionPanel');
}
overflow: hidden;
display: flex;
@ -746,7 +756,7 @@ label {
box-shadow: 0 0 3px 1px rgba(0, 0, 0, 0.05), 0 3px 1px 0 rgba(0, 0, 0, 0.05),
0 2px 2px 0 rgba(0, 0, 0, 0.1), 0 3px 3px 0 rgba(0, 0, 0, 0.05);
transition: transform 0.25s ease, background-color 0.25s ease;
transition: transform $session-transition-duration ease, background-color $session-transition-duration ease;
}
&.active {
@ -770,6 +780,7 @@ label {
.react-contextmenu-item {
display: flex;
align-items: center;
transition: $session-transition-duration;
height: 25px;
padding: $session-margin-md $session-margin-sm;
@ -826,7 +837,7 @@ label {
}
&__list-container {
z-index: 200;
z-index: 99;
display: block;
position: absolute;
top: 50px;
@ -1146,11 +1157,11 @@ label {
font-size: $session-font-md;
padding: $session-margin-lg;
margin-bottom: 20px;
border-bottom: 1px solid $session-shade-5;
@include themify($themes) {
background: themed('cellBackground');
color: themed('textColor');
border-bottom: themed('borderActionPanel');
}
&.inline {
display: flex;

View File

@ -82,7 +82,7 @@
.session-button.square-outline.danger {
margin-top: auto;
width: 100%;
height: 3.5rem;
height: 51px;
flex-shrink: 0;
align-items: center;
@include themify($themes) {

View File

@ -349,13 +349,40 @@ $session-compose-margin: 20px;
}
}
.conversation.placeholder .container {
display: flex;
height: 100%;
}
.session-full-logo {
width: 250px;
height: 250px;
display: flex;
flex-direction: column;
align-items: center;
margin: auto;
.session-brand-logo {
height: 215px;
filter: brightness(0) saturate(100%) invert(75%) sepia(84%) saturate(3272%) hue-rotate(103deg) brightness(106%) contrast(103%);
}
.session-text-logo {
margin-top: 10px;
width: 250px;
@include themify($themes) {
filter: themed('filterSessionText');
}
transition: 0s;
}
}
.app-loading-screen {
@include session-dark-background;
background: #000;
.session-text-logo {
filter:none !important; // force no filter on the text of the app loading
// as the theme is not set right on the start.
// this is to avoid a text color switch on app loading.
}
}
@mixin bottom-buttons() {
@ -368,8 +395,7 @@ $session-compose-margin: 20px;
.session-button.square-outline.square.white,
.session-button.square-outline.square.danger {
flex-grow: 1;
height: 50px;
// line-height: 50px;
height: 51px;
@at-root .light-theme #{&} {
border: 1px solid $session-shade-15;

View File

@ -1,123 +0,0 @@
.settings {
user-select: none;
&.modal {
padding: 0;
background-color: transparent;
.content {
margin: 0;
margin-left: auto;
margin-right: auto;
width: 100%;
max-width: 450px;
border-radius: 0;
box-shadow: 0px 0px 0px 0px;
}
}
hr {
margin: 10px 0;
}
.device-name-settings {
text-align: center;
margin-bottom: 1em;
}
.syncSettings {
button {
float: right;
line-height: 36px;
padding: 0 20px;
margin: 0 0 20px 20px;
}
.synced_at {
font-size: $font-size-small;
color: $grey;
}
.sync_failed {
display: none;
font-size: $font-size-small;
color: red;
}
}
.blocked-user-settings {
display: flex;
flex: 1;
flex-direction: row;
align-items: center;
}
.blocked-user-settings {
select {
flex: 1;
cursor: pointer;
font-size: 14px;
}
button {
line-height: 28px;
padding: 0 20px;
margin: auto;
margin-left: 20px;
}
}
.blocked-user-settings ul {
list-style-type: none;
padding: 0;
margin: 0;
}
.wordwrap {
white-space: pre-wrap; /* CSS3 */
white-space: -moz-pre-wrap; /* Firefox */
white-space: -pre-wrap; /* Opera <7 */
white-space: -o-pre-wrap; /* Opera 7 */
word-wrap: break-word; /* IE */
}
.restart-needed {
margin-top: 1em;
}
.clear-data-settings {
button {
float: right;
line-height: 36px;
padding: 0 20px;
margin: 0 0 20px 20px;
}
.destructive {
background-color: red;
color: white;
}
}
.message-ttl-setting {
.inputs {
display: flex;
padding-top: 18px;
}
#warning {
padding-top: 12px;
font-weight: 300;
color: red;
}
input {
flex: 1;
}
label {
padding-left: 12px;
}
}
.send-link-previews-setting {
margin-top: 0.75em;
}
.description {
margin-top: 0.3em;
margin-left: 1.5em;
}
}

View File

@ -111,9 +111,6 @@ body.dark-theme {
}
}
.conversation-loading-screen {
background-color: $color-gray-95;
}
.module-last-seen-indicator__bar {
background-color: #353535;
@ -1378,26 +1375,4 @@ body.dark-theme {
color: $grey;
}
}
// _settings
hr {
border-color: $color-dark-60;
}
.syncSettings {
.synced_at {
color: $grey;
}
.sync_failed {
color: red;
}
}
.clear-data-settings {
.destructive {
background-color: red;
color: white;
}
}
}

View File

@ -25,10 +25,6 @@
$roboto: Roboto, 'Helvetica Neue', 'Source Sans Pro', 'Source Han Sans SC',
'Source Han Sans CN', 'Hiragino Sans GB', 'Hiragino Kaku Gothic',
'Microsoft Yahei UI', Helvetica, Arial, sans-serif;
$roboto-light: Roboto-Light, 'Helvetica Neue', 'Source Sans Pro Light',
'Source Han Sans SC Light', 'Source Han Sans CN Light',
'Hiragino Sans GB Light', 'Hiragino Kaku Gothic Light',
'Microsoft Yahei UI Light', Helvetica, Arial, sans-serif;
// Loki colors
$color-loki-light-gray: #e9e9e9;

View File

@ -6,10 +6,8 @@ $themes: (
unimportantButtonBackground: #0000,
border: #979797,
cellBackground: #fcfcfc,
separator: #36383c,
buttonBackground: #fcfcfc,
modalBackground: #fcfcfc,
modalBorder: #212121,
fakeChatBubbleBackground: #f5f5f5,
// input
inputBackground: #8e8e931f,
@ -47,6 +45,7 @@ $themes: (
pillDividerTextColor: #555,
// context menu
contextMenuBackground: #f5f5f5,
filterSessionText: brightness(0) saturate(100%),
),
dark: (
accent: #00f782,
@ -55,10 +54,8 @@ $themes: (
unimportantButtonBackground: #323232,
border: #979797,
cellBackground: #1b1b1b,
separator: #36383c,
buttonBackground: #1b1b1b,
modalBackground: #101011,
modalBorder: #212121,
fakeChatBubbleBackground: #212121,
// input
inputBackground: #8e8e931f,
@ -96,6 +93,7 @@ $themes: (
pillDividerTextColor: #a0a0a0,
// context menu
contextMenuBackground: #212121,
filterSessionText: none,
),
);

View File

@ -18,14 +18,9 @@
</div>
<script type="text/x-tmpl-mustache" id="app-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="conversation-loading-screen">
<div class="content">
<img src="images/session/full-logo.svg" class="session-full-logo" />
<div class="content session-full-logo">
<img src="images/session/brand.svg" class="session-brand-logo" />
<img src="images/session/session-text.svg" class="session-text-logo" />
</div>
</script>
@ -38,8 +33,9 @@
<div class="conversation placeholder">
<div class="conversation-header"></div>
<div class="container">
<div class="content">
<img src="images/session/full-logo.svg" class="session-full-logo" />
<div class="content session-full-logo">
<img src="images/session/brand.svg" class="session-brand-logo" />
<img src="images/session/session-text.svg" class="session-text-logo" />
</div>
</div>
</div>

View File

@ -24,12 +24,9 @@ export class MessageView extends React.Component {
<div className="conversation placeholder">
<div className="conversation-header" />
<div className="container">
<div className="content">
<img
src="images/session/full-logo.svg"
className="session-full-logo"
alt="full-brand-logo"
/>
<div className="content session-full-logo">
<img src="images/session/brand.svg" className="session-brand-logo" alt="full-brand-logo" />
<img src="images/session/session-text.svg" className="session-text-logo" alt="full-brand-logo"/>
</div>
</div>
</div>