Skip to content

Commit 255ee42

Browse files
author
Erika Perugachi
authored
Merge pull request #1133 from erikaperugachi/settings
Settings
2 parents 04afc23 + aea3404 commit 255ee42

22 files changed

+113
-9
lines changed

‎email_mailbox/src/app.scss‎

Lines changed: 87 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,90 @@ TABLE OF CONTENTS
179179
font-style: italic;
180180
}
181181

182+
@font-face {
183+
font-family: "Roboto";
184+
src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-Thin.ttf) format("truetype");
185+
font-weight: normal;
186+
font-style: normal;
187+
}
188+
189+
@font-face {
190+
font-family: "Roboto";
191+
src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-ThinItalic.ttf) format("truetype");
192+
font-weight: normal;
193+
font-style: italic;
194+
}
195+
196+
@font-face {
197+
font-family: "Roboto";
198+
src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-Light.ttf) format("truetype");
199+
font-weight: 200;
200+
font-style: normal;
201+
}
202+
203+
@font-face {
204+
font-family: "Roboto";
205+
src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-LightItalic.ttf) format("truetype");
206+
font-weight: 200;
207+
font-style: italic;
208+
}
209+
210+
@font-face {
211+
font-family: "Roboto";
212+
src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-Regular.ttf) format("truetype");
213+
font-weight: 300;
214+
font-style: normal;
215+
}
216+
217+
@font-face {
218+
font-family: "Roboto";
219+
src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-Italic.ttf) format("truetype");
220+
font-weight: 300;
221+
font-style: italic;
222+
}
223+
224+
@font-face {
225+
font-family: "Roboto";
226+
src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-Medium.ttf) format("truetype");
227+
font-weight: 600;
228+
font-style: normal;
229+
}
230+
231+
@font-face {
232+
font-family: "Roboto";
233+
src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-MediumItalic.ttf) format("truetype");
234+
font-weight: 600;
235+
font-style: italic;
236+
}
237+
238+
@font-face {
239+
font-family: "Roboto";
240+
src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-Bold.ttf) format("truetype");
241+
font-weight: 700;
242+
font-style: normal;
243+
}
244+
245+
@font-face {
246+
font-family: "Roboto";
247+
src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-BoldItalic.ttf) format("truetype");
248+
font-weight: 700;
249+
font-style: italic;
250+
}
251+
252+
@font-face {
253+
font-family: "Roboto";
254+
src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-Black.ttf) format("truetype");
255+
font-weight: 800;
256+
font-style: normal;
257+
}
258+
259+
@font-face {
260+
font-family: "Roboto";
261+
src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-BlackItalic.ttf) format("truetype");
262+
font-weight: 800;
263+
font-style: italic;
264+
}
265+
182266
/* 1.2.- FONTS: Icon
183267
----------------------------- */
184268
@font-face {
@@ -415,7 +499,7 @@ TABLE OF CONTENTS
415499
/* 2.- CONTENT
416500
----------------------------- */
417501
*{
418-
font-family: NunitoSans;
502+
font-family: NunitoSans, Roboto;
419503
}
420504

421505
html{
@@ -882,8 +966,9 @@ button{
882966
----------------------------- */
883967
.labels-tooltip{
884968
border-radius: 3px;
885-
font-weight: normal;
969+
font-family: NunitoSans;
886970
font-size: 12px;
971+
font-weight: normal;
887972
}
888973

889974
.__floater__open {

‎email_mailbox/src/components/HeaderMainWrapper.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React, { Component } from 'react';
22
import PropTypes from 'prop-types';
33
import HeaderMain from './HeaderMain';
4+
import { LabelType } from '../utils/electronInterface';
45

56
class HeaderMainWrapper extends Component {
67
constructor(props) {
@@ -39,7 +40,9 @@ class HeaderMainWrapper extends Component {
3940
}
4041

4142
componentDidMount() {
42-
const text = this.props.sectionSelected.params.searchParams.text;
43+
const text = this.props.sectionSelected.params.searchParams
44+
? this.props.sectionSelected.params.searchParams.text
45+
: false;
4346
const stateText = this.state.searchParams.text;
4447
if (text && !stateText) {
4548
this.setState(state => {
@@ -56,10 +59,9 @@ class HeaderMainWrapper extends Component {
5659
return this.handleClearSearchInput();
5760
}
5861
if (!prevProps.sectionSelected) return;
59-
const searchMailboxId = -2;
6062
const prevMailboxId = prevProps.sectionSelected.params.mailboxSelected.id;
6163
const nextMailboxId = this.props.sectionSelected.params.mailboxSelected.id;
62-
const prevMailboxIsSearch = prevMailboxId === searchMailboxId;
64+
const prevMailboxIsSearch = prevMailboxId === LabelType.search.id;
6365
const nextMailboxIsDifferent = prevMailboxId !== nextMailboxId;
6466
if (prevMailboxIsSearch && nextMailboxIsDifferent) {
6567
return this.handleClearSearchInput();

‎email_mailbox/src/components/SettingAccount.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ const SettingAccount = props => (
6969
onClickChangeRecoveryEmailInputType={
7070
props.onClickChangeRecoveryEmailInputType
7171
}
72+
onClickForgotPasswordLink={props.onClickForgotPasswordLink}
7273
onClosePopup={props.onClosePopup}
7374
onConfirmChangePassword={props.onConfirmChangePassword}
7475
onConfirmChangeRecoveryEmail={props.onConfirmChangeRecoveryEmail}
@@ -351,6 +352,7 @@ SettingAccount.propTypes = {
351352
onChangeInputValueOnSetReplyTo: PropTypes.func,
352353
onClearPopupParams: PropTypes.func,
353354
onClickChangeRecoveryEmailInputType: PropTypes.func,
355+
onClickForgotPasswordLink: PropTypes.func,
354356
onClosePopup: PropTypes.func,
355357
onConfirmChangePassword: PropTypes.func,
356358
onConfirmChangeRecoveryEmail: PropTypes.func,

‎email_mailbox/src/components/SettingBlockProfile.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const SettingBlockProfile = props => (
1515
{renderBlockEmail(props)}
1616
{renderBlockName(props)}
1717
{renderBlockSignature(props)}
18-
{renderBlockSignFooter(props)}
18+
{!myAccount.recipientId.includes('@') && renderBlockSignFooter(props)}
1919
</div>
2020
);
2121

‎email_mailbox/src/components/SideBar.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ const renderLabels = (showLabels, labels, mailboxSelected, onClickSection) => (
111111
<ul>
112112
{showLabels &&
113113
labels.map((label, key) => {
114-
const selected = label.text === mailboxSelected.text;
114+
const selected = mailboxSelected
115+
? label.text === mailboxSelected.text
116+
: false;
115117
return (
116118
<SideBarLabelItem
117119
key={key}

‎email_mailbox/src/components/buttoncircle.scss‎

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

33
.button-circle{
44
color: #ffffff;
5+
line-height: normal;
56
margin: 0 5px;
67
width: 29px;
78
height: 29px;

‎email_mailbox/src/components/buttonunsend.scss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
text-transform: uppercase;
99

1010
div{
11+
background-color: transparent;
12+
1113
i{
1214
font-size: 15px;
1315
top: 2px;
@@ -17,6 +19,7 @@
1719
}
1820

1921
span{
22+
background-color: transparent;
2023
font-size: 11px;
2124
font-weight: 400;
2225
position: relative;

‎email_mailbox/src/components/email.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@
302302
display: flex;
303303

304304
i{
305+
background-color: transparent;
305306
color: #d5d5d5;
306307

307308
&.icon-attach{

‎email_mailbox/src/components/settingblockprofile.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,10 @@
174174
top: 3px;
175175
}
176176
}
177+
178+
&:last-child{
179+
padding-bottom: 17px;
180+
}
177181
}
178182
}
179183

‎email_mailbox/src/containers/Settings.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,12 @@ const mapDispatchToProps = dispatch => {
139139
dispatch(updateLabel(params));
140140
},
141141
onResetPassword: async () => {
142-
const { recipientId } = myAccount;
143-
const { status } = await resetPassword(recipientId);
142+
const [recipientId, domain] = myAccount.recipientId.split('@');
143+
const params = {
144+
recipientId,
145+
domain: domain || appDomain
146+
};
147+
const { status } = await resetPassword(params);
144148
if (status === 200) {
145149
sendResetPasswordSendLinkSuccessMessage();
146150
return;

0 commit comments

Comments
 (0)