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

More themeing

Browse Source 
Restyle message input and welcome screen
Cleanup search, headers

// FREEBIE
pull/749/head
lilia 9 years ago
parent 2e3db91b30
commit b5191e78c3
7 changed files with 160 additions and 64 deletions
Show Stats Download Patch File Download Diff File

9
background.html
Unescape Escape View File

@ -33,9 +33,12 @@
</div>
<div class='conversation-stack'>
<div class='conversation placeholder'>
<img src='/images/icon_128.png' />
<h3>{{ welcomeToSignal }}</h3>
<p>{{ selectAContact }}</p>
<div class='conversation-header'></div>
<div class='content'>
<img src='/images/icon_128.png' />
<h3>{{ welcomeToSignal }}</h3>
<p>{{ selectAContact }}</p>
</div>
</div>
</div>
</script>

3
js/views/conversation_view.js
Unescape Escape View File

@ -337,7 +337,8 @@
$bottomBar.outerHeight(
this.$messageField.outerHeight() +
$attachmentPreviews.outerHeight() + 11);
$attachmentPreviews.outerHeight() +
parseInt($bottomBar.css('min-height')));
this.view.scrollToBottomIfNeeded();
},

1
stylesheets/_global.scss
Unescape Escape View File

@ -196,6 +196,7 @@ $avatar-size: 44px;
text-overflow: ellipsis;
color: white;
font-size: 18px;
@include avatar-colors;
}
.group-info-input {

4
stylesheets/_index.scss
Unescape Escape View File

@ -224,7 +224,9 @@ input.search {
.conversation.placeholder {
text-align: center;
padding: 100px 36px;
.content {
padding: 100px 36px;
}
h3 {
font-size: large;

19
stylesheets/_mixins.scss
Unescape Escape View File

@ -15,3 +15,22 @@
@include color-svg($svg, black);
}
}
@mixin avatar-colors {
&.red { background-color: $material_red ; }
&.pink { background-color: $material_pink ; }
&.purple { background-color: $material_purple ; }
&.deep_purple { background-color: $material_deep_purple ; }
&.indigo { background-color: $material_indigo ; }
&.blue { background-color: $material_blue ; }
&.light_blue { background-color: $material_light_blue ; }
&.cyan { background-color: $material_cyan ; }
&.teal { background-color: $material_teal ; }
&.green { background-color: $material_green ; }
&.light_green { background-color: $material_light_green ; }
&.orange { background-color: $material_orange ; }
&.deep_orange { background-color: $material_deep_orange ; }
&.amber { background-color: $material_amber ; }
&.blue_grey { background-color: $material_blue_grey ; }
&.grey { background-color: #999999 ; }
&.default { background-color: $blue ; }
}

53
stylesheets/_themes.scss
Unescape Escape View File

@ -24,30 +24,50 @@
.ios {
#header {
height: 64px;
height: $header-height;
border-bottom: 1px solid rgba(0,0,0,0.05);
background-color: $grey_l;
color: $grey_d;
h1 { display: none; }
}
.gutter .content {
height: calc(100% - #{$header-height});
}
.tool-bar {
float: left;
padding: 15px;
}
textarea.send-message,
input.search {
border-radius: 5px;
width: 220px;
height: 34px;
padding-left: 30px;
line-height: 34px;
background-color: #dddddd;
}
.conversation-header {
background-color: $grey_l;
color: $grey_d;
border-color: rgba(0,0,0,0.05);
.conversation-title {
line-height: $header-height;
}
.avatar { display: none; }
}
button.back {
@include header-icon-black('/images/back.svg');
}
.menu .hamburger {
@include header-icon-black('/images/menu.svg');
}
.bottom-bar {
padding: 15px;
min-height: 30px;
form.send {
border-radius: 5px;
}
}
.control .content {
padding: 10px;
@ -102,11 +122,21 @@
color: $grey_d;
}
}
.conversation.placeholder .conversation-header {
display: none;
}
.conversation-header, .bubble {
@include avatar-colors;
}
.bottom-bar {
min-height: 10px;
}
.bubble {
padding: 9px 12px;
border-radius: $border-radius;
box-shadow: 0 3px 3px -4px black;
}
.outgoing .bubble {
background-color: $grey_l;
}
@ -116,22 +146,3 @@
}
}
.avatar, .android .conversation-header, .android .bubble {
&.red { background-color: $material_red ; }
&.pink { background-color: $material_pink ; }
&.purple { background-color: $material_purple ; }
&.deep_purple { background-color: $material_deep_purple ; }
&.indigo { background-color: $material_indigo ; }
&.blue { background-color: $material_blue ; }
&.light_blue { background-color: $material_light_blue ; }
&.cyan { background-color: $material_cyan ; }
&.teal { background-color: $material_teal ; }
&.green { background-color: $material_green ; }
&.light_green { background-color: $material_light_green ; }
&.orange { background-color: $material_orange ; }
&.deep_orange { background-color: $material_deep_orange ; }
&.amber { background-color: $material_amber ; }
&.blue_grey { background-color: $material_blue_grey ; }
&.grey { background-color: #999999 ; }
&.default { background-color: $blue ; }
}

135
stylesheets/manifest.css
Unescape Escape View File

@ -191,6 +191,40 @@ img.emoji {
text-overflow: ellipsis;
color: white;
font-size: 18px; }
.avatar.red {
background-color: #EF5350; }
.avatar.pink {
background-color: #EC407A; }
.avatar.purple {
background-color: #AB47BC; }
.avatar.deep_purple {
background-color: #7E57C2; }
.avatar.indigo {
background-color: #5C6BC0; }
.avatar.blue {
background-color: #2196F3; }
.avatar.light_blue {
background-color: #03A9F4; }
.avatar.cyan {
background-color: #00BCD4; }
.avatar.teal {
background-color: #009688; }
.avatar.green {
background-color: #4CAF50; }
.avatar.light_green {
background-color: #7CB342; }
.avatar.orange {
background-color: #FF9800; }
.avatar.deep_orange {
background-color: #FF5722; }
.avatar.amber {
background-color: #FFB300; }
.avatar.blue_grey {
background-color: #607D8B; }
.avatar.grey {
background-color: #999999; }
.avatar.default {
background-color: #2090ea; }
.group-info-input {
background: white; }
@ -781,8 +815,9 @@ input.search {
left: -30px; }
.conversation.placeholder {
text-align: center;
padding: 100px 36px; }
text-align: center; }
.conversation.placeholder .content {
padding: 100px 36px; }
.conversation.placeholder h3 {
font-size: large; }
@ -1274,18 +1309,34 @@ li.entry .error-icon-container {
color: #454545; }
.ios #header h1 {
display: none; }
.ios .gutter .content {
height: calc(100% - 64px); }
.ios .tool-bar {
float: left;
padding: 15px; }
.ios textarea.send-message,
.ios input.search {
border-radius: 5px;
width: 220px;
height: 34px;
line-height: 34px; }
padding-left: 30px;
line-height: 34px;
background-color: #dddddd; }
.ios .conversation-header {
background-color: #f3f3f3;
color: #454545;
border-color: rgba(0, 0, 0, 0.05); }
.ios .conversation-header .conversation-title {
line-height: 64px; }
.ios .conversation-header .avatar {
display: none; }
.ios button.back {
-webkit-mask: url("/images/back.svg") no-repeat center;
-webkit-mask-size: 100%;
background-color: rgba(0, 0, 0, 0.5); }
.ios button.back:focus, .ios button.back:hover {
-webkit-mask: url("/images/back.svg") no-repeat center;
-webkit-mask-size: 100%;
background-color: black; }
.ios .menu .hamburger {
-webkit-mask: url("/images/menu.svg") no-repeat center;
-webkit-mask-size: 100%;
@ -1294,6 +1345,11 @@ li.entry .error-icon-container {
-webkit-mask: url("/images/menu.svg") no-repeat center;
-webkit-mask-size: 100%;
background-color: black; }
.ios .bottom-bar {
padding: 15px;
min-height: 30px; }
.ios .bottom-bar form.send {
border-radius: 5px; }
.ios .control .content {
padding: 10px; }
.ios .bubble .content .body {
@ -1337,56 +1393,59 @@ li.entry .error-icon-container {
.android #header.inactive {
background-color: #f3f3f3;
color: #454545; }
.android .bubble {
padding: 9px 12px;
border-radius: 5px;
box-shadow: 0 3px 3px -4px black; }
.android .outgoing .bubble {
background-color: #f3f3f3; }
.android .incoming .bubble, .android .incoming .bubble .meta {
color: white; }
.android .incoming .bubble::selection, .android .incoming .bubble a::selection, .android .incoming .bubble .content::selection, .android .incoming .bubble .content a::selection {
background: white;
color: #454545; }
.android .incoming .bubble::-moz-selection, .android .incoming .bubble a::-moz-selection, .android .incoming .bubble .content::-moz-selection, .android .incoming .bubble .content a::-moz-selection {
background: white;
color: #454545; }
.android .incoming .bubble a, .android .incoming .bubble .attachments a, .android .incoming .bubble .content a {
color: #f3f3f3; }
.avatar.red, .android .conversation-header.red, .android .bubble.red {
.android .conversation.placeholder .conversation-header {
display: none; }
.android .conversation-header.red, .android .bubble.red {
background-color: #EF5350; }
.avatar.pink, .android .conversation-header.pink, .android .bubble.pink {
.android .conversation-header.pink, .android .bubble.pink {
background-color: #EC407A; }
.avatar.purple, .android .conversation-header.purple, .android .bubble.purple {
.android .conversation-header.purple, .android .bubble.purple {
background-color: #AB47BC; }
.avatar.deep_purple, .android .conversation-header.deep_purple, .android .bubble.deep_purple {
.android .conversation-header.deep_purple, .android .bubble.deep_purple {
background-color: #7E57C2; }
.avatar.indigo, .android .conversation-header.indigo, .android .bubble.indigo {
.android .conversation-header.indigo, .android .bubble.indigo {
background-color: #5C6BC0; }
.avatar.blue, .android .conversation-header.blue, .android .bubble.blue {
.android .conversation-header.blue, .android .bubble.blue {
background-color: #2196F3; }
.avatar.light_blue, .android .conversation-header.light_blue, .android .bubble.light_blue {
.android .conversation-header.light_blue, .android .bubble.light_blue {
background-color: #03A9F4; }
.avatar.cyan, .android .conversation-header.cyan, .android .bubble.cyan {
.android .conversation-header.cyan, .android .bubble.cyan {
background-color: #00BCD4; }
.avatar.teal, .android .conversation-header.teal, .android .bubble.teal {
.android .conversation-header.teal, .android .bubble.teal {
background-color: #009688; }
.avatar.green, .android .conversation-header.green, .android .bubble.green {
.android .conversation-header.green, .android .bubble.green {
background-color: #4CAF50; }
.avatar.light_green, .android .conversation-header.light_green, .android .bubble.light_green {
.android .conversation-header.light_green, .android .bubble.light_green {
background-color: #7CB342; }
.avatar.orange, .android .conversation-header.orange, .android .bubble.orange {
.android .conversation-header.orange, .android .bubble.orange {
background-color: #FF9800; }
.avatar.deep_orange, .android .conversation-header.deep_orange, .android .bubble.deep_orange {
.android .conversation-header.deep_orange, .android .bubble.deep_orange {
background-color: #FF5722; }
.avatar.amber, .android .conversation-header.amber, .android .bubble.amber {
.android .conversation-header.amber, .android .bubble.amber {
background-color: #FFB300; }
.avatar.blue_grey, .android .conversation-header.blue_grey, .android .bubble.blue_grey {
.android .conversation-header.blue_grey, .android .bubble.blue_grey {
background-color: #607D8B; }
.avatar.grey, .android .conversation-header.grey, .android .bubble.grey {
.android .conversation-header.grey, .android .bubble.grey {
background-color: #999999; }
.avatar.default, .android .conversation-header.default, .android .bubble.default {
.android .conversation-header.default, .android .bubble.default {
background-color: #2090ea; }
.android .bottom-bar {
min-height: 10px; }
.android .bubble {
padding: 9px 12px;
border-radius: 5px;
box-shadow: 0 3px 3px -4px black; }
.android .outgoing .bubble {
background-color: #f3f3f3; }
.android .incoming .bubble, .android .incoming .bubble .meta {
color: white; }
.android .incoming .bubble::selection, .android .incoming .bubble a::selection, .android .incoming .bubble .content::selection, .android .incoming .bubble .content a::selection {
background: white;
color: #454545; }
.android .incoming .bubble::-moz-selection, .android .incoming .bubble a::-moz-selection, .android .incoming .bubble .content::-moz-selection, .android .incoming .bubble .content a::-moz-selection {
background: white;
color: #454545; }
.android .incoming .bubble a, .android .incoming .bubble .attachments a, .android .incoming .bubble .content a {
color: #f3f3f3; }
/*# sourceMappingURL=manifest.css.map */

Write Preview
Loading…
Cancel
Save