Merge branch 'unstructuredstudio:master' into master

brrkrmn · Oct 18, 2023 · 5ab51fc · 5ab51fc
2 parents 2e5a19d + 690d6d1
commit 5ab51fc
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/zubhub_frontend/zubhub/src/assets/js/styles/views/search_results/searchResultsStyles.js b/zubhub_frontend/zubhub/src/assets/js/styles/views/search_results/searchResultsStyles.js
@@ -22,9 +22,6 @@ const styles = theme => ({
     fontWeight: 'bold',
     textAlign: 'center',
   },
-  projectGridStyle: {
-    marginBottom: '2em',
-  },
   cardStyle: {
     display: 'flex',
     flexDirection: 'column',

diff --git a/zubhub_frontend/zubhub/src/views/create_activity/step1/Step1.jsx b/zubhub_frontend/zubhub/src/views/create_activity/step1/Step1.jsx
@@ -37,7 +37,7 @@ export default function Step1({ formik, ...props }) {
       <SelectFromPills
         name="category"
         label="What category does your activity belong too? "
-        helperText="Select three categories that best describe your project. Select none if you are unsure about your category."
+        helperText="Select three categories that best describe your project."
         data={categories}
         onChange={_.debounce(data => formik.setFieldValue('category', data), 200)}
         selectedItems={formik.values.category}

diff --git a/zubhub_frontend/zubhub/src/views/create_project/step3/Step3.jsx b/zubhub_frontend/zubhub/src/views/create_project/step3/Step3.jsx
@@ -63,7 +63,7 @@ export default function Step3({ formik, handleBlur, ...props }) {
         What category does your project belong to? <span className={commonClasses.colorRed}>*</span>
       </label>
       <Typography style={{ marginBottom: 10 }}>
-        Select any of the categories that best describe your project. Select none if you are unsure about your category.
+        Select any of the categories that best describe your project.
       </Typography>
 
       <Grid container spacing={3} className={classes.pillContainer}>

diff --git a/zubhub_frontend/zubhub/src/views/search_results/SearchResults.jsx b/zubhub_frontend/zubhub/src/views/search_results/SearchResults.jsx
@@ -141,25 +141,28 @@ function SearchResults(props) {
         handleSetState,
       );
     } else {
-      return results.map(project => (
-        <Grid
-          item
-          xs={12}
-          sm={6}
-          md={4}
-          className={classes.projectGridStyle}
-          align="center"
-        >
-          <Project
-            project={project}
-            key={project.id}
-            updateProjects={res =>
-              handleSetState(updateProjects(res, state, props, toast))
-            }
-            {...props}
-          />
+      return (
+        <Grid container spacing={3}>
+          {results.map(project => (
+            <Grid
+              item
+              xs={12}
+              sm={6}
+              md={4}
+              align="center"
+            >
+              <Project
+                project={project}
+                key={project.id}
+                updateProjects={res =>
+                  handleSetState(updateProjects(res, state, props, toast))
+                }
+                {...props}
+              />
+            </Grid>
+          ))}
         </Grid>
-      ));
+      )
     }
   };