Merge remote-tracking branch 'upstream/master'

Bad3r · Jul 9, 2023 · 20c8887 · 20c8887
2 parents 7dd8e39 + 10ec7d6
commit 20c8887
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -56,7 +56,6 @@ const common = {
       () => gulp.src([
         'node_modules/katex/dist/katex.min.js',
         'node_modules/html2canvas/dist/html2canvas.min.js',
-        'node_modules/swiped-events/dist/swiped-events.min.js',
         'node_modules/interactjs/dist/interact.min.js',
         'node_modules/photoswipe/dist/umd/*.js'
       ]).pipe(gulp.dest(path.join(outputPath, 'js'))),

diff --git a/src/main/frontend/components/datetime.cljs b/src/main/frontend/components/datetime.cljs
@@ -151,8 +151,8 @@
                                    (contains? #{"deadline" "scheduled"}
                                               (string/lower-case current-command)))
         date (state/sub :date-picker/date)]
-    [:div#date-time-picker.flex.flex-row {:on-click (fn [e] (util/stop e))
-                                          :on-mouse-down (fn [e] (.stopPropagation e))}
+    [:div#date-time-picker.flex.flex-col.sm:flex-row {:on-click (fn [e] (util/stop e))
+                                                      :on-mouse-down (fn [e] (.stopPropagation e))}
      (ui/datepicker
       date
       {:deadline-or-schedule? deadline-or-schedule?

diff --git a/src/main/frontend/components/editor.css b/src/main/frontend/components/editor.css
@@ -77,10 +77,10 @@ pre {
 }
 
 #time-repeater {
-  width: 135px;
+  min-width: 300px;
 
   @screen sm {
-    min-width: 300px;
+    width: 135px;
   }
 }
 

diff --git a/src/main/frontend/extensions/code.css b/src/main/frontend/extensions/code.css
@@ -44,6 +44,7 @@
 }
 
 .CodeMirror {
+  height: auto;
   width: 100%;
   font-family: Fira Code, Monaco, Menlo, Consolas, 'COURIER NEW', monospace;
   border-radius: 2px;

diff --git a/src/main/frontend/handler/mobile/swipe.cljs b/src/main/frontend/handler/mobile/swipe.cljs