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

Feature zms 3268 visual distinguishing feature of an environment #731

Merged
merged 6 commits into from
Dec 12, 2024
Merged

Feature zms 3268 visual distinguishing feature of an environment #731

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d204d1a
feat(ZMS-3268): farbe fuer header geaendert
matthilo96 Dec 12, 2024
3c97dba
feat(ZMS-3268): colour for headers
matthilo96 Dec 12, 2024
34c6376
Delete zmsadmin/public/_css/fa-regular-400.091a908b.svg
matthilo96 Dec 12, 2024
a52a88d
Delete zmsadmin/public/_css/fa-solid-900.cd93bf9b.svg
matthilo96 Dec 12, 2024
9dff9fa
feat(ZMS-3268): environment name in footer
matthilo96 Dec 12, 2024
149b7db
Merge branch 'feature-zms-3268-visual-distinguishing-feature-of-an-en…
matthilo96 Dec 12, 2024
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 zmsadmin/public/_css/fa-regular-400.091a908b.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions zmsadmin/public/_css/fa-solid-900.cd93bf9b.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
95 changes: 0 additions & 95 deletions zmsadmin/templates/block/layout copy/main.twig
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion zmsadmin/templates/block/layout/main.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
<body>
<span id="js-is_palm"></span>
<div id="page-wrapper">
<header id="page-header">
<header id="page-header" style="{% if getSystemStatus('ZMS_ENV') == 'dev' %}background-color: #2ECC40;
{% elseif getSystemStatus('ZMS_ENV') == 'stage' %}background-color: #7FDBFF;{% endif %}">
{% block pageheader %}
{{ parent() }}
{%- endblock %}
Expand Down
5 changes: 3 additions & 2 deletions zmsadmin/templates/layout/fullwidth.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
<span id="js-is_palm"></span>
<div id="page-wrapper" class="handheld">

<header id="page-header">
{% block pageheader -%}
<header id="page-header" style="{% if getSystemStatus('ZMS_ENV') == 'dev' %}background-color: #2ECC40;
{% elseif getSystemStatus('ZMS_ENV') == 'stage' %}background-color: #7FDBFF;{% endif %}">
{% block pageheader %}
{{ parent() }}
{%- endblock %}
</header>
Expand Down
5 changes: 3 additions & 2 deletions zmsadmin/templates/layout/main.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@
<body>
<span id="js-is_palm"></span>
<div id="page-wrapper">
<header id="page-header" role="banner">
<header id="page-header" role="banner" style="{% if getSystemStatus('ZMS_ENV') == 'dev' %}background-color: #2ECC40;
{% elseif getSystemStatus('ZMS_ENV') == 'stage' %}background-color: #7FDBFF;{% endif %}">
{% block pageheader %}
{{ parent() }}
{%- endblock %}
</header>

<div id="content-wrapper">
{% block breadcrumb %}
{{ parent() }}
Expand Down
5 changes: 3 additions & 2 deletions zmsstatistic/templates/layout/fullwidth.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
<body>
<span id="js-is_palm"></span>
<div id="page-wrapper" class="handheld">
<header id="page-header">
{% block pageheader -%}
<header id="page-header" style="{% if getSystemStatus('ZMS_ENV') == 'dev' %}background-color: #2ECC40;
{% elseif getSystemStatus('ZMS_ENV') == 'stage' %}background-color: #7FDBFF;{% endif %}">
{% block pageheader %}
{{ parent() }}
{%- endblock %}
</header>
Expand Down
3 changes: 2 additions & 1 deletion zmsstatistic/templates/layout/main.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
<body>
<span id="js-is_palm"></span>
<div id="page-wrapper">
<header id="page-header">
<header id="page-header" style="{% if getSystemStatus('ZMS_ENV') == 'dev' %}background-color: #2ECC40;
{% elseif getSystemStatus('ZMS_ENV') == 'stage' %}background-color: #7FDBFF;{% endif %}">
{% block pageheader %}
{{ parent() }}
{%- endblock %}
Expand Down
Loading