resolve conflicts

src/pages/Stat/StatPage.jsx

@@ -32,9 +32,7 @@ function StatPage() {
     { title: "Événement D", tasks: "Communication sur les réseaux" },
     { title: "Événement E", tasks: "Communication sur les réseaux" },
     { title: "Événement F", tasks: "Communication sur les réseaux" },
-
   ];
-
   const pendingMembers = [
     { name: "Antoine Ordonneau" },
     { name: "Giovanni Josserand" },
@@ -48,11 +46,9 @@ function StatPage() {
   const handleValidate = (name) => {
     console.log(`Valider ${name}`);
   };
-
   const handleReject = (name) => {
     console.log(`Refuser ${name}`);
   };
-
   const chartData = {
     labels: ["Progress", "Background"],
     datasets: [
@@ -61,13 +57,12 @@ function StatPage() {
         backgroundColor: ["#1e60f9ff", "#ffffffff"],
         borderWidth: 0,
         weight: 10,
-        cutout: "95%",
+        cutout: "93%",
         circumference: 360,
         rotation: -90,
       },
     ],
   };
-
   const chartOptions = {
     responsive: true,
     plugins: {
@@ -83,23 +78,24 @@ function StatPage() {
       animateRotate: true,
     },
   };
-
   return (
     <div className={styles.container}>
       <div className={`${styles.leftBlock} glassCard`}>
         <div className={styles.participationHeader}>
           <div className={`${styles.partiText} glassCard`}>
             <label htmlFor={styles.months}>Taux de participation depuis :</label>
-            
-            <FormControl>
+            <div className={styles.formControl}>
+            <FormControl className={styles.formDesign}>
               <Select
     value={selected}
-    onChange={(e) => setSelected(e.target.value)}
+    onChange={(e) => 
+      setSelected(e.target.value)
+      }
     sx={{
       width: "100px",
       height: "35px",
       fontSize: "19px",
-      paddingBottom:"2.5px",
+      paddingBottom:"-2px",
       
       "& .MuiOutlinedInput-notchedOutline": {
         border: "none",
@@ -117,7 +113,7 @@ function StatPage() {
         sx: {
           className: "glassCard",
           borderRadius:"7px",
-          background: "rgba(255, 255, 255, 0.65)",
+          //background: "rgba(255, 255, 255, 0.65)",
           width: "100px",
           maxWidth: "100px",
           
@@ -132,6 +128,7 @@ function StatPage() {
     <MenuItem value="12" sx={{ fontSize: "18px" }}>12 mois</MenuItem>
   </Select>
 </FormControl>
+</div>
 
           </div>
         </div>