Merge branch 'chooser-style-#419' into unstable

apostrophecms · Feb 5, 2016 · de39d99 · de39d99
2 parents b0e6dba + 45c207e
commit de39d99
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git a/lib/modules/apostrophe-docs/views/chooser.html b/lib/modules/apostrophe-docs/views/chooser.html
@@ -6,5 +6,5 @@
   {# AJAX populates me #}
 </div>
 {% if data.autocomplete %}
-  <input type="text" name="autocomplete" data-autocomplete />
+  <input type="text" name="autocomplete" class="apos-field-input apos-field-input-text" data-autocomplete />
 {% endif %}
diff --git a/lib/modules/apostrophe-ui/public/css/components/autocomplete.less b/lib/modules/apostrophe-ui/public/css/components/autocomplete.less
@@ -0,0 +1,24 @@
+.ui-autocomplete
+{
+  background: none;
+  background-color: @apos-white;
+  .apos-drop-shadow;
+
+  .ui-menu-item
+  {
+    border: none;
+    padding: @apos-padding-2;
+    font-family: "Roboto", "Helvetica", sans-serif;
+    font-size: 16px;
+    font-weight: 500;
+  }
+
+  .ui-menu-item:hover,
+  .ui-menu-item.ui-state-focus
+  {
+    border: none;
+    background: none;
+    color: @apos-white;
+    background-color: @apos-primary;
+  }
+}
diff --git a/lib/modules/apostrophe-ui/public/css/user.less b/lib/modules/apostrophe-ui/public/css/user.less
@@ -6,6 +6,7 @@
 // UI-Scoped Styles ===================================
 // Styles here must be scoped to override the reset
 // which is scoped to the class '.apos-ui'
+
 .apos-ui
 {
 	// Globals =================================
@@ -23,3 +24,5 @@
   @import 'components/fields.less';
 	@import 'components/tables.less';
 }
+
+@import 'components/autocomplete.less';