Merge branch 'dev' into vufind-1233

demiankatz · Dec 7, 2023 · bdf0ab1 · bdf0ab1
2 parents b3df25b + 0a879cd
commit bdf0ab1
Show file tree

Hide file tree

Showing 9 changed files with 102 additions and 99 deletions.
diff --git a/themes/bootprint3/css/compiled.css b/themes/bootprint3/css/compiled.css
diff --git a/themes/bootstrap3/css/compiled.css b/themes/bootstrap3/css/compiled.css
diff --git a/themes/bootstrap3/less/components/keyboard.less b/themes/bootstrap3/less/components/keyboard.less
@@ -86,13 +86,3 @@
 .show-keyboard {
   display: block;
 }
-
-@media (max-width: 400px) {
-  .keyboard-selection {
-    display: none;
-  }
-
-  .show-keyboard {
-    display: none;
-  }
-}
diff --git a/themes/bootstrap3/less/components/search.less b/themes/bootstrap3/less/components/search.less
@@ -58,22 +58,6 @@
   .home-facet-list { flex: 0 1 100%; }
 }
 
-.searchForm {
-  margin: 0;
-  padding: 0;
-
-  .input-group .form-control:first-child {
-    border-top-right-radius: @input-border-radius;
-    border-bottom-right-radius: @input-border-radius;
-  }
-
-  @media (max-width: 767px) {
-    .input-group {
-      width: 100%;
-    }
-  }
-}
-
 header .container.navbar { margin-bottom: 0; }
 
 .search-sort, .search-result-limit { display: flex; }
@@ -688,32 +672,58 @@ table.search-history-table {
   }
 }
 
-.searchForm-query {
-  position: relative;
-  display: inline-block;
+.searchForm {
+  margin: 0;
+  padding: 0;
+
+  .searchForm-query {
+    position: relative;
 
-  #searchForm_lookfor {
-    padding-right: 28px;
+    @media (min-width: 768px) {
+      display: inline-block;
+    }
+
+    #searchForm_lookfor {
+      padding-right: 34px;
+    }
+
+    /* Adjust padding for the virtual keyboard button */
+    @media (min-width: 401px) {
+      #searchForm_lookfor.with-keyboard-selection {
+        padding-right: 72px;
+      }
+    }
+
+    #searchForm_controls {
+      position: absolute;
+      right: 3px;
+      top: 5px;
+      z-index: 4;
+      height: 2em;
+    }
+
+    #searchForm-reset {
+      bottom: 0;
+      width: 2em;
+      border: none;
+      border-radius: 50%;
+      background-color: @gray-lighter;
+      margin: 0;
+      padding: 2px;
+      font-size: 1em;
+      cursor: pointer;
+    }
   }
+}
 
-  #searchForm_controls {
-    position: absolute;
-    right: 3px;
-    top: 5px;
-    z-index: 4;
-    height: 2em;
+/* Hide virtual keyboard on narrow screens */
+@media (max-width: 400px) {
+  .keyboard-selection {
+    display: none;
   }
 
-  #searchForm-reset {
-    bottom: 0;
-    width: 2em;
-    border: none;
-    border-radius: 50%;
-    background-color: @gray-lighter;
-    margin: 0;
-    padding: 2px;
-    font-size: 1em;
-    cursor: pointer;
+  .show-keyboard, .simple-keyboard {
+    display: none;
   }
 }
 

diff --git a/themes/bootstrap3/scss/components/keyboard.scss b/themes/bootstrap3/scss/components/keyboard.scss
@@ -86,13 +86,3 @@
 .show-keyboard {
   display: block;
 }
-
-@media (max-width: 400px) {
-  .keyboard-selection {
-    display: none;
-  }
-
-  .show-keyboard {
-    display: none;
-  }
-}
diff --git a/themes/bootstrap3/scss/components/search.scss b/themes/bootstrap3/scss/components/search.scss
@@ -58,22 +58,6 @@ $thumbnail-width-large:  160px;
   .home-facet-list { flex: 0 1 100%; }
 }
 
-.searchForm {
-  margin: 0;
-  padding: 0;
-
-  .input-group .form-control:first-child {
-    border-top-right-radius: $input-border-radius;
-    border-bottom-right-radius: $input-border-radius;
-  }
-
-  @media (max-width: 767px) {
-    .input-group {
-      width: 100%;
-    }
-  }
-}
-
 header .container.navbar { margin-bottom: 0; }
 
 .search-sort, .search-result-limit { display: flex; }
@@ -688,32 +672,58 @@ table.search-history-table {
   }
 }
 
-.searchForm-query {
-  position: relative;
-  display: inline-block;
+.searchForm {
+  margin: 0;
+  padding: 0;
+
+  .searchForm-query {
+    position: relative;
 
-  #searchForm_lookfor {
-    padding-right: 28px;
+    @media (min-width: 768px) {
+      display: inline-block;
+    }
+
+    #searchForm_lookfor {
+      padding-right: 34px;
+    }
+
+    /* Adjust padding for the virtual keyboard button */
+    @media (min-width: 401px) {
+      #searchForm_lookfor.with-keyboard-selection {
+        padding-right: 72px;
+      }
+    }
+
+    #searchForm_controls {
+      position: absolute;
+      right: 3px;
+      top: 5px;
+      z-index: 4;
+      height: 2em;
+    }
+
+    #searchForm-reset {
+      bottom: 0;
+      width: 2em;
+      border: none;
+      border-radius: 50%;
+      background-color: $gray-lighter;
+      margin: 0;
+      padding: 2px;
+      font-size: 1em;
+      cursor: pointer;
+    }
   }
+}
 
-  #searchForm_controls {
-    position: absolute;
-    right: 3px;
-    top: 5px;
-    z-index: 4;
-    height: 2em;
+/* Hide virtual keyboard on narrow screens */
+@media (max-width: 400px) {
+  .keyboard-selection {
+    display: none;
   }
 
-  #searchForm-reset {
-    bottom: 0;
-    width: 2em;
-    border: none;
-    border-radius: 50%;
-    background-color: $gray-lighter;
-    margin: 0;
-    padding: 2px;
-    font-size: 1em;
-    cursor: pointer;
+  .show-keyboard, .simple-keyboard {
+    display: none;
   }
 }
 

diff --git a/themes/bootstrap3/templates/search/searchbox.phtml b/themes/bootstrap3/templates/search/searchbox.phtml
@@ -98,8 +98,11 @@
           . ($this->searchbox()->autocompleteAutoSubmit($this->searchClassId) ? ' ac-auto-submit' : '');
         $searchboxAttributes['data-autocomplete-formatting-rules'] = $this->searchbox()->autocompleteFormattingRulesJson($this->searchClassId);
       }
+      if (!empty($keyboardLayouts)) {
+        $searchboxAttributes['class'] .= ' with-keyboard-selection';
+      }
     ?>
-    <div class="searchForm-query input-group">
+    <div class="searchForm-query">
       <input<?=$this->htmlAttributes($searchboxAttributes)?>>
       <div id="searchForm_controls">
         <button id="searchForm-reset" class="searchForm-reset hidden" type="reset" tabindex="-1" aria-label="<?=$this->transEscAttr('searchform_reset_button')?>"><?=$this->icon('ui-reset-search');?></button>

diff --git a/themes/local_theme_example/css/compiled.css b/themes/local_theme_example/css/compiled.css
diff --git a/themes/sandal/css/compiled.css b/themes/sandal/css/compiled.css