Skip to content

Commit 3a78977

Browse files
committed
commit before merging with alex leftPanel
1 parent b54d01d commit 3a78977

File tree

2 files changed

+23
-30
lines changed

2 files changed

+23
-30
lines changed

app/src/components/left/HTMLPanel.tsx

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,9 @@ const HTMLPanel = (props): JSX.Element => {
189189
style={{ marginBottom: '10px' }}
190190

191191
/>
192-
{errorStatus && <span style={{fontSize:"11px", marginTop: "10px", color: "red"}}><em>{errorMsg}</em></span>}
192+
{errorStatus && <span className={isThemeLight ? `${classes.errorMessage} ${classes.errorMessageLight}` : `${classes.errorMessage} ${classes.errorMessageDark}`}>
193+
<em>{errorMsg}</em>
194+
</span>}
193195

194196
<br></br>
195197
<label className={isThemeLight ? `${classes.inputLabel} ${classes.lightThemeFontColor}` : `${classes.inputLabel} ${classes.darkThemeFontColor}`}>
@@ -204,7 +206,9 @@ const HTMLPanel = (props): JSX.Element => {
204206
autocomplete="off"
205207
className={isThemeLight ? `${classes.input} ${classes.lightThemeFontColor}` : `${classes.input} ${classes.darkThemeFontColor}`}
206208
/>
207-
{errorStatus && <span style={{fontSize:"11px", marginTop: "10px", color: "red"}}><em>{errorMsg}</em></span>}
209+
{errorStatus && <span className={isThemeLight ? `${classes.errorMessage} ${classes.errorMessageLight}` : `${classes.errorMessage} ${classes.errorMessageDark}`}>
210+
<em>{errorMsg}</em>
211+
</span>}
208212
<input
209213

210214
className={isThemeLight ? `${classes.addElementButton} ${classes.lightThemeFontColor}` : `${classes.addElementButton} ${classes.darkThemeFontColor}`}
@@ -261,13 +265,23 @@ const useStyles = makeStyles({
261265
borderStyle: 'none',
262266
transition: '0.3s',
263267
borderRadius: '25px',
264-
},
265-
lightThemeFontColor: {
266-
color: '#186BB4'
267-
},
268-
darkThemeFontColor: {
269-
color: '#fff'
270-
}
268+
},
269+
lightThemeFontColor: {
270+
color: '#186BB4'
271+
},
272+
darkThemeFontColor: {
273+
color: '#fff'
274+
},
275+
errorMessage: {
276+
fontSize:"11px",
277+
marginTop: "10px"
278+
},
279+
errorMessageLight: {
280+
color: '#6B6B6B',
281+
},
282+
errorMessageDark: {
283+
color: '#8D8D86',
284+
}
271285
});
272286

273287
export default HTMLPanel;

app/src/public/styles/style.css

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -249,17 +249,9 @@ h1 {
249249
flex-direction: column;
250250
flex: 1;
251251
min-width: 700px;
252-
/* margin-top: 65px; */
253-
/* height: 876px; */
254-
/* align-self: flex-end; */
255-
/* overflow-x: hidden; */
256252
}
257253

258254
.main-header {
259-
/* display: flex; */
260-
/* border-left: 1px solid grey;
261-
border-right: 1px solid grey;
262-
border-bottom: 1px solid grey; */
263255
background-color: #212121;
264256
box-shadow: 0 5px 7px -2px rgba(0, 0, 0, 0.1);
265257
z-index: 10;
@@ -271,16 +263,12 @@ h1 {
271263
}
272264

273265
.main {
274-
/* border-left: 1px solid grey; */
275-
/* border-right: 1px solid grey; */
276266
background: #fff;
277267
flex: 1;
278268
width: 100%;
279269
overflow: auto;
280270
display: flex;
281271
background-color: #e4e4e4;
282-
/* justify-content: center;
283-
align-items: center; */
284272
}
285273

286274
.draggable {
@@ -356,13 +344,9 @@ RIGHT COLUMN
356344
width: 100%;
357345
height: 100%;
358346
min-height: 25%;
359-
/* display: flex; */
360-
/* flex-direction: row; */
361-
/* background-color: #fcfcfc; */
362347
}
363348

364349
.htmlattr {
365-
/* background-size: auto; */
366350
height: 80%;
367351
overflow-y: scroll;
368352
margin-left: 50px;
@@ -391,8 +375,6 @@ RIGHT COLUMN
391375

392376
.flex1 {
393377
padding: 10px 20px 10px 5px;
394-
/* color: #01d46d; */
395-
/* color: #41658A; */
396378
}
397379

398380
.flex2 {
@@ -480,12 +462,9 @@ a.nav_link:hover {
480462
height: 100%;
481463
position: relative;
482464
display: flex;
483-
/* justify-content: center; */
484-
/* margin-bottom: 25px; */
485465
}
486466

487467
.compPanelItem h3 {
488-
/* padding-top: 25px; */
489468
font-size: 1.25em;
490469
letter-spacing: 0.75px;
491470
}

0 commit comments

Comments
 (0)