Showing
2 changed files
with
1 additions
and
9 deletions
... | @@ -122,19 +122,11 @@ button:hover{ | ... | @@ -122,19 +122,11 @@ button:hover{ |
122 | padding:10px; | 122 | padding:10px; |
123 | margin:20px; | 123 | margin:20px; |
124 | display:flex; | 124 | display:flex; |
125 | -<<<<<<< HEAD | ||
126 | - padding: 10px; | ||
127 | - height:700px; | ||
128 | - background-color:rgba(0,0,0,.87); | ||
129 | - color:var(--text-color); | ||
130 | - font-size:20px; | ||
131 | -======= | ||
132 | font-size:20px; | 125 | font-size:20px; |
133 | height:700px; | 126 | height:700px; |
134 | background-color:rgba(0,0,0,.87); | 127 | background-color:rgba(0,0,0,.87); |
135 | color:var(--text-color); | 128 | color:var(--text-color); |
136 | font-family: 'Raleway', 'Noto Serif KR'; | 129 | font-family: 'Raleway', 'Noto Serif KR'; |
137 | ->>>>>>> e948ff4325bc9174b01571ab61b4339fdec7cbdf | ||
138 | } | 130 | } |
139 | #recordButton{ | 131 | #recordButton{ |
140 | line-height: 22px; | 132 | line-height: 22px; | ... | ... |
... | @@ -94,7 +94,7 @@ | ... | @@ -94,7 +94,7 @@ |
94 | <div class="output_bar"> | 94 | <div class="output_bar"> |
95 | <h2>Transcription Raw Data</h2> | 95 | <h2>Transcription Raw Data</h2> |
96 | </div> | 96 | </div> |
97 | - <div id="output"></div> | 97 | + <div id="output" style="overflow:auto"></div> |
98 | <i class="fas fa-arrow-circle-down"></i> | 98 | <i class="fas fa-arrow-circle-down"></i> |
99 | <div class="output_bar"> | 99 | <div class="output_bar"> |
100 | <h2>TTP</h2> | 100 | <h2>TTP</h2> | ... | ... |
-
Please register or login to post a comment