Merge pull request #83 from shreyas1434shinde/main

Issue #PS-2322 fix: Workspace UI improvements and Fixes
tekdi · Nov 12, 2024 · 4d7ebe1 · 4d7ebe1
2 parents 272371a + af737ad
commit 4d7ebe1
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 21 deletions.
diff --git a/src/components/V1-Player/V1Player.tsx b/src/components/V1-Player/V1Player.tsx
@@ -41,7 +41,7 @@ const V1Player = ({ playerConfig }: PlayerProps) => {
         title="Content Player"
         src="/content/preview/preview.html?webview=true"
         aria-label="Content Player"
-        style={{ width: '100%', height: '100%', border: 'none' }}
+        style={{ width: '100%', height: '600px', border: 'none' }}
       ></iframe>
     </div>
   );

diff --git a/src/pages/workspace/content/review/index.tsx b/src/pages/workspace/content/review/index.tsx
@@ -174,7 +174,7 @@ const ReviewContentSubmissions = () => {
                   borderRadius: "16px",
                   padding: 2,
                   backgroundColor: "white",
-                  // mb: 2,
+
                 }}
               >
                 <Typography
@@ -215,7 +215,7 @@ const ReviewContentSubmissions = () => {
               </Box>
             </Grid>
             <Grid item xs={4}>
-              <CardContent
+              <Box
                 sx={{
                   border: "1px solid #ccc",
                   borderRadius: "16px",
@@ -363,26 +363,37 @@ const ReviewContentSubmissions = () => {
                     {formatDate(contentDetails.lastUpdatedOn)}
                   </Box>
                 </Box>
-              </CardContent>
+              </Box>
             </Grid>
           </Grid>
 
-          <CardActions
-            disableSpacing
-            sx={{ display: "flex", justifyContent: "flex-end", mt:2, mb: 2 }}
-          >
-            <Button
-              variant="contained"
-              color="primary"
-              onClick={handlePublish}
-              sx={{ marginRight: 1 }}
-            >
-              Publish
-            </Button>
-            <Button variant="contained" color="primary" onClick={handleReject}>
-              Request Changes
-            </Button>
-          </CardActions>
+          <Box
+  sx={{
+    display: "flex",
+    justifyContent: "flex-end",
+    mt: 2,
+    mb: 2,
+    padding: "8px", // Add padding to avoid overlap
+    borderRadius: "16px", // Match the surrounding box's border radius
+  }}
+>
+  <Button
+    variant="contained"
+    color="primary"
+    onClick={handlePublish}
+    sx={{ marginRight: 1, minWidth: "120px" }} // Ensure the button has enough width
+  >
+    Publish
+  </Button>
+  <Button
+    variant="contained"
+    color="primary"
+    onClick={handleReject}
+    sx={{ minWidth: "120px" }} // Ensure the button has enough width
+  >
+    Request Changes
+  </Button>
+</Box>
         </>
       ) : (
         <Typography>No content details available</Typography>

diff --git a/src/styles/global.css b/src/styles/global.css
@@ -13,7 +13,8 @@
 }
 
 
-html, body {
+html,
+body {
   margin: 0;
   padding: 0;
 }