Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feature/tooltipsUpgrade' into de…
Browse files Browse the repository at this point in the history
…velop
  • Loading branch information
Don-Isdale committed Jan 24, 2020
2 parents 82b6dd0 + c0e3568 commit 2e6b050
Show file tree
Hide file tree
Showing 5 changed files with 2,324 additions and 414 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ COPY ./frontend /frontend
COPY ./backend/common/utilities/interval-overlap.js /frontend/app/utils/draw/.

RUN node --version
RUN cd /frontend && npm ci && bower install --allow-root
RUN cd /frontend && (npm ci || npm install) && bower install --allow-root

RUN cd /app && npm install [email protected] && npm ci

Expand Down
25 changes: 12 additions & 13 deletions frontend/app/styles/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1167,6 +1167,11 @@ div#goto-feature > div
}
.tooltip-inner {
border-radius: 7px;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
align-content: center;
}


Expand Down Expand Up @@ -1291,27 +1296,21 @@ div#left-panel-upload select
/* applies in this context :
* div#left-panel-feature-search > div > div > div.ember-popover
*/
ul.feature-found {
height: 28ex;
overflow-y: auto;
}
/* could use .list-unstyled, but it implies padding-left:0 */
ul.feature-found
{
ul.feature-found {
list-style-type: none;
text-align : left;
}
ul.feature-found
{
overflow-y: auto;
text-align : center;
/* override user-agent stylesheet (Chrome) */
-webkit-padding-start: inherit;
/* target badge may be close to left so leave a margin for clipping. */
margin-left: 2em;
height: auto;
max-height: 15ex;
width: auto;
max-width: 200px;
overflow-y: auto;
margin-bottom: 0;
}
ul.blocks-found > li > div > div.ember-popover {
body > div.ember-popover {
padding: 3px 5px;
}
/* -------------------------------------------------------------------------- */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{{entry.count}}
</span>

{{#ember-popover }}
{{#ember-popover side="auto" popperContainer="body"}}
<ul class='feature-found'>
{{#each features as |feature|}}
<li>
Expand Down
Loading

0 comments on commit 2e6b050

Please sign in to comment.