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.

Sign up for GitHub

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

Fix CSS load order in Templates #1698

Merged
merged 6 commits into from
Oct 27, 2020
Merged

Fix CSS load order in Templates #1698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fe143b0
switch css order
Oct 27, 2020
0dd7205
Merge branch 'master' of https://github.com/holoviz/panel into templa…
Oct 27, 2020
b72e339
fix overlow-y on sidebar
Oct 27, 2020
ae41169
fix logo issue
Oct 27, 2020
a98c598
fix scrollbar and logo issue
Oct 27, 2020
07242d8
fix scrollbars
Oct 27, 2020
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
1 change: 1 addition & 0 deletions panel/template/bootstrap/bootstrap.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ img.app-logo {
padding-right: 10px;
font-size: 28px;
height: 30px;
max-width: inherit;
}

p.bk.card-button {
Expand Down
2 changes: 1 addition & 1 deletion panel/template/bootstrap/bootstrap.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
{% if meta_viewport %}<meta name="viewport" content="{{ meta_viewport }}">{% endif %}
{% if base_url and base_target %}<base href="{{ base_url }}" target="{{ base_target }}">{% endif %}

<link rel="stylesheet" href="{{ template_resources['css']['bootstrap'] }}" crossorigin="anonymous">
<link rel="stylesheet" href="{{ template_resources['css']['base'] }}">
<link rel="stylesheet" href="{{ template_resources['css']['theme'] }}">
<link rel="stylesheet" href="{{ template_resources['css']['bootstrap'] }}" crossorigin="anonymous">
<script src="{{ template_resources['js']['jquery'] }}" crossorigin="anonymous"></script>
<script src="{{ template_resources['js']['bootstrap'] }}" crossorigin="anonymous"></script>
{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion panel/template/golden/golden.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ img.app-logo {
height: 30px;
padding-top:9px;
padding-bottom:9px;

max-width: inherit;
}

.header-adjust {
Expand Down
2 changes: 1 addition & 1 deletion panel/template/golden/golden.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
{% if meta_viewport %}<meta name="viewport" content="{{ meta_viewport }}">{% endif %}
{% if base_url and base_target %}<base href="{{ base_url }}" target="{{ base_target }}">{% endif %}

<link type="text/css" rel="stylesheet" href="{{ template_resources['css']['goldenlayout'] }}" />
<link rel="stylesheet" href="{{ template_resources['css']['base'] }}">
<link rel="stylesheet" href="{{ template_resources['css']['theme'] }}">
<link type="text/css" rel="stylesheet" href="{{ template_resources['css']['goldenlayout'] }}" />
<script type="text/javascript" src="{{ template_resources['js']['jquery'] }}"></script>
<script type="text/javascript" src="{{ template_resources['js']['goldenlayout'] }}"></script>
{% endblock %}
Expand Down
8 changes: 6 additions & 2 deletions panel/template/material/material.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,9 @@ img.app-logo {
padding-right: 10px;
font-size: 28px;
height: 30px;
padding-top: 10px;
padding-bottom: 8px;
max-width: inherit;
padding-top: 12px;
padding-bottom: 6px;
}

#app-title {
Expand Down Expand Up @@ -104,6 +105,9 @@ img.app-logo {
display: flex;
}

.mdc-drawer__content {
overflow-x: hidden;
}
.mdc-drawer__content, .main-content {
padding: 12px;
}
Expand Down
4 changes: 2 additions & 2 deletions panel/template/material/material.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
{% if meta_viewport %}<meta name="viewport" content="{{ meta_viewport }}">{% endif %}
{% if base_url and base_target %}<base href="{{ base_url }}" target="{{ base_target }}">{% endif %}

<link rel="stylesheet" href="{{ template_resources['css']['base'] }}">
<link rel="stylesheet" href="{{ template_resources['css']['theme'] }}">
<link href="{{ template_resources['css']['material'] }}" rel="stylesheet">
<script src="{{ template_resources['js']['material'] }}"></script>
<link rel="stylesheet" href="{{ template_resources['css']['base'] }}">
<link rel="stylesheet" href="{{ template_resources['css']['theme'] }}">
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Material+Icons&display=block" rel="stylesheet">
{% endblock %}
Expand Down
1 change: 1 addition & 0 deletions panel/template/react/react.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ a.navbar-brand {
img.app-logo {
font-size: 28px;
height: 30px;
max-width: inherit;
}

.pn-bar {
Expand Down
6 changes: 3 additions & 3 deletions panel/template/react/react.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
{% if meta_viewport %}<meta name="viewport" content="{{ meta_viewport }}">{% endif %}
{% if base_url and base_target %}<base href="{{ base_url }}" target="{{ base_target }}">{% endif %}

<!-- Template CSS -->
<link rel="stylesheet" href="{{ template_resources['css']['base'] }}">
<link rel="stylesheet" href="{{ template_resources['css']['theme'] }}">
<!-- Bootstrap -->
<link rel="stylesheet" href="{{ template_resources['css']['bootstrap'] }}">
<!-- Font Awesome -->
<link rel="stylesheet" href="{{ template_resources['css']['font-awesome'] }}">
<!-- Template CSS -->
<link rel="stylesheet" href="{{ template_resources['css']['base'] }}">
<link rel="stylesheet" href="{{ template_resources['css']['theme'] }}">

<!-- React-grid-layout script -->
<script src="{{ template_resources['js']['react'] }}" crossorigin></script>
Expand Down
10 changes: 5 additions & 5 deletions panel/template/vanilla/vanilla.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ body {
overflow-x: hidden;
overflow-y: hidden;
}
img {
max-width: 100%;
}

#container {
padding:0px;
Expand Down Expand Up @@ -55,6 +52,7 @@ img.app-logo {
height: 30px;
padding-top:11px;
padding-bottom: 7px;
max-width: inherit;
}

.pn-bar {
Expand Down Expand Up @@ -86,7 +84,9 @@ img.app-logo {
transition: all 0.2s cubic-bezier(0.945, 0.020, 0.270, 0.665);
transform-origin: center left; /* Set the transformed position of sidebar to center left side. */
width: 290px;
height: calc(100vh - 68px);
height: calc(100vh - 102px);
padding-top: 10px;
padding-bottom: 20px;
}

#sidebar.active {
Expand All @@ -97,7 +97,7 @@ img.app-logo {
transition: all 0.2s cubic-bezier(0.945, 0.020, 0.270, 0.665);
overflow-y: scroll;
width: 100vw;
height: calc(100vh - 68px);
height: calc(100vh - 102px);
margin-left: 300px;
padding-right: 20px;
padding-bottom: 20px;
Expand Down