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

Optimisations and SASS simplifcation

Browse Source
pull/689/head
Vincent 5 years ago
parent 2bdc0579c3
commit 02d23e972c
5 changed files with 107 additions and 74 deletions
Show Stats Download Patch File Download Diff File

34
js/models/conversations.js
Unescape Escape View File

@ -236,40 +236,20 @@
const messageSelected = this.selectedMessages.size > 0;
if (messageSelected) {
$('.messages li, .messages > div').css({
opacity: '0.3',
});
$('.message-selection-overlay').css({
display: 'block',
'z-index': '1',
});
$('.module-conversation-header').css({
opacity: '0.15',
'pointer-events': 'none',
});
$('.messages li, .messages > div').addClass('shadowed');
$('.message-selection-overlay').addClass('overlay');
$('.module-conversation-header').addClass('overlayed');
let messageId;
// eslint-disable-next-line no-restricted-syntax
for (const item of this.selectedMessages) {
messageId = item.propsForMessage.id;
$(`#${messageId}`).css({
opacity: '1',
});
$(`#${messageId}`).removeClass('shadowed');
}
} else {
$('.messages li, .messages > div').css({
opacity: '1',
});
$('.message-selection-overlay').css({
display: 'none',
'z-index': '0',
});
$('.module-conversation-header').css({
opacity: '1',
'pointer-events': 'auto',
});
$('.messages li, .messages > div').removeClass('shadowed');
$('.message-selection-overlay').removeClass('overlay');
$('.module-conversation-header').removeClass('overlayed');
}
},

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

