Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 1.3.1 #3

Merged
merged 4 commits into from
Jan 11, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added docs/media/dec29.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
63 changes: 0 additions & 63 deletions src/css/help.css

This file was deleted.

16 changes: 14 additions & 2 deletions src/css/ogrid-theme-blue.css
Original file line number Diff line number Diff line change
Expand Up @@ -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*/
Expand Down
13 changes: 10 additions & 3 deletions src/css/ogrid.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -358,7 +364,8 @@ h6 > a {

/* mobile styles for quick search hint */
@media (max-width: 480px) {
#qsearch .popover {
/*#qsearch .popover {*/
.popover {
width: 230px;
}
}
Expand Down
181 changes: 0 additions & 181 deletions src/help.html

This file was deleted.

4 changes: 2 additions & 2 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Loading