Commit 65752b7f authored by 우지원's avatar 우지원
Browse files

Merge remote-tracking branch 'origin/seoyeon2' into jiweon827

parents 7ed828cd d095c1ed
......@@ -24,7 +24,7 @@ const Controller = () => {
<div className="row">
<div
className="col d-flex justify-content-center"
style={{ backgroundColor: '#C4C4C4', position: 'absolute', bottom: 0, width: '414px' }}
style={{ backgroundColor: '#C4C4C4', position: 'absolute', bottom: 0, width:'414px' }}
>
{mic ? <div className="col d-flex justify-content-center">
<button type="button" className="btn" onClick={micOn}>
......
......@@ -5,39 +5,32 @@ const RoomHeader = () => {
<div className="container">
<div className="row">
<div
className=" col d-flex justify-content-space-between"
className="col d-flex justify-content-space-between"
style={{ backgroundColor: '#C4C4C4' }}
>
<img
className="m-2 rounded-circle"
className="mt-3 m-2 rounded-circle"
src="/cherry.jpg"
width="40"
height="40"
/>
<p
className="m-2"
className="m-4"
style={{
fontWeight: 'bold',
fontSize: '15px',
overflow: 'scroll',
whiteSpace: 'nowrap',
width: '150px'
}}
>
<p
style={{
overflow: 'hidden',
textOverflow: 'ellipsis',
whiteSpace: 'nowrap',
width: '110px',
}}
>
데계 재밌는 수학과
</p>{' '}
#ASV2AE985
데계 재밌는 수학과qwerqwerqew
</p>
<p
className='mt-3'
style={{ fontWeight: 'bold', fontSize: '20px', color: '#571e80' }}
className="m-4"
style={{ fontWeight: 'bold', fontSize: '20px', color: '#6c33a2' }}
>
Ch.회의
# 회의
</p>
</div>
</div>
......
client/src/speakerbtn.png

26.9 KB | W: | H:

client/src/speakerbtn.png

16.6 KB | W: | H:

client/src/speakerbtn.png
client/src/speakerbtn.png
client/src/speakerbtn.png
client/src/speakerbtn.png
  • 2-up
  • Swipe
  • Onion skin
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment