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

Fixed issues with Fast template logo alignment #2469

Merged
merged 1 commit into from
Jun 30, 2021
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
14 changes: 6 additions & 8 deletions panel/template/fast/grid/fast_grid_template.html
Original file line number Diff line number Diff line change
Expand Up @@ -179,18 +179,16 @@
<div class="pn-bar"></div>
<div class="pn-bar"></div>
<div class="pn-bar"></div>
</span>
</span>
<fast-tooltip anchor="sidebar-button" position="right">
Toggle the Sidebar
</fast-tooltip>
{% endif %}
<div class="app-header">
<div>
{% if app_logo %}<a class="navbar-brand app-logo" href="{{ site_url }}"><img src="{{ app_logo }}" class="app-logo"></a>{% endif %}
{% if site_title %}<a class="title" href="{{ site_url }}" >&nbsp;{{ site_title }}</a>{% endif %}
{% if site_title and app_title%}<span class="title">&nbsp;-</span>{% endif %}
{% if app_title %}<a class="title" href="" >{{ app_title }}</a>{% endif %}
</div>
</div>
<div id="header-items">
{% for doc in docs %}
Expand Down Expand Up @@ -224,14 +222,14 @@
</fast-tooltip>
</div>
{% endif %}
{% if busy %}
<div class="pn-busy-container" id="busy-container">
{{ embed(roots.busy_indicator) | indent(6) }}
</div>
{% if busy %}
<div class="pn-busy-container" id="busy-container">
{{ embed(roots.busy_indicator) | indent(6) }}
</div>
<fast-tooltip anchor="busy-container" position="left">
Busy Indicator
</fast-tooltip>
{% endif %}
{% endif %}

</nav>
</fast-design-system-provider>
Expand Down
12 changes: 5 additions & 7 deletions panel/template/fast/list/fast_list_template.html
Original file line number Diff line number Diff line change
Expand Up @@ -182,12 +182,10 @@
</span>
{% endif %}
<div class="app-header">
<div>
{% if app_logo %}<a class="navbar-brand app-logo" href="{{ site_url }}"><img src="{{ app_logo }}" class="app-logo"></a>{% endif %}
{% if site_title %}<a class="title" href="{{ site_url }}" >&nbsp;{{ site_title }}</a>{% endif %}
{% if site_title and app_title%}<span class="title">&nbsp;-</span>{% endif %}
{% if app_title %}<a class="title" href="" >{{ app_title }}</a>{% endif %}
</div>
</div>
<div id="header-items">
{% for doc in docs %}
Expand All @@ -210,11 +208,11 @@
</fast-switch>
</div>
{% endif %}
{% if busy %}
<div class="pn-busy-container">
{{ embed(roots.busy_indicator) | indent(6) }}
</div>
{% endif %}
{% if busy %}
<div class="pn-busy-container">
{{ embed(roots.busy_indicator) | indent(6) }}
</div>
{% endif %}

</nav>
</fast-design-system-provider>
Expand Down