Skip to content

Commit 3d515f8

Browse files
committed
mg updated font to Outfit, locked, download, upload, tutorial icons updated to MUI
1 parent cf86f11 commit 3d515f8

File tree

8 files changed

+24
-22
lines changed

8 files changed

+24
-22
lines changed

src/app/components/Tutorial.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { faQuestion } from '@fortawesome/free-solid-svg-icons';
1010
import { tutorialSaveSeriesToggle, setCurrentTabInApp } from '../actions/actions';
1111
import { TutorialProps, TutorialState, StepsObj } from '../FrontendTypes';
1212
import { Button } from '@mui/material';
13+
import HelpOutlineIcon from '@mui/icons-material/HelpOutline';
1314
//Must be required in. This enables compatibility with TS. If imported in, throws ts error of not rendering steps as a class component correctly.
1415
const { Steps } = require('intro.js-react');
1516

@@ -355,7 +356,7 @@ export default class Tutorial extends Component<TutorialProps, TutorialState> {
355356
type='button'
356357
onClick={() => startIntro()}
357358
>
358-
<FontAwesomeIcon icon={faQuestion} /> Tutorial
359+
<HelpOutlineIcon /> Tutorial
359360
</Button>
360361
</>
361362
);

src/app/containers/ButtonsContainer.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import LockIcon from '@mui/icons-material/Lock';
1717
import LockOpenIcon from '@mui/icons-material/LockOpen';
1818
import FileDownloadIcon from '@mui/icons-material/FileDownload';
1919
import FileUploadIcon from '@mui/icons-material/FileUpload';
20+
import HelpOutlineIcon from '@mui/icons-material/HelpOutline';
2021

2122
// function exportHandler takes in a parameter snapshots which is typed as an array
2223
// the function does not return anything so the type is void

src/app/styles/abstracts/_variables.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/// fontFamily: 'monaco, Consolas, Lucida Console, monospace'
2-
@import url('https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap');
2+
@import url('https://fonts.googleapis.com/css2?family=Outfit:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap');
33
/// @type List
4-
$text-font-stack: 'Roboto', sans-serif !default;
4+
$text-font-stack: 'Outfit', sans-serif !default;
55

66
/// @type Color
77
/// fiery-rose changed from ff6569 to F00008 globally to improve contrast

src/app/styles/components/_buttons.scss

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import url('https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap');
1+
@import url('https://fonts.googleapis.com/css2?family=Outfit:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap');
22

33
.save-series-button {
44
padding: 3px;
@@ -13,7 +13,7 @@
1313
border-radius: 5px;
1414
cursor: pointer;
1515
line-height: 1.5em;
16-
font: 400 16px 'Roboto', sans-serif;
16+
font: 400 16px 'Outfit', sans-serif;
1717
// font-size: $button-text-size;
1818
width: 120px;
1919
background: $red-color-gradient;
@@ -38,7 +38,7 @@
3838
border-radius: 3px;
3939
cursor: pointer;
4040
line-height: 1.5em;
41-
font: 300 16px 'Roboto', sans-serif;
41+
font: 300 16px 'Outfit', sans-serif;
4242
font-size: $button-text-size;
4343
width: 120px;
4444
// background: $red-color-gradient;
@@ -61,7 +61,7 @@
6161
border-radius: 3px;
6262
cursor: pointer;
6363
line-height: 1.5em;
64-
font: 500 16px 'Roboto', sans-serif;
64+
font: 500 16px 'Outfit', sans-serif;
6565
// font-size: $button-text-size; increase the font size and contrast for readability
6666
width: 120px;
6767
background: #62d6fb;
@@ -95,7 +95,7 @@
9595
border: none;
9696
/* border-radius: 3px; */
9797
background: linear-gradient(145deg, #5c6068, #4d5157);
98-
font: normal 16px 'Roboto', sans-serif;
98+
font: normal 16px 'Outfit', sans-serif;
9999
color: #ffffff;
100100
display: flex;
101101
justify-content: center;
@@ -111,7 +111,7 @@
111111
border: transparent;
112112
border-radius: 3px;
113113
background-color: #232529;
114-
font: normal 16px 'Roboto', sans-serif;
114+
font: normal 16px 'Outfit', sans-serif;
115115
color: #ffffff;
116116
transform: rotateX(90deg);
117117
transition: opacity 300ms, transform 0.15s linear;
@@ -137,7 +137,7 @@
137137
width: 100px;
138138
border: transparent;
139139
border-radius: 3px;
140-
font: normal 16px 'Roboto', sans-serif;
140+
font: normal 16px 'Outfit', sans-serif;
141141
}
142142

143143
.empty-button:hover {
@@ -236,7 +236,7 @@
236236
align-items: center;
237237
cursor: pointer;
238238
line-height: 1.5em;
239-
font: 300 16px 'Roboto', sans-serif;
239+
font: 300 16px 'Outfit', sans-serif;
240240
font-size: $button-text-size;
241241

242242
background: $brand-color;

src/app/styles/components/_performanceVisx.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import url('https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap');
1+
@import url('https://fonts.googleapis.com/css2?family=Outfit:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap');
22

33
#RenderContainer {
44
display: flex;
@@ -24,7 +24,7 @@
2424
#routes-formcontrol {
2525
padding: 3px;
2626
margin-left: 50px;
27-
font: 400 16px 'Roboto', sans-serif;
27+
font: 400 16px 'Outfit', sans-serif;
2828
text-align: left;
2929
// min-width: 10em;
3030
// max-height: 50%;
@@ -33,7 +33,7 @@
3333
#routes-dropdown {
3434
color: white !important;
3535
// background-color: #ff6569 !important;
36-
font: 400 16px 'Roboto', sans-serif;
36+
font: 400 16px 'Outfit', sans-serif;
3737
text-align: left;
3838
}
3939

@@ -45,7 +45,7 @@
4545

4646
#routes-select, #snapshot-select{
4747
color: white !important;
48-
font: 400 16px 'Roboto', sans-serif;
48+
font: 400 16px 'Outfit', sans-serif;
4949
text-align: left;
5050
width: 120px;
5151
height: 30px;

src/app/styles/layout/_buttonsContainer.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@import url('https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap');
1+
@import url('https://fonts.googleapis.com/css2?family=Outfit:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap');
22
* {
3-
font-family: 'Roboto', sans-serif;
3+
font-family: 'Outfit', sans-serif;
44
}
55
.buttons-container {
66
margin: 0 1% 0 1%;

src/app/styles/layout/_errorContainer.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
@import url('https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap');
1+
@import url('https://fonts.googleapis.com/css2?family=Outfit:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap');
22
* {
3-
font-family: 'Roboto', sans-serif;
3+
font-family: 'Outfit', sans-serif;
44
}
55
.error-container {
66
height: 100%;
77
margin: 0 auto;
88
background-color: $brand-color;
99
overflow: hidden;
10-
font: 'Roboto', sans-serif;
10+
font: 'Outfit', sans-serif;
1111

1212
display: flex;
1313
flex-direction: column;

src/app/styles/layout/_headContainer.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@import url('https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap');
1+
@import url('https://fonts.googleapis.com/css2?family=Outfit:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap');
22
* {
3-
font-family: 'Roboto', sans-serif;
3+
font-family: 'Outfit', sans-serif;
44
}
55

66
.head-container {

0 commit comments

Comments
 (0)