Skip to content

Commit e6c2a33

Browse files
lauraaforlauraafor
committed
style changes and fixes
1 parent 48830a2 commit e6c2a33

File tree

16 files changed

+1762
-1522
lines changed

16 files changed

+1762
-1522
lines changed

‎app/src/Dashboard/Project.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ const Project = ({
138138
button
139139
onClick={handleDelete}
140140
style={{
141-
border: '1px solid #3f51b5',
141+
border: '1px solid #1b544b',
142142
marginBottom: '2%',
143143
marginTop: '5%'
144144
}}

‎app/src/components/StateManagement/CreateTab/components/StatePropsPanel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ const useStyles = makeStyles((theme: Theme) => ({
520520
},
521521
input: {},
522522
newComponent: {
523-
color: '#155084',
523+
color: '#1b544b',
524524
fontSize: '95%',
525525
marginBottom: '20px'
526526
},

‎app/src/components/left/DragDropPanel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const DragDropPanel = (props): JSX.Element => {
3333
return (
3434
<div className={'HTMLItems'}>
3535
<div id="HTMLItemsTopHalf">
36-
<h3 style={{ color: '#C6C6C6' }}>HTML Elements</h3>
36+
<h3 style={{ color: '#ffffff' }}> &lt; HTML Elements &gt; </h3>
3737
<Grid
3838
container
3939
spacing={{ xs: 0.5, md: 0.5 }}

‎app/src/components/main/Canvas.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { ItemTypes } from '../../constants/ItemTypes';
1313
import { RootState } from '../../redux/store';
1414
import { combineStyles } from '../../helperFunctions/combineStyles';
1515
import renderChildren from '../../helperFunctions/renderChildren';
16+
import { gridFilterableColumnDefinitionsSelector } from '@mui/x-data-grid';
1617

1718
function Canvas(props: {}): JSX.Element {
1819
const state = useSelector((store: RootState) => store.appState);
@@ -115,7 +116,7 @@ function Canvas(props: {}): JSX.Element {
115116
}
116117
},
117118
collect: (monitor) => ({
118-
isOver: !!monitor.isOver()
119+
isOver: !!monitor.isOver(),
119120
})
120121
});
121122

@@ -124,7 +125,7 @@ function Canvas(props: {}): JSX.Element {
124125
width: '100%',
125126
minHeight: '100%',
126127
backgroundColor: isOver ? '#191919' : '#191919',
127-
borderStyle: isOver ? 'dotted' : 'solid',
128+
// borderStyle: isOver ? 'dotted' : 'solid',
128129
aspectRatio: 'auto 774 / 1200',
129130
boxSizing: 'border-box'
130131
};

‎app/src/components/main/DirectChildHTMLNestable.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@ function DirectChildHTMLNestable({
149149
};
150150

151151
// interactive style to change color when nested element is hovered over
152-
if (isOver) defaultNestableStyle['rgba(24, 107, 180, 0.2)'];
152+
if (isOver) defaultNestableStyle['#1b544b'];
153153
defaultNestableStyle['backgroundColor'] = isOver
154-
? 'rgba(24, 107, 180, 0.2)'
154+
? '#1b544b'
155155
: defaultNestableStyle['backgroundColor'];
156156

157157
const combinedStyle = combineStyles(
@@ -185,7 +185,7 @@ function DirectChildHTMLNestable({
185185
id={`canv${childId}`}
186186
>
187187
<span>
188-
<strong style={{ color: 'white' }}>{HTMLType.placeHolderShort}</strong>
188+
<strong style={{ color: '#f2fbf8' }}>{HTMLType.placeHolderShort}</strong>
189189
<strong style={{ color: '#29a38a' }}>
190190
{attributes && attributes.compLink ? ` ${attributes.compLink}` : ''}
191191
</strong>

‎app/src/components/right/ExportButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export default function ExportButton() {
2929
key={i}
3030
onClick={() => chooseGenOptions()}
3131
style={{
32-
border: '1px solid #3f51b5',
32+
border: '1px solid #1b544b',
3333
marginBottom: '2%',
3434
marginTop: '5%'
3535
}}

‎app/src/components/right/ProjectManager.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const ProjectManager = () => {
4545
button
4646
onClick={resetStates}
4747
style={{
48-
border: '1px solid #3f51b5',
48+
border: '1px solid #1b544b',
4949
marginBottom: '2%',
5050
marginTop: '5%'
5151
}}
@@ -85,7 +85,7 @@ const ProjectManager = () => {
8585
button
8686
onClick={() => chooseGenOptions(i)}
8787
style={{
88-
border: '1px solid #3f51b5',
88+
border: '1px solid #1b544b',
8989
marginBottom: '2%',
9090
marginTop: '5%'
9191
}}

‎app/src/components/top/NavBarButtons.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ function navbarDropDown(props) {
116116
button
117117
onClick={resetState}
118118
style={{
119-
border: '1px solid #3f51b5',
119+
border: '1px solid #1b544b',
120120
marginBottom: '2%',
121121
marginTop: '5%'
122122
}}

‎app/src/components/top/NewExportButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default function NewExportButton(): React.JSX.Element {
3535
key={i}
3636
onClick={() => chooseGenOptions()}
3737
style={{
38-
border: '1px solid #3f51b5',
38+
border: '1px solid #1b544b',
3939
marginBottom: '2%',
4040
marginTop: '5%'
4141
}}

‎app/src/containers/CustomizationPanel.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ const CustomizationPanel = ({ isThemeLight }): JSX.Element => {
432432
button
433433
onClick={handleDeleteReusableComponent}
434434
style={{
435-
border: '1px solid #3f51b5',
435+
border: '1px solid #1b544b',
436436
marginBottom: '2%',
437437
marginTop: '5%'
438438
}}
@@ -444,7 +444,7 @@ const CustomizationPanel = ({ isThemeLight }): JSX.Element => {
444444
button
445445
onClick={closeModal}
446446
style={{
447-
border: '1px solid #3f51b5',
447+
border: '1px solid #1b544b',
448448
marginBottom: '2%',
449449
marginTop: '5%'
450450
}}

‎app/src/public/styles/globalDefaultStyles.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ const globalDefaultStyle: Object = {
77
boxSizing: 'border-box',
88
padding: '10px 20px 10px 20px',
99
margin: '10px',
10-
borderRadius: '2px',
10+
borderRadius: '10px',
1111
border: '10px Solid grey',
12-
fontFamily: 'Helvetica Neue',
12+
fontFamily: 'Roboto',
13+
color: '#f2fbf8',
1314
maxWidth: 'fit-content',
1415
minWidth: '250px',
16+
cursor: 'grab',
1517
backgroundColor: 'rgba(0, 0, 0, 0.2)', // experiment to see what is inherited
1618
};
1719

‎app/src/public/styles/style.css

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ body {
2626
overflow: hidden;
2727
height: 100vh;
2828
width: 100vw;
29-
background-color: #191919
29+
background-color: #191919;
3030
}
3131

3232
h4 {
@@ -189,7 +189,7 @@ span.material-symbols-outlined {
189189
.HTMLItems::-webkit-scrollbar-thumb {
190190
transition: .3s ease all;
191191
border-color: transparent;
192-
background-color: rgba(255, 255, 255, 0.1);
192+
background-color: #1c695ccc;
193193
z-index: 40;
194194
}
195195

@@ -253,7 +253,7 @@ span.material-symbols-outlined {
253253
}
254254

255255
#HTMLItem:hover {
256-
background-color: #333333;
256+
background-color: #424242bd;
257257
color: #257c74;
258258
}
259259

@@ -481,14 +481,13 @@ RIGHT COLUMN
481481
display: flex;
482482
justify-content: center;
483483
align-content: center;
484-
484+
border-color: #46C0A5;
485485
}
486486

487487
.compPanelItem h3 {
488488
font-size: 1em;
489489
letter-spacing: 0.75px;
490490
padding: 5px 10px;
491-
492491
}
493492

494493
.compPanelItem:hover {

‎app/src/public/styles/theme.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export const theme1 = createTheme({
1111
main: '#46C0A5' // light blue
1212
},
1313
background: {
14-
paper: '#ffffff'
14+
paper: '#d2f5eb'
1515
}
1616
}
1717
});
@@ -26,7 +26,7 @@ export const theme2 = createTheme({
2626
main: '#46C0A5'
2727
},
2828
background: {
29-
paper: '#ffffff'
29+
paper: '#d2f5eb'
3030
}
3131
}
3232
});
@@ -35,13 +35,13 @@ export const SigninDark = createTheme({
3535
palette: {
3636
mode: 'dark',
3737
primary: {
38-
main: '#3f51b5'
38+
main: '#1b544b'
3939
},
4040
secondary: {
4141
main: '#17a2b8'
4242
},
4343
background: {
44-
paper: '#ffffff'
44+
paper: '#d2f5eb'
4545
}
4646
}
4747
});
@@ -50,13 +50,13 @@ export const SigninLight = createTheme({
5050
palette: {
5151
mode: 'light',
5252
primary: {
53-
main: '#3f51b5'
53+
main: '#1b544b'
5454
},
5555
secondary: {
5656
main: '#17a2b8'
5757
},
5858
background: {
59-
paper: '#ffffff'
59+
paper: '#d2f5eb'
6060
}
6161
}
6262
});

0 commit comments

Comments
 (0)