Skip to content

Commit c3a67cf

Browse files
Fix forward email. Close #1085
1 parent ff5d738 commit c3a67cf

File tree

5 files changed

+29
-12
lines changed

5 files changed

+29
-12
lines changed

email_composer/src/app.scss

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,10 @@ TABLE OF CONTENTS
404404

405405
/* 2.- CONTENT
406406
----------------------------- */
407+
*{
408+
font-family: NunitoSans;
409+
}
410+
407411
html, html body {
408412
height: 100%;
409413
margin: 0;
@@ -423,7 +427,7 @@ html, html body {
423427

424428
/* 2.1.- CONTENT: SCROLLBAR
425429
----------------------------- */
426-
.cptx-scrollbar{
430+
@mixin cptx-scrollbar-scheme{
427431
&::-webkit-scrollbar-track{
428432
background-color: transparent;
429433
box-shadow: inset 0 0 10px rgba(220,220,220,0.1);
@@ -440,6 +444,14 @@ html, html body {
440444
}
441445
}
442446

447+
.cptx-scrollbar{
448+
@include cptx-scrollbar-scheme
449+
}
450+
451+
.react-autosuggest__suggestions-container--open{
452+
@include cptx-scrollbar-scheme
453+
}
454+
443455
/* 3.- CONTROLS
444456
----------------------------- */
445457

@@ -494,7 +506,7 @@ button{
494506
&.wrapper{
495507
background-color: $_BACKGROUND_COLOR_MAIN;
496508

497-
.cptx-scrollbar{
509+
.cptx-scrollbar, .react-autosuggest__suggestions-container--open{
498510
&::-webkit-scrollbar-track{
499511
background-color: $_BACKGROUND_COLOR_SCROLLBAR;
500512
}

email_composer/src/components/avatarimage.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
.avatar-letters {
2-
position: relative;
32
align-items: center;
43
border-radius: 50%;
54
display: flex;
6-
overflow: hidden;
75
height: 100%;
6+
overflow: hidden;
7+
position: relative;
88
width: 100%;
99

1010
img {
@@ -16,6 +16,7 @@
1616
}
1717

1818
span{
19+
color: white;
1920
font-weight: 300;
2021
margin: 0 auto;
2122
}

email_composer/src/components/suggestion.scss

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
font-weight: 200;
1212
left: 0;
1313
position: absolute;
14-
overflow: hidden;
14+
overflow: auto;
1515
top: 31px;
1616
width: 370px;
1717
max-height: calc(100vh - 100px);
@@ -50,6 +50,7 @@
5050
.react-autosuggest__suggestion {
5151
color: #6a707e;
5252
cursor: pointer;
53+
margin: 0;
5354
padding: 8px 16px;
5455
}
5556

@@ -63,19 +64,19 @@
6364
border-radius: 50%;
6465
color: #fff;
6566
display: flex;
67+
font-size: 12px;
68+
font-weight: 200;
6669
height: 27px;
6770
justify-content: center;
6871
position: relative;
6972
width: 27px;
70-
71-
.recipient-icon-letters{
72-
font-size: 11px;
73-
}
7473
}
7574

7675
.recipient-text {
7776
align-items: center;
7877
display: flex;
78+
font-size: 12px;
79+
font-weight: 200;
7980
margin-left: 10px;
8081
position: relative;
8182
width: 130px;
@@ -94,8 +95,10 @@
9495
.sugestion-email-right {
9596
align-items: center;
9697
display: flex;
98+
font-size: 12px;
99+
font-weight: 200;
97100
margin-left: 10px;
98-
width: 160px;
101+
width: 150px;
99102

100103
> span{
101104
overflow: hidden;

email_composer/src/utils/FileUtils.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ export const formFileParamsToDatabase = files => {
109109
export const getFileParamsToSend = files => {
110110
if (!files.length) return [];
111111

112-
return new Promise((resolve, reject) => {
112+
return new Promise(resolve => {
113113
const tokensToDuplicate = files
114114
.filter(file => file.shouldDuplicate === true)
115115
.map(file => file.token);
@@ -132,7 +132,7 @@ export const getFileParamsToSend = files => {
132132
} else if (tokensToDuplicate.length > 0) {
133133
fileManager.duplicateFiles(tokensToDuplicate, (err, res) => {
134134
if (err) {
135-
return reject(undefined);
135+
return resolve([]);
136136
}
137137
const { duplicates } = JSON.parse(res);
138138
const data = files.map(file => {

email_mailbox/src/components/thread.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
h1{
2626
background-color: transparent;
27+
font-family: NunitoSans;
2728
font-size: 21px;
2829
font-weight: 700;
2930
line-height: 21px;

0 commit comments

Comments
 (0)