Skip to content

Commit ac31f4f

Browse files
authored
Merge pull request #26 from oslabs-beta/hazzardIcon
Final pop up style css complete
2 parents 759ae6a + 4400375 commit ac31f4f

File tree

3 files changed

+24
-6
lines changed

3 files changed

+24
-6
lines changed

src/app/containers/ButtonsContainer.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import { useDispatch, useSelector } from 'react-redux';
1414
import StatusDot from '../components/StatusDot';
1515
import LoopIcon from '@mui/icons-material/Loop';
1616
import CloseIcon from '@mui/icons-material/Close';
17+
import WarningIcon from '@mui/icons-material/Warning';
1718

1819
function exportHandler(snapshots: []): void { // function that takes in our tabs[currentTab] object to be exported as a JSON file. NOTE: TypeScript needs to be updated
1920
const fileDownload: HTMLAnchorElement = document.createElement('a'); // invisible HTML element that will hold our tabs[currentTab] object
@@ -127,7 +128,10 @@ function ButtonsContainer(): JSX.Element {
127128
<div className='close-icon-pop-up-div' >
128129
<CloseIcon type="button" onClick={() => handleReconnectCancel()} className='close-icon-pop-up'/>
129130
</div>
130-
<DialogTitle className='dialog-pop-up-header'>WARNING</DialogTitle>
131+
<div className="warning-header-container">
132+
<WarningIcon className='warning-icon-pop-up'/>
133+
<DialogTitle className='dialog-pop-up-header'>WARNING</DialogTitle>
134+
</div>
131135
<DialogContent className='dialog-pop-up-contents'>
132136
<h3>Status: {connectionStatus ? 'Connected' : 'Disconnected'}</h3>
133137
{connectionStatus

src/app/styles/components/_buttons.scss

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,8 @@ aside {
406406
cursor: pointer;
407407
color: $text-color;
408408
font-size: 20px;
409-
padding-right: 10px;
409+
padding-right: 8px;
410+
color: black;
410411
}
411412

412413
.download-button-pop-up {
@@ -423,4 +424,10 @@ aside {
423424
color: $text-color;
424425
background-color: $highlight-color;
425426
}
427+
}
428+
429+
.warning-icon-pop-up {
430+
color: #d72828;
431+
margin-left: 5px;
432+
margin-right: -22px;
426433
}

src/app/styles/layout/_buttonsContainer.scss

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,22 +73,22 @@
7373
.dialog-pop-up {
7474
border: 1px solid $border-color;
7575
box-shadow: 0 4px 10px rgba(0, 0, 0, 0.2);
76+
padding: 13px;
7677
}
7778

7879
.dialog-pop-up-header {
79-
background-color: $brand-color;
8080
color: $text-color;
81-
padding: 12px 20px;
81+
padding: 8px 16px;
8282
font-size: 20px;
8383
font-family: $text-font-stack;
8484
}
8585

8686
.dialog-pop-up-contents {
87-
padding: 20px;
8887
background-color: $brand-color;
8988
color: $text-color;
9089
font-family: $text-font-stack;
91-
line-height: 1.4;
90+
line-height: 1.4;
91+
padding: 0px 15px 15px 15px !important;
9292
}
9393

9494
.dialog-pop-up-actions {
@@ -106,3 +106,10 @@
106106
align-items: center;
107107
}
108108

109+
.warning-header-container {
110+
background-color: $brand-color;
111+
display: flex;
112+
align-items: center;
113+
height: 20%;
114+
}
115+

0 commit comments

Comments
 (0)