Skip to content

Commit

Permalink
cleanup css and themify missing stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
@Bilb
Bilb committed Aug 25, 2020
1 parent 031e19d commit 291982c
Show file tree
Hide file tree
Showing 21 changed files with 145 additions and 351 deletions.
20 changes: 9 additions & 11 deletions background.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'>
Expand All @@ -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>
Expand Down Expand Up @@ -516,8 +513,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 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>

Expand Down
21 changes: 9 additions & 12 deletions background_test.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand Down Expand Up @@ -516,8 +512,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 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>

Expand Down
64 changes: 0 additions & 64 deletions images/session/full-logo.svg
View file

This file was deleted.

45 changes: 45 additions & 0 deletions images/session/session-text.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
11 changes: 6 additions & 5 deletions password.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
45 changes: 1 addition & 44 deletions stylesheets/_conversation.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@
box-shadow: none;
user-select: none;
cursor: pointer;
transition: 0.25s;
transition: $session-transition-duration;

&:hover {
background-color: #00d672;
Expand Down Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions stylesheets/_emoji.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ button.emoji {

&:before {
content: '';
margin-top: 5px;
display: inline-block;
width: $button-height;
height: $button-height;
Expand Down
8 changes: 4 additions & 4 deletions stylesheets/_global.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down Expand Up @@ -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;
}
}

Expand Down
20 changes: 0 additions & 20 deletions stylesheets/_index.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion stylesheets/_modules.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@

span {
opacity: 0.5;
transition: 0.25s;
transition: $session-transition-duration;

&:not(.module-message__metadata__badge--separator):hover {
opacity: 1;
Expand Down
4 changes: 3 additions & 1 deletion stylesheets/_session-slider.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading

0 comments on commit 291982c

Please sign in to comment.