Skip to content

Commit

Permalink
Merge pull request #26 from oslabs-beta/hazzardIcon
Browse files Browse the repository at this point in the history
Final pop up style css complete
  • Loading branch information
jimmally committed Oct 12, 2023
2 parents 759ae6a + 4400375 commit ac31f4f
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 6 deletions.
6 changes: 5 additions & 1 deletion src/app/containers/ButtonsContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { useDispatch, useSelector } from 'react-redux';
import StatusDot from '../components/StatusDot';
import LoopIcon from '@mui/icons-material/Loop';
import CloseIcon from '@mui/icons-material/Close';
import WarningIcon from '@mui/icons-material/Warning';

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
const fileDownload: HTMLAnchorElement = document.createElement('a'); // invisible HTML element that will hold our tabs[currentTab] object
Expand Down Expand Up @@ -127,7 +128,10 @@ function ButtonsContainer(): JSX.Element {
<div className='close-icon-pop-up-div' >
<CloseIcon type="button" onClick={() => handleReconnectCancel()} className='close-icon-pop-up'/>
</div>
<DialogTitle className='dialog-pop-up-header'>WARNING</DialogTitle>
<div className="warning-header-container">
<WarningIcon className='warning-icon-pop-up'/>
<DialogTitle className='dialog-pop-up-header'>WARNING</DialogTitle>
</div>
<DialogContent className='dialog-pop-up-contents'>
<h3>Status: {connectionStatus ? 'Connected' : 'Disconnected'}</h3>
{connectionStatus
Expand Down
9 changes: 8 additions & 1 deletion src/app/styles/components/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,8 @@ aside {
cursor: pointer;
color: $text-color;
font-size: 20px;
padding-right: 10px;
padding-right: 8px;
color: black;
}

.download-button-pop-up {
Expand All @@ -423,4 +424,10 @@ aside {
color: $text-color;
background-color: $highlight-color;
}
}

.warning-icon-pop-up {
color: #d72828;
margin-left: 5px;
margin-right: -22px;
}
15 changes: 11 additions & 4 deletions src/app/styles/layout/_buttonsContainer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -73,22 +73,22 @@
.dialog-pop-up {
border: 1px solid $border-color;
box-shadow: 0 4px 10px rgba(0, 0, 0, 0.2);
padding: 13px;
}

.dialog-pop-up-header {
background-color: $brand-color;
color: $text-color;
padding: 12px 20px;
padding: 8px 16px;
font-size: 20px;
font-family: $text-font-stack;
}

.dialog-pop-up-contents {
padding: 20px;
background-color: $brand-color;
color: $text-color;
font-family: $text-font-stack;
line-height: 1.4;
line-height: 1.4;
padding: 0px 15px 15px 15px !important;
}

.dialog-pop-up-actions {
Expand All @@ -106,3 +106,10 @@
align-items: center;
}

.warning-header-container {
background-color: $brand-color;
display: flex;
align-items: center;
height: 20%;
}

0 comments on commit ac31f4f

Please sign in to comment.