Skip to content

Commit cfb8f2d

Browse files
Eliza612Eliza612
authored
Merge pull request #30 from oslabs-beta/cyrus-collab-room
Changed current blue to match blue on website
2 parents 1133f12 + 9525b90 commit cfb8f2d

File tree

20 files changed

+46
-46
lines changed

20 files changed

+46
-46
lines changed

‎app/src/Dashboard/styles.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
}
7676

7777
.header {
78-
background-color: #354e9c;
78+
background-color: #0671e3;
7979
color: rgba(255, 255, 255, 0.897);
8080
width: 100%;
8181
position: relative;

‎app/src/components/ContextAPIManager/CreateTab/components/AddContextForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ const AddContextForm = ({
126126
<Select
127127
required
128128
sx={{ width: 425 }}
129-
style={{ border: '1px solid #354e9c', color: color }}
129+
style={{ border: '1px solid #0671e3', color: color }}
130130
value={currentContext}
131131
label="Select Context"
132132
MenuProps={{ disablePortal: true }}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -494,11 +494,11 @@ const useStyles = makeStyles((theme: Theme) => ({
494494
width: '100%'
495495
},
496496
rootCheckBox: {
497-
borderColor: '#354e9c',
497+
borderColor: '#0671e3',
498498
padding: '0px'
499499
},
500500
rootCheckBoxLabel: {
501-
borderColor: '#354e9c'
501+
borderColor: '#0671e3'
502502
},
503503
panelWrapper: {
504504
width: '100%',
@@ -522,8 +522,8 @@ const useStyles = makeStyles((theme: Theme) => ({
522522
alignItems: 'center',
523523
textAlign: 'center',
524524
width: '500px',
525-
backgroundColor: '#354e9c',
526-
border: '5px solid #354e9c'
525+
backgroundColor: '#0671e3',
526+
border: '5px solid #0671e3'
527527
},
528528
panelSubheader: {
529529
textAlign: 'center',
@@ -551,7 +551,7 @@ const useStyles = makeStyles((theme: Theme) => ({
551551
fontSize: '90%',
552552
textAlign: 'center',
553553
margin: '-20px 0px 5px 150px',
554-
border: ' 1px solid #354e9c',
554+
border: ' 1px solid #0671e3',
555555
transition: '0.3s'
556556
},
557557
rootToggle: {

‎app/src/components/bottom/BottomTabs.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ const useStyles = makeStyles((theme) => ({
178178
boxShadow: '0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23)'
179179
},
180180
rootLight: {
181-
backgroundColor: '#354e9c'
181+
backgroundColor: '#0671e3'
182182
},
183183
bottomHeader: {
184184
flex: 1,
@@ -237,7 +237,7 @@ const useStyles = makeStyles((theme) => ({
237237
marginLeft: '10px'
238238
},
239239
projectSelector: {
240-
backgroundColor: '#354e9c',
240+
backgroundColor: '#0671e3',
241241
color: 'white'
242242
}
243243
}));

‎app/src/components/form/Selector.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const FormSelector = (props): JSX.Element => {
4646
<div className={props.classes.configValue}>
4747
<FormControl variant="filled" className={props.classes.formControl}>
4848
<Select
49-
style={props.isThemeLight ? { border: '1px solid #354e9c' } : null}
49+
style={props.isThemeLight ? { border: '1px solid #0671e3' } : null}
5050
value={props.selectValue}
5151
name={props.name}
5252
onChange={props.handleChange}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ const useStyles = makeStyles({
343343
transition: '0.3s',
344344
borderRadius: '4px',
345345
alignSelf: 'center',
346-
border: '1px solid #354e9c'
346+
border: '1px solid #0671e3'
347347
},
348348
lightThemeFontColor: {
349349
color: 'white',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ const Canvas = forwardRef<HTMLDivElement, CanvasProps>(({ zoom }, ref) => {
330330
color: '#ffffff',
331331
backgroundColor: '#151515',
332332
zIndex: 0,
333-
border: '2px solid #354e9c',
333+
border: '2px solid #0671e3',
334334
margin: '8px 0 0 8px'
335335
};
336336

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function CanvasContainer(props: CanvasContainerProps): JSX.Element {
3838
color: '#ffffff',
3939
backgroundColor: '#151515',
4040
zIndex: 0,
41-
border: '2px solid #354e9c',
41+
border: '2px solid #0671e3',
4242
whiteSpace: 'nowrap',
4343
textTransform: 'none'
4444
} as const;
@@ -48,7 +48,7 @@ function CanvasContainer(props: CanvasContainerProps): JSX.Element {
4848
color: '#ffffff',
4949
backgroundColor: '#151515',
5050
zIndex: 0,
51-
border: '2px solid #354e9c',
51+
border: '2px solid #0671e3',
5252
whiteSpace: 'nowrap',
5353
textTransform: 'none'
5454
} as const;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ function DirectChildComponent({ childId, type, typeId, name }: ChildElement) {
5656
const interactiveStyle = {
5757
border:
5858
state.canvasFocus.childId === childId
59-
? '3px solid #354e9c'
59+
? '3px solid #0671e3'
6060
: '1px Solid grey',
6161
boxShadow:
6262
state.canvasFocus.childId === childId ? '1px 1px 3px #a7cced' : ''

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ function DirectChildHTML({ childId, name, type, typeId, style }: ChildElement) {
5959
const interactiveStyle = {
6060
border:
6161
state.canvasFocus.childId === childId
62-
? '4px solid #354e9c'
62+
? '4px solid #0671e3'
6363
: '1px solid grey'
6464
};
6565

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ function DirectChildHTMLNestable({
177177
const interactiveStyle = {
178178
border:
179179
state.canvasFocus.childId === childId
180-
? '3px solid #354e9c'
180+
? '3px solid #0671e3'
181181
: '1px solid grey'
182182
};
183183

@@ -221,7 +221,7 @@ function DirectChildHTMLNestable({
221221
<strong style={{ color: '#f2fbf8' }}>
222222
{HTMLType.placeHolderShort}
223223
</strong>
224-
<strong style={{ color: '#354e9c' }}>
224+
<strong style={{ color: '#0671e3' }}>
225225
{attributes && attributes.compLink ? ` ${attributes.compLink}` : ''}
226226
</strong>
227227
{routeButton}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,11 +321,11 @@ const useStyles = makeStyles({
321321
width: '100%'
322322
},
323323
rootCheckBox: {
324-
borderColor: '#354e9c',
324+
borderColor: '#0671e3',
325325
padding: '0px'
326326
},
327327
rootCheckBoxLabel: {
328-
borderColor: '#354e9c'
328+
borderColor: '#0671e3'
329329
},
330330
newComponent: {
331331
color: '#C6C6C6',

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const ComponentPanelItem: React.FC<{
6565
backgroundColor: 'transparent',
6666
border: '2px solid',
6767
borderRadius: '4px',
68-
borderColor: '#354e9c',
68+
borderColor: '#0671e3',
6969
margin: '5px 0px',
7070
wordBreak: 'break-all',
7171
width: '10rem'
@@ -85,7 +85,7 @@ const useStyles = makeStyles({
8585
backgroundColor: 'rgba (0, 0, 0, 0.54)' //this doesnt do anything....
8686
},
8787
focusMark: {
88-
backgroundColor: '#354e9c',
88+
backgroundColor: '#0671e3',
8989
justifySelf: 'left',
9090
width: '14px',
9191
height: '14px',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ const ComponentPanelRoutingItem: React.FC<{}> = () => {
8080
backgroundColor: 'transparent',
8181
height: '75px',
8282
marginBottom: '15px',
83-
border: '2px dotted #354e9c',
83+
border: '2px dotted #0671e3',
8484
borderRadius: '8px'
8585
}}
8686
>

‎app/src/constants/Styling.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export default {
22
neonGreen: '#189bd7',
3-
darkBlue: '#354e9c',
3+
darkBlue: '#0671e3',
44
darkGray: '#252526',
55
tutorialGray: '#f2f0f0'
66
};

‎app/src/containers/CustomizationPanel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1049,7 +1049,7 @@ const useStyles = makeStyles({
10491049
paddingRight: '20px'
10501050
},
10511051
saveButtonLight: {
1052-
border: '1px solid #354e9c',
1052+
border: '1px solid #0671e3',
10531053
backgroundColor: 'rgba(0, 0, 0, 0.2)'
10541054
},
10551055
saveButtonDark: {

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ span.material-symbols-outlined {
250250

251251
#HTMLItem {
252252
transition: 0.3s;
253-
border: 1px solid #354e9c;
253+
border: 1px solid #0671e3;
254254
color: #f2fbf8;
255255
padding: 10%;
256256
border-radius: 5px;
@@ -266,7 +266,7 @@ span.material-symbols-outlined {
266266
}
267267

268268
#submitButton:hover {
269-
background-color: #354e9c;
269+
background-color: #0671e3;
270270
color: white;
271271
border: none;
272272
cursor: pointer;
@@ -455,12 +455,12 @@ RIGHT COLUMN
455455
}
456456

457457
#addComponentButton {
458-
border: 2px solid #354e9c;
458+
border: 2px solid #0671e3;
459459
border-radius: 4px;
460460
}
461461

462462
#addComponentButton:hover {
463-
background-color: #354e9c;
463+
background-color: #0671e3;
464464
color: white;
465465
border: none;
466466
cursor: pointer;
@@ -483,7 +483,7 @@ RIGHT COLUMN
483483
display: flex;
484484
justify-content: center;
485485
align-content: center;
486-
border-color: #354e9c;
486+
border-color: #0671e3;
487487
}
488488

489489
.compPanelItem h3 {
@@ -566,7 +566,7 @@ BOTTOM PANEL
566566

567567
.bottom-panel {
568568
transition: width 250ms ease-in-out;
569-
background-color: #354e9c;
569+
background-color: #0671e3;
570570
width: 100%;
571571
height: 100%;
572572
display: flex;
@@ -609,7 +609,7 @@ BOTTOM PANEL
609609
padding-left: 10px;
610610
border: rgb(68, 68, 68) solid 1px;
611611
border-radius: 5px;
612-
background-color: #354e9c;
612+
background-color: #0671e3;
613613
}
614614

615615
.event-table {
@@ -808,7 +808,7 @@ div.rst__rowContents {
808808
.useState-btn {
809809
color: rgb(241, 240, 240);
810810
background-color: rgba(0, 0, 0, 0.54);
811-
border: 1px solid #354e9c;
811+
border: 1px solid #0671e3;
812812
border-radius: 3px;
813813
box-shadow: '2px 2px 2px #1a1a1a';
814814
font-family: Arial, Helvetica, sans-serif;
@@ -827,12 +827,12 @@ div.rst__rowContents {
827827

828828
.useState-header {
829829
font-size: 35px;
830-
background-color: #354e9c;
830+
background-color: #0671e3;
831831
color: rgb(241, 240, 240);
832832
width: 600px;
833833
border: 3px;
834834
border-style: solid;
835-
border-color: #354e9c;
835+
border-color: #0671e3;
836836
font-family: 'Open Sans', sans-serif;
837837
border-radius: 15px 15px 0px 0px;
838838
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ export const theme1 = createTheme({
55
palette: {
66
mode: 'dark',
77
primary: {
8-
main: '#354e9c' // navy blue
8+
main: '#0671e3' // navy blue
99
},
1010
secondary: {
11-
main: '#354e9c' // light blue
11+
main: '#0671e3' // light blue
1212
},
1313
background: {
14-
paper: '#354e9c'
14+
paper: '#0671e3'
1515
}
1616
}
1717
});
@@ -20,13 +20,13 @@ export const theme2 = createTheme({
2020
palette: {
2121
mode: 'light',
2222
primary: {
23-
main: '#354e9c'
23+
main: '#0671e3'
2424
},
2525
secondary: {
26-
main: '#354e9c'
26+
main: '#0671e3'
2727
},
2828
background: {
29-
paper: '#354e9c'
29+
paper: '#0671e3'
3030
}
3131
}
3232
});
@@ -56,7 +56,7 @@ export const SigninLight = createTheme({
5656
main: '#17a2b8'
5757
},
5858
background: {
59-
paper: '#354e9c'
59+
paper: '#0671e3'
6060
}
6161
}
6262
});

‎package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎server/assets/renderDemo.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
.tst-form {
1818
position: relative;
1919
z-index: 1;
20-
background: #354e9c;
20+
background: #0671e3;
2121
max-width: 360px;
2222
margin: 0 auto 100px;
2323
padding: 45px;
@@ -52,7 +52,7 @@
5252
.tst-form button:hover,
5353
.form button:active,
5454
.form button:focus {
55-
background: #354e9c;
55+
background: #0671e3;
5656
}
5757
.tst-form .message {
5858
margin: 15px 0 0;

0 commit comments

Comments
 (0)