@ -1405,18 +1405,16 @@
deleteSelectedMessages() {
const selected = Array.from(this.model.selectedMessages);
const isModerator = this.model.isModerator(this.model.OUR_NUMBER);
let isAllOurs = true;
const isAllOurs = selected.every(
message => message.attributes.source === message.OUR_NUMBER
);
// eslint-disable-next-line no-restricted-syntax
for (const message of selected) {
isAllOurs = message.attributes.source === message.OUR_NUMBER;
if (!isAllOurs && !isModerator) {
const toast = new Whisper.MessageDeletionForbiddenToast();
toast.$el.appendTo(this.$el);
toast.render();
if (!isAllOurs && !isModerator) {
const toast = new Whisper.MessageDeletionForbiddenToast();
toast.$el.appendTo(this.$el);
toast.render();
return;
}
return;
}
this.deleteMessages(selected, () => {

15
stylesheets/_session.scss
Unescape Escape View File

@ -62,6 +62,9 @@ $session-color-primary: $session-shade-13;
$session-color-secondary: $session-shade-16;
$session-color-warning: $session-shade-17;
$session-shadow-opacity: 0.15;
$session-overlay-opacity: 0.3;
@mixin session-color-subtle($color) {
color: rgba($color, 0.6);
}
@ -90,6 +93,18 @@ $session-dark-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.37);
$session_message-container-border-radius: 5px;
.shadowed {
opacity: $session-shadow-opacity;
}
.overlayed {
opacity: $session-overlay-opacity;
pointer-events: none;
}
.overlay {
display: block !important;
z-index: 1;
}
.button-group > div {
margin-left: 5px;
margin-right: 5px;

68
stylesheets/_session_theme_dark.scss
Unescape Escape View File

@ -1,52 +1,56 @@
// Messages
.dark-theme {
.module-conversation-header {
border-bottom: none;
background-color: $session-shade-4;
}
.discussion-container {
background-image: $session-gradient-black;
}
.module-conversation-header {
border-bottom: none;
}
.module-message {
&__author,
&__metadata__badge,
&__metadata__date--incoming,
&__metadata__date--outgoing {
@include session-color-subtle($session-color-white);
}
.module-message__author,
.module-message__metadata__badge,
.module-message__metadata__date--incoming,
.module-message__metadata__date--outgoing {
@include session-color-subtle($session-color-white);
}
&__container--incoming {
background-color: $session-shade-11;
}
.module-message__container--incoming {
background-color: $session-shade-11;
}
&__container--outgoing {
background-color: $session-shade-5;
}
.module-message__container--outgoing {
background-color: $session-shade-5;
&__container {
transition: background-color 0.25s;
box-shadow: 0px 0px 8px 2px rgba(0, 0, 0, 0.69);
}
}
.module-message__container {
transition: background-color 0.25s;
box-shadow: 0px 0px 8px 2px rgba(0, 0, 0, 0.69);
}
.message-highlighted {
background-color: $session-shade-5;
border-radius: 0;
}
.message {
&-highlighted {
background-color: $session-shade-5;
border-radius: 0;
}
.message-selected {
.module-message__container {
background-image: $session-gradient-green;
box-shadow: $session-dark-shadow;
&-selected {
.module-message {
&__container {
background-image: $session-gradient-green;
box-shadow: $session-dark-shadow;
}
&__author {
color: $session-color-white;
}
}
}
.module-message__author {
color: $session-color-white;
&-read-receipt-container {
margin-left: 5px;
}
}
}
.message-read-receipt-container {
margin-left: 5px;
}

46
ts/components/session/icon/Icons.tsx
Unescape Escape View File

@ -1,9 +1,13 @@
export enum SessionIconType {
AddUser = 'addUser',
Arrow = 'arrow',
ChatBubble = 'chatBubble',
Check = 'check',
Chevron = 'chevron',
CirclePlus = 'circlePLus',
CircleCheck = 'circleCheck',
CircleCheckFilled = 'circleCheckFilled',
CirclePlus = 'circlePlus',
CircleElipses = 'circleElipses',
Contacts = 'contacts',
Ellipses = 'ellipses',
Emoji = 'emoji',
@ -18,6 +22,8 @@ export enum SessionIconType {
Search = 'search',
Send = 'send',
Star = 'star',
QR = 'qr',
Users = 'users',
}
export enum SessionIconSize {
@ -27,6 +33,11 @@ export enum SessionIconSize {
}
export const icons = {
[SessionIconType.AddUser]: {
path:
'M8.85,2.17c-1.73,0-3.12,1.4-3.12,3.12s1.4,3.12,3.12,3.12c1.73,0,3.13-1.4,3.13-3.12S10.58,2.17,8.85,2.17z M8.85,0.08c2.88,0,5.21,2.33,5.21,5.21s-2.33,5.21-5.21,5.21s-5.2-2.33-5.2-5.21C3.65,2.42,5.98,0.08,8.85,0.08z M20.83,5.29 c0.54,0,0.98,0.41,1.04,0.93l0.01,0.11v2.08h2.08c0.54,0,0.98,0.41,1.04,0.93v0.12c0,0.54-0.41,0.98-0.93,1.04l-0.11,0.01h-2.08 v2.08c0,0.58-0.47,1.04-1.04,1.04c-0.54,0-0.98-0.41-1.04-0.93l-0.01-0.11v-2.08h-2.08c-0.54,0-0.98-0.41-1.04-0.93l-0.01-0.11 c0-0.54,0.41-0.98,0.93-1.04l0.11-0.01h2.08V6.34C19.79,5.76,20.26,5.29,20.83,5.29z M12.5,12.58c2.8,0,5.09,2.21,5.2,4.99v0.22 v2.08c0,0.58-0.47,1.04-1.04,1.04c-0.54,0-0.98-0.41-1.04-0.93l-0.01-0.11v-2.08c0-1.67-1.3-3.03-2.95-3.12h-0.18H5.21 c-1.67,0-3.03,1.3-3.12,2.95v0.18v2.08c0,0.58-0.47,1.04-1.04,1.04c-0.54,0-0.98-0.41-1.04-0.93L0,19.88V17.8 c0-2.8,2.21-5.09,4.99-5.2h0.22h7.29V12.58z',
viewBox: '0 0 25 21',
},
[SessionIconType.Arrow]: {
path:
'M33.187,12.438 L6.097,12.438 L16.113,2.608 C16.704,2.027 16.713,1.078 16.133,0.486 C15.551,-0.105 14.602,-0.113 14.011,0.466 L1.407,12.836 C1.121,13.117 0.959,13.5 0.957981241,13.9 C0.956,14.3 1.114,14.685 1.397,14.968 L14.022,27.593 C14.315,27.886 14.699,28.032 15.083,28.032 C15.466,28.032 15.85,27.886 16.143,27.593 C16.729,27.007 16.729,26.057 16.143,25.472 L6.109,15.438 L33.187,15.438 C34.015,15.438 34.687,14.766 34.687,13.938 C34.687,13.109 34.015,12.438 33.187,12.438',
@ -39,18 +50,33 @@ export const icons = {
},
[SessionIconType.Check]: {
path:
'M1.76516504,4.60983496 C1.61871843,4.46338835 1.38128157,4.46338835 1.23483496,4.60983496 C1.08838835,4.75628157 1.08838835,4.99371843 1.23483496,5.14016504 L3.10983496,7.01516504 C3.25628157,7.16161165 3.49371843,7.16161165 3.64016504,7.01516504 L7.76516504,2.89016504 C7.91161165,2.74371843 7.91161165,2.50628157 7.76516504,2.35983496 C7.61871843,2.21338835 7.38128157,2.21338835 7.23483496,2.35983496 L3.375,6.21966991 L1.76516504,4.60983496 lZ',
viewBox: '0.5 0.8 8 8',
'M0.77,2.61c-0.15-0.15-0.38-0.15-0.53,0c-0.15,0.15-0.15,0.38,0,0.53l1.87,1.87c0.15,0.15,0.38,0.15,0.53,0 l4.12-4.12c0.15-0.15,0.15-0.38,0-0.53c-0.15-0.15-0.38-0.15-0.53,0L2.38,4.22L0.77,2.61z',
viewBox: '0 0 7 6',
},
[SessionIconType.Chevron]: {
path:
'M12,13.5857864 L6.70710678,8.29289322 C6.31658249,7.90236893 5.68341751,7.90236893 5.29289322,8.29289322 C4.90236893,8.68341751 4.90236893,9.31658249 5.29289322,9.70710678 L11.2928932,15.7071068 C11.6834175,16.0976311 12.3165825,16.0976311 12.7071068,15.7071068 L18.7071068,9.70710678 C19.0976311,9.31658249 19.0976311,8.68341751 18.7071068,8.29289322 C18.3165825,7.90236893 17.6834175,7.90236893 17.2928932,8.29289322 L12,13.5857864 Z',
viewBox: '1.5 5.5 21 12',
},
[SessionIconType.CircleCheck]: {
path:
'M4.77,7.61c-0.15-0.15-0.38-0.15-0.53,0c-0.15,0.15-0.15,0.38,0,0.53l1.88,1.88c0.15,0.15,0.38,0.15,0.53,0 l4.13-4.12c0.15-0.15,0.15-0.38,0-0.53c-0.15-0.15-0.38-0.15-0.53,0L6.38,9.22L4.77,7.61z',
viewBox: '0 0 15 15',
},
[SessionIconType.CircleCheckFilled]: {
path:
'M3.77,6.61c-0.15-0.15-0.38-0.15-0.53,0c-0.15,0.15-0.15,0.38,0,0.53l1.88,1.88c0.15,0.15,0.38,0.15,0.53,0 L9.78,4.9c0.15-0.15,0.15-0.38,0-0.53c-0.15-0.15-0.38-0.15-0.53,0L5.38,8.22L3.77,6.61z',
viewBox: '0 0 13 13',
},
[SessionIconType.CircleElipses]: {
path:
'M4.76,7.47c0-0.32,0.26-0.57,0.57-0.57c0.32,0,0.57,0.25,0.57,0.57c0,0.31-0.25,0.57-0.57,0.57 C5.02,8.04,4.76,7.78,4.76,7.47z M7.04,7.47c0-0.32,0.26-0.57,0.57-0.57c0.32,0,0.57,0.25,0.57,0.57c0,0.31-0.25,0.57-0.57,0.57 C7.3,8.04,7.04,7.78,7.04,7.47z M9.32,7.47c0-0.32,0.26-0.57,0.57-0.57c0.32,0,0.57,0.25,0.57,0.57c0,0.31-0.25,0.57-0.57,0.57 C9.58,8.04,9.32,7.78,9.32,7.47z',
viewBox: '0 0 15 15',
},
[SessionIconType.CirclePlus]: {
path:
'M21.3433293,23.3433293 C26.2188902,18.4677683 26.2188902,10.5322317 21.3433293,5.65667075 C16.4677683,0.781109751 8.53223174,0.781109751 3.65667075,5.65667075 C-1.21889025,10.5322317 -1.21889025,18.4677683 3.65667075,23.3433293 C8.53223174,28.2188902 16.4677683,28.2188902 21.3433293,23.3433293 Z M20.4610363,6.53896369 C24.8521012,10.9300286 24.8521012,18.0699714 20.4610363,22.4610363 C16.0699714,26.8521012 8.93002856,26.8521012 4.53896369,22.4610363 C0.147898817,18.0699714 0.152998776,10.9300286 4.53896369,6.53896369 C8.93002856,2.14789882 16.0699714,2.14789882 20.4610363,6.53896369 Z M12.5101999,9.81823745 C12.1634027,9.81823745 11.8829049,10.0987352 11.8880049,10.4404325 L11.8880049,13.872705 L8.45573235,13.872705 C8.10893513,13.872705 7.82843737,14.1532028 7.83353733,14.4949 C7.83353733,14.8416973 8.11403509,15.122195 8.45573235,15.1170951 L11.8880049,15.1170951 L11.8880049,18.5493676 C11.872705,18.9012648 12.1532028,19.1817625 12.5,19.1817625 C12.6733986,19.1817625 12.8263974,19.1103631 12.9436965,18.998164 C13.0558956,18.8859649 13.127295,18.7278662 13.127295,18.5544676 L13.127295,15.122195 L16.5595675,15.122195 C16.7329661,15.122195 16.8859649,15.0507956 17.003264,14.9385965 C17.1154631,14.8263974 17.1868625,14.6682987 17.1868625,14.4949 C17.1868625,14.1481028 16.9063647,13.8676051 16.5646675,13.872705 L13.1323949,13.872705 L13.1323949,10.4404325 C13.1323949,10.0936353 12.8518972,9.81313749 12.5101999,9.81823745 Z',
viewBox: '-1.5 1 28 28',
'M13.51,8.82c-0.35,0-0.63,0.28-0.62,0.62v3.43H9.46c-0.35,0-0.63,0.28-0.62,0.62 c0,0.35,0.28,0.63,0.62,0.62h3.43v3.43c-0.02,0.35,0.27,0.63,0.61,0.63c0.17,0,0.33-0.07,0.44-0.18 c0.11-0.11,0.18-0.27,0.18-0.44v-3.43h3.43c0.17,0,0.33-0.07,0.44-0.18c0.11-0.11,0.18-0.27,0.18-0.44 c0-0.35-0.28-0.63-0.62-0.62h-3.43V9.44C14.13,9.09,13.85,8.81,13.51,8.82z M21.46,5.54c4.39,4.39,4.39,11.53,0,15.92 c-4.39,4.39-11.53,4.39-15.92,0s-4.39-11.53,0-15.92C9.93,1.15,17.07,1.15,21.46,5.54z M22.34,22.34 c4.88-4.88,4.88-12.81,0-17.69s-12.81-4.88-17.69,0s-4.88,12.81,0,17.69S17.47,27.22,22.34,22.34z M13.51,8.82c-0.35,0-0.63,0.28-0.62,0.62v3.43H9.46c-0.35,0-0.63,0.28-0.62,0.62 c0,0.35,0.28,0.63,0.62,0.62h3.43v3.43c-0.02,0.35,0.27,0.63,0.61,0.63c0.17,0,0.33-0.07,0.44-0.18 c0.11-0.11,0.18-0.27,0.18-0.44v-3.43h3.43c0.17,0,0.33-0.07,0.44-0.18c0.11-0.11,0.18-0.27,0.18-0.44 c0-0.35-0.28-0.63-0.62-0.62h-3.43V9.44C14.13,9.09,13.85,8.81,13.51,8.82z M21.46,5.54c4.39,4.39,4.39,11.53,0,15.92 c-4.39,4.39-11.53,4.39-15.92,0c-4.39-4.39-4.39-11.53,0-15.92C9.93,1.15,17.07,1.15,21.46,5.54z M22.34,22.34 c4.88-4.88,4.88-12.81,0-17.69s-12.81-4.88-17.69,0s-4.88,12.81,0,17.69S17.47,27.22,22.34,22.34z',
viewBox: '0 0 27 27',
},
[SessionIconType.Contacts]: {
path:
@ -122,4 +148,14 @@ export const icons = {
'M9.80779568,8.70262392 C9.66225594,8.99747141 9.38107073,9.20193068 9.05571654,9.24948607 L4.1495,9.9666031 L7.69882113,13.4236419 C7.93469487,13.6533829 8.0423575,13.9845141 7.98669695,14.3090433 L7.14926913,19.1916734 L11.5356371,16.8849265 C11.8270199,16.7316912 12.1751567,16.7316912 12.4665396,16.8849265 L16.8529075,19.1916734 L16.0154797,14.3090433 C15.9598192,13.9845141 16.0674818,13.6533829 16.3033555,13.4236419 L19.8526767,9.9666031 L14.9464601,9.24948607 C14.6211059,9.20193068 14.3399207,8.99747141 14.194381,8.70262392 L12.0010883,4.25925434 L9.80779568,8.70262392 Z M8.24682697,7.3464661 L11.104381,1.55737608 C11.4712164,0.814207972 12.5309603,0.814207972 12.8977957,1.55737608 L15.7553497,7.3464661 L22.1457165,8.28051393 C22.9656312,8.40035674 23.2924147,9.40819801 22.6988211,9.98635811 L18.0756101,14.4893656 L19.166697,20.8509567 C19.3068155,21.6679189 18.4492666,22.2908819 17.7156371,21.9050735 L12.0010883,18.8998497 L6.28653961,21.9050735 C5.55291004,22.2908819 4.69536119,21.6679189 4.83547972,20.8509567 L5.92656655,14.4893656 L1.30335554,9.98635811 C0.709762006,9.40819801 1.03654545,8.40035674 1.85646012,8.28051393 L8.24682697,7.3464661 lZ',
viewBox: '0 0 22 21',
},
[SessionIconType.QR]: {
path:
'M0 0v170h170V0H0zm130 130H40V40h90v90z M65 65h40v40H65zM342 0v170h170V0H342zm130 130h-90V40h90v90z M407 65h40v40h-40zM0 342v170h170V342H0zm130 130H40v-90h90v90z M65 407h40v40H65zM40 197h40v40H40zM120 277v-40H80v40h39v40h40v-40zM280 77h40v40h-40zM200 40h40v77h-40zM240 0h40v40h-40zM240 117v40h-40v40h80v-80zM280 355v-39h-40v-79h-40v80h40v39h40v39h80v-40z M280 197h40v80h-40zM472 236v-39h-73v40h-39v40h40v39h112v-80h-40zm0 40h-72v-39h72v39zM472 355h40v80h-40zM320 277h40v40h-40zM360 395h40v40h-40zM400 355h40v40h-40zM400 435v77h40v-37h32v-40zM200 356h40v76h-40zM320 472v-40h-80v80h40v-40h39v40h40v-40zM120 197h80v40h-80zM0 237h40v80H0z',
viewBox: '0 0 512 512',
},
[SessionIconType.Users]: {
path:
'M9.38,2.17c-1.73,0-3.12,1.4-3.12,3.12s1.4,3.12,3.12,3.12s3.12-1.4,3.12-3.12S11.1,2.17,9.38,2.17z M16.93,0.25c2.3,0.59,3.92,2.67,3.92,5.05s-1.61,4.46-3.92,5.05c-0.56,0.14-1.12-0.19-1.27-0.75c-0.14-0.56,0.19-1.12,0.75-1.27 c1.38-0.35,2.35-1.6,2.35-3.03s-0.97-2.67-2.35-3.03c-0.56-0.14-0.9-0.71-0.75-1.27C15.8,0.44,16.37,0.11,16.93,0.25z M9.38,0.08 c2.88,0,5.21,2.33,5.21,5.21s-2.33,5.21-5.21,5.21S4.17,8.17,4.17,5.29C4.17,2.42,6.5,0.08,9.38,0.08z M21.09,12.75 c2.22,0.57,3.8,2.53,3.9,4.81L25,17.79v2.08c0,0.58-0.47,1.04-1.04,1.04c-0.54,0-0.98-0.41-1.04-0.93l-0.01-0.11v-2.08 c0-1.42-0.96-2.67-2.34-3.02c-0.56-0.14-0.89-0.71-0.75-1.27C19.97,12.94,20.54,12.61,21.09,12.75z M13.54,12.58 c2.8,0,5.09,2.21,5.2,4.99v0.22v2.08c0,0.58-0.47,1.04-1.04,1.04c-0.54,0-0.98-0.41-1.04-0.93l-0.01-0.11v-2.08 c0-1.67-1.3-3.03-2.95-3.12h-0.18H5.21c-1.67,0-3.03,1.3-3.12,2.95v0.18v2.08c0,0.58-0.47,1.04-1.04,1.04 c-0.54,0-0.98-0.41-1.04-0.93L0,19.88V17.8c0-2.8,2.21-5.09,4.99-5.2h0.22h8.33V12.58z',
viewBox: '0 0 25 21',
},
};

Write Preview
Loading…
Cancel
Save