Merge pull request #3 from Chicago/master

Merge 1.3.1
Chicago · Jan 11, 2017 · 85d2568 · 85d2568
2 parents 1efca5d + bd662d5
commit 85d2568
Show file tree

Hide file tree

Showing 9 changed files with 107 additions and 281 deletions.
diff --git a/docs/media/dec29.jpg b/docs/media/dec29.jpg
diff --git a/src/css/help.css b/src/css/help.css
diff --git a/src/css/ogrid-theme-blue.css b/src/css/ogrid-theme-blue.css
@@ -10,9 +10,21 @@ html, body {
   left: calc(100% - 32px);
 }
 
-
-#qsearch .popover {
+/*#qsearch .popover {
   top: 35px !important;
+}*/
+
+.popover {
+    top: 44px !important;
+    z-index: 5000;
+}
+
+.popover-content  {
+    font-size: small;
+}
+
+.popover-title .close {
+    font-size: small;
 }
 
 /* override bootstrap default to avoid having a 'fat' nav bar*/

diff --git a/src/css/ogrid.css b/src/css/ogrid.css
@@ -347,9 +347,15 @@ h6 > a {
   width: 500px;
 }
 
-#qsearch .popover-content {
+.popover {
+  width: 500px;
+}
+
+.popover-content {
   padding: 10px;
-  width: 100%;
+  width: 272px;
+  overflow-y: auto;
+  height: 600px;
 }
 
 #ogrid-adv-content .panel-heading {
@@ -358,7 +364,8 @@ h6 > a {
 
 /* mobile styles for quick search hint */
 @media (max-width: 480px) {
-  #qsearch .popover {
+  /*#qsearch .popover {*/
+  .popover {
     width: 230px;
   }
 }

diff --git a/src/help.html b/src/help.html
diff --git a/src/index.html b/src/index.html
@@ -67,7 +67,7 @@
                 <form class="navbar-form " role="search">
                     <div class="form-group has-feedback input-group" id="qsearch">
                         <input autocapitalize="off" type="text" class="form-control" id="qsearch-input" placeholder="Find Places, Businesses, etc." />
-                        <span id="ogrid-qsearch-hint" class="glyphicon glyphicon-question-sign" data-toggle="popover" tabindex="0" data-trigger="focus" data-placement="bottom" title="Quick Search Help"></span>
+                        <span id="ogrid-qsearch-hint" class="glyphicon glyphicon-question-sign" data-toggle="popover" tabindex="0" data-placement="bottom" title="Quick Search Help"></span>
                         <span class="input-group-addon" id="qsearch-button">
                             <i class="fa fa-search"></i>
                         </span>
@@ -127,7 +127,7 @@
             <li class="active">
               <a  href="#build-query" role="tab" data-toggle="tab">Search</a>
             </li>
-            <li>
+            <li id="ogrid-manage-queries">
               <a href="#save-queries" role="tab" data-toggle="tab">Manage Queries</a>
             </li>
           </ul>