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

client/src/components/Room/ChannelList.js

@@ -90,6 +90,19 @@ const ChannelList = () => {
             >
               퇴장
             </button>
+            {/* {admin ?  <button
+              type="button"
+              className="m-3 rounded"
+              style={{
+                height: '30px',
+                fontWeight: 'bold',
+                backgroundColor: '#E0CEE8',
+                color: 'black',
+                border: '1px #D64D61',
+              }}
+            >
+              설정
+            </button> : null} */}
             <button
               type="button"
               className="m-3 rounded"

client/src/components/Room/RoomHeader.js

@@ -4,7 +4,7 @@ const RoomHeader = () => {
   return (
     <div
       className="d-flex justify-content-between align-items-center p-2"
-      style={{ backgroundColor: '#C4C4C4', height: "60px" }}
+      style={{ backgroundColor: '#C4C4C4', height: '60px' }}
     >
       <div className="d-flex align-items-center">
         <img
@@ -17,23 +17,14 @@ const RoomHeader = () => {
           className="p-3 ms-1 text-center text-decoration-none"
           style={{
             fontWeight: 'bold',
-            fontSize: '15px',
-            overflow: 'scroll',
-            whiteSpace: 'nowrap',
-            width: '280px',
-            color: '#000000',
+            fontSize: '20px',
+            color: '#6c33a2',
           }}
-        >
-          데계데계데계데계데계데계데계데계데계데계 재밌는 수학과
-        </a>
-      </div>
-      <a
-        className="text-decoration-none"
-        style={{ fontWeight: 'bold', fontSize: '20px', color: '#6c33a2' }}
         >
           # 회의
         </a>
       </div>
+    </div>
   )
 }
 

client/src/components/Room/Screen.js

@@ -4,7 +4,7 @@ const Screen = () => {
       <div className="row">
         <div className="col" style={{ backgroundColor: '#FCF4FF' }}>
           <p className="m-2" style={{ fontWeight: 'bold', color: '#4A4251', fontSize: '20px' }}>
-            스크린
+            스크린<br/>
           </p>
           <div className="col m-5"></div>
         </div>

client/src/components/Room/User.js

@@ -2,7 +2,7 @@ const User = () => {
   return (
     <div className="container">
       <div className="row">
-        <div className="col" style={{ backgroundColor: "#DEC7F5", position:'absolute', bottom:'58px'}}>
+        <div className="col" style={{ backgroundColor: "#DEC7F5", position:'absolute', bottom:'58px', width: '414px'}}>
           <p
             className="m-2"
             style={{ fontWeight: "bold", color: "#4A4251", fontSize: "20px" }}