Merge d242ccec34 into ee7a7a0544

client/src/pages/Teacher/EditorQuiz/EditorQuiz.tsx

@@ -248,6 +248,7 @@ const QuizForm: React.FC = () => {
                 <TextField
                     onChange={handleQuizTitleChange}
                     value={quizTitle}
+                    color="primary"
                     placeholder="Titre du quiz"
                     label="Titre du quiz"
                     sx={{ width: '200px', marginTop: '50px' }}
@@ -259,7 +260,7 @@ const QuizForm: React.FC = () => {
                     value={selectedFolder}
                     onChange={handleSelectFolder}
                     disabled={!isNewQuiz}
-                    style={{ marginBottom: '16px', width: '200px', marginTop: '50px' }}
+                    style={{ marginBottom: '16px', width: '200px', marginTop: '10px' }}
                 >
                     <option disabled value="">
                         Choisir un dossier...

client/src/pages/Teacher/ManageRoom/ManageRoom.tsx

@@ -381,34 +381,6 @@ const ManageRoom: React.FC = () => {
 
     return (
         <div className="room">
-            <div
-                style={{
-                    display: 'flex',
-                    justifyContent: 'center',
-                    alignItems: 'center',
-                    width: '100%',
-                    marginBottom: '10px'
-                }}
-            >
-                <h1 style={{ margin: 0, display: 'flex', alignItems: 'center' }}>
-                    Salle : {formattedRoomName}
-                    <div
-                        className="userCount subtitle"
-                        style={{
-                            display: 'inline-flex',
-                            alignItems: 'center',
-                            fontSize: '1.5rem',
-                            fontWeight: 'bold',
-                            marginLeft: '10px',
-                            marginBottom: '0px'
-                        }}
-                    >
-                        <GroupIcon style={{ marginRight: '5px', verticalAlign: 'middle' }} />{' '}
-                        {students.length}/60
-                    </div>
-                </h1>
-            </div>
-
             <div className="roomHeader">
                 <DisconnectButton
                     onReturn={handleReturn}
@@ -428,6 +400,33 @@ const ManageRoom: React.FC = () => {
 
                 <div className="dumb"></div>
             </div>
+            <div
+                style={{
+                    display: 'flex',
+                    justifyContent: 'center',
+                    alignItems: 'center',
+                    width: '100%',
+                    marginBottom: '10px'
+                }}
+            >
+                <h1 style={{ margin: 0, display: 'flex', alignItems: 'center' }}>
+                    Salle : {formattedRoomName}
+                    <div
+                        className="userCount subtitle"
+                        style={{
+                            display: 'inline-flex',
+                            alignItems: 'center',
+                            fontSize: '1.5rem',
+                            fontWeight: 'bold',
+                            marginLeft: '20px',
+                            marginBottom: '0px'
+                        }}
+                    >
+                        <GroupIcon style={{ marginRight: '5px', verticalAlign: 'middle' }} />{' '}
+                        {students.length}/60
+                    </div>
+                </h1>
+            </div>
 
             {/* the following breaks the css (if 'room' classes are nested) */}
             <div className="">