Skip to content

Commit 5da7128

Browse files
committed
feature fixes
1 parent 6e5fd49 commit 5da7128

5 files changed

Lines changed: 246 additions & 118 deletions

File tree

frontend/src/App/App.css

Lines changed: 69 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@
2828
}
2929
}
3030

31+
.page {
32+
margin-top: 20px;
33+
}
34+
3135
body {
3236
text-align: left;
3337
font-family: "Roboto";
@@ -36,7 +40,7 @@ body {
3640
color: #2c3e50;
3741
/* margin-right: 2em;
3842
margin-left: 2em; */
39-
margin-bottom: 100px;
43+
/* margin-bottom: 100px; */
4044
}
4145

4246
a {
@@ -83,11 +87,13 @@ hr {
8387
/* background-color: #ff0000; */
8488
border-top: 1px solid #f1f3f4;
8589
}
90+
.page-intro {
91+
margin-bottom: 20px;
92+
}
8693

8794
.topnav {
8895
height: 64px;
8996
background-color: #22a7f0;
90-
margin-bottom: 34px;
9197
color: white;
9298
font-weight: 400;
9399
font-size: 18px;
@@ -99,10 +105,32 @@ hr {
99105
/* margin-top: 10px; */
100106
}
101107

102-
.top-container {
108+
.top-container {
109+
display: flex;
110+
justify-content: center;
111+
flex-wrap: wrap;
112+
position: absolute;
113+
top: 64px;
114+
left: 0;
115+
right: 0;
116+
bottom: 0;
117+
padding: 100px 150px 100px 150px;
118+
background-color: rgba(0, 0, 0, 0.8);
119+
z-index: 100;
120+
}
121+
122+
.top-container-info {
103123
display: flex;
104124
justify-content: space-between;
105125
flex-wrap: wrap;
126+
padding: 50px 50px 0 50px;
127+
background-color: white;
128+
border-radius: 5px;
129+
}
130+
131+
.info-btn {
132+
margin: 20px 20px 0px 20px;
133+
height: 50px;
106134
}
107135

108136
.key-icon {
@@ -180,19 +208,20 @@ hr {
180208
display: flex;
181209
justify-content: space-between;
182210
flex-wrap: wrap;
211+
padding-bottom: 10px;
183212
}
184213

185214
.total-hours {
186-
margin: 0px 30px 40px 0px;
187-
padding: 40px 50px 40px 50px;
215+
margin: 0px 30px 0px 0px;
216+
padding: 20px 50px 20px 50px;
188217
background-color: #f1f3f4;
189218
border-radius: 6px;
190219
flex: 1;
191220
}
192221

193222
.speech-rate {
194-
margin: 0px 0px 40px 0px;
195-
padding: 40px 50px 40px 50px;
223+
margin: 0px 0px 0px 0px;
224+
padding: 20px 50px 20px 50px;
196225
background-color: #f1f3f4;
197226
border-radius: 6px;
198227
flex: 1;
@@ -268,6 +297,12 @@ hr {
268297
cursor: pointer;
269298
}
270299

300+
.btn-disabled {
301+
cursor: initial !important;
302+
background-color: #D3D3D3 !important;
303+
color: #2c3e50 !important;
304+
}
305+
271306
.btn:hover {
272307
background-color: #FD8E4C;
273308
}
@@ -433,8 +468,9 @@ input::placeholder {
433468

434469
.feedback-ball-red {
435470
background-color: rgb(228, 63, 70);
436-
width: 100px;
437-
height: 30px;
471+
/* width: 100px; */
472+
/* height: 30px; */
473+
padding: 0px 5px 0px 5px;
438474
border-radius: 5px;
439475
position: absolute;
440476
top: 10px;
@@ -445,7 +481,8 @@ input::placeholder {
445481

446482
.feedback-ball-green {
447483
background-color: rgb(37, 162, 78);
448-
width: 100px;
484+
/* width: 100px; */
485+
padding: 0px 5px 0px 5px;
449486
height: 30px;
450487
border-radius: 5px;
451488
position: absolute;
@@ -467,7 +504,8 @@ input::placeholder {
467504

468505
.feedback-ball-red-t {
469506
background-color: rgb(228, 63, 70);
470-
width: 100px;
507+
/* width: 100px; */
508+
padding: 0px 5px 0px 5px;
471509
height: 30px;
472510
border-radius: 5px;
473511
font-size: large;
@@ -477,7 +515,8 @@ input::placeholder {
477515

478516
.feedback-ball-green-t {
479517
background-color: rgb(37, 162, 78);
480-
width: 100px;
518+
/* width: 100px; */
519+
padding: 0px 5px 0px 5px;
481520
height: 30px;
482521
border-radius: 5px;
483522
font-size: large;
@@ -509,6 +548,10 @@ input::placeholder {
509548
/* height: 100%; */
510549
}
511550

551+
.wave-container {
552+
background-color: #222222;
553+
width: 100%;
554+
}
512555

513556
#analyser,
514557
#wavedisplay {
@@ -519,12 +562,11 @@ input::placeholder {
519562
}
520563

521564
#waveform {
522-
margin-bottom: 35px;
565+
/* margin-bottom: 35px; */
523566
}
524567
.wavedisplay {
525568
width: 100%;
526569
height: 128px;
527-
margin-bottom: 1.75em;
528570
margin-top: -32px;
529571
}
530572

@@ -559,9 +601,8 @@ canvas {
559601

560602
#controls {
561603
text-align: center;
562-
padding-top: 0;
563604
padding-bottom: 27px;
564-
/* margin: 10px; */
605+
margin-top: 28px;
565606
/* margin-top: 2vh; */
566607
/* background-color: red; */
567608
}
@@ -614,3 +655,15 @@ canvas {
614655
border-radius: 6px;
615656
/* line-height: 2; */
616657
}
658+
659+
.indicator-container {
660+
background-color: #222222;
661+
border-bottom-left-radius: 6px;
662+
border-bottom-right-radius: 6px;
663+
margin-top: -12px;
664+
height: 5vh;
665+
display: flex;
666+
justify-content: center;
667+
align-items: center;
668+
color: white;
669+
}

frontend/src/App/Intro.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Intro extends Component {
2020

2121
render() {
2222
return (
23-
<div className="App">
23+
<div className="page-intro">
2424
<div id="PageIntro">
2525
<h2 style={{ color: "#FD9E66" }}>Mimic Recording Studio</h2>
2626
<h1>Help us build the voice(s) of Mycroft!</h1>

0 commit comments

Comments
 (0)