Merge 0941a44e50 into ee7a7a0544

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

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

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

@@ -381,25 +381,6 @@ const ManageRoom: React.FC = () => {
 
     return (
         <div className="room">
-            <div className="roomHeader">
-                <DisconnectButton
-                    onReturn={handleReturn}
-                    askConfirm
-                    message={`Êtes-vous sûr de vouloir quitter?`}
-                />
-
-                <div
-                    className="headerContent"
-                    style={{
-                        display: 'flex',
-                        justifyContent: 'space-between',
-                        alignItems: 'center',
-                        width: '100%'
-                    }}
-                ></div>
-
-                <div className="dumb"></div>
-            </div>
             <div
                 style={{
                     display: 'flex',
@@ -418,7 +399,7 @@ const ManageRoom: React.FC = () => {
                             alignItems: 'center',
                             fontSize: '1.5rem',
                             fontWeight: 'bold',
-                            marginLeft: '20px',
+                            marginLeft: '10px',
                             marginBottom: '0px'
                         }}
                     >
@@ -428,6 +409,26 @@ const ManageRoom: React.FC = () => {
                 </h1>
             </div>
 
+            <div className="roomHeader">
+                <DisconnectButton
+                    onReturn={handleReturn}
+                    askConfirm
+                    message={`Êtes-vous sûr de vouloir quitter?`}
+                />
+
+                <div
+                    className="headerContent"
+                    style={{
+                        display: 'flex',
+                        justifyContent: 'space-between',
+                        alignItems: 'center',
+                        width: '100%'
+                    }}
+                ></div>
+
+                <div className="dumb"></div>
+            </div>
+
             {/* the following breaks the css (if 'room' classes are nested) */}
             <div className="">
                 {quizQuestions ? (