Merge branch 'main' into playwright

hasgeek · Sep 27, 2023 · 74ba910 · 74ba910
2 parents ebb04c7 + eafb5ab
commit 74ba910
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 18 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -47,12 +47,12 @@ repos:
           ]
         files: ^requirements/.*\.txt$
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.11.0
+    rev: v3.13.0
     hooks:
       - id: pyupgrade
         args: ['--keep-runtime-typing', '--py310-plus']
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.0.290
+    rev: v0.0.291
     hooks:
       - id: ruff
         args: ['--fix', '--exit-non-zero-on-fix']

diff --git a/funnel/assets/sass/form.scss b/funnel/assets/sass/form.scss
@@ -467,3 +467,23 @@
   border: none;
   background-image: none;
 }
+
+// ============================================================================
+// Google Map in the form
+// ============================================================================
+
+.map {
+  position: relative;
+  .map__marker {
+    margin-top: $mui-grid-padding * 0.5;
+    width: 100%;
+    height: 40em;
+  }
+  .map__clear {
+    position: absolute;
+    top: 22px;
+    right: 0;
+    z-index: 2;
+    background: #fff;
+  }
+}
diff --git a/funnel/assets/sass/pages/project.scss b/funnel/assets/sass/pages/project.scss
@@ -589,22 +589,6 @@
   background: $mui-bg-color-primary;
 }
 
-.map {
-  position: relative;
-  .map__marker {
-    margin-top: $mui-grid-padding * 0.5;
-    width: 100%;
-    height: 40em;
-  }
-  .map__clear {
-    position: absolute;
-    top: 22px;
-    right: 0;
-    z-index: 2;
-    background: #fff;
-  }
-}
-
 .label {
   padding: 4px 8px;
   font-size: 12px;