Merge branch 'master' into fix-IOS-bottom-fixed-position

zxhycxq · Nov 5, 2020 · 7a20921 · 7a20921
2 parents 683ce49 + c5d6601
commit 7a20921
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/resources/css/common.css b/resources/css/common.css
@@ -1450,11 +1450,11 @@ a.tag:hover {
 
 /* Hide scrollbar for IE, Edge and Firefox */
 .hide-scrollbar {
-  -ms-overflow-style: none; /* IE and Edge */
-  scrollbar-width: none; /* Firefox */
+    -ms-overflow-style: none;  /* IE and Edge */
+    scrollbar-width: none !important;  /* Firefox */
 }
 
 /* Hide scrollbar for Chrome, Safari and Opera */
 .hide-scrollbar::-webkit-scrollbar {
-  display: none;
+    display: none;
 }
diff --git a/src/main/frontend/mixins.cljs b/src/main/frontend/mixins.cljs
@@ -61,12 +61,6 @@
                  ;; If the click target is outside of current node
                   (when-not (dom/contains dom-node (.. e -target))
                     (on-hide state e :click))))
-        (listen state dom-node "keydown"
-                (fn [e]
-                  (case (.-keyCode e)
-                   ;; Esc
-                    27 (on-hide state e :esc)
-                    nil)))
         (when visibilitychange?
           (listen state js/window "visibilitychange"
                   (fn [e]
@@ -135,7 +129,7 @@
      ;; :will-unmount (fn [state]
      ;;                 (detach state)
      ;;                 state)
-     })))
+})))
 
 (defn modal
   [k]