Skip to content

feat: distinguish login portals visually #7331

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

Open
SahilGawade07 wants to merge 1 commit into
base: staging
Choose a base branch
from
Open

feat: distinguish login portals visually #7331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 22 additions & 1 deletion data/web/css/build/014-mailcow.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,4 +432,25 @@ button[aria-expanded='true'] > .caret {

.hr-title:not(:empty)::after {
margin-left: 10px;
}
}
/* Visual differentiation of login portals */
body.login-portal-user {
background-color: #f2faf5 !important;
}
body.login-portal-user .card {
border-top: 4px solid #198754 !important;
}

body.login-portal-domainadmin {
background-color: #f3f4fc !important;
}
body.login-portal-domainadmin .card {
border-top: 4px solid #0d6efd !important;
}

body.login-portal-admin {
background-color: #fdf3f3 !important;
}
body.login-portal-admin .card {
border-top: 4px solid #dc3545 !important;
}
36 changes: 35 additions & 1 deletion data/web/css/themes/mailcow-darkmode.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,4 +454,38 @@ input::placeholder {
}
.btn-light, .btn-light:hover {
background-image: none;
}
}

/* Dark Mode Login Portals */
body.login-portal-user {
background-color: #121814 !important;
}
body.login-portal-user .card {
background-color: #1d2520 !important;
border-color: #27332c !important;
}
body.login-portal-user .card-header {
background-color: #121814 !important;
}

body.login-portal-domainadmin {
background-color: #13151c !important;
}
body.login-portal-domainadmin .card {
background-color: #1d202b !important;
border-color: #282c3c !important;
}
body.login-portal-domainadmin .card-header {
background-color: #13151c !important;
}

body.login-portal-admin {
background-color: #1a1111 !important;
}
body.login-portal-admin .card {
background-color: #281b1b !important;
border-color: #382525 !important;
}
body.login-portal-admin .card-header {
background-color: #1a1111 !important;
}
21 changes: 14 additions & 7 deletions data/web/templates/admin_index.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

{% block navbar %}{% endblock %}

{% block body_class %}login-portal login-portal-admin{% endblock %}

{% block content %}
<div class="row mb-4" style="margin-top: 60px">
<div class="col-12 col-md-7 col-lg-6 col-xl-5 ms-auto me-auto">
Expand Down Expand Up @@ -52,7 +54,7 @@
</div>
</div>
<div class="d-flex justify-content-between mt-4" style="position: relative">
<button type="submit" class="btn btn-xs-lg btn-success w-100 mt-2 mx-auto" style="max-width: 400px;" value="Login">{{ lang.login.login }}</button>
<button type="submit" class="btn btn-xs-lg btn-danger w-100 mt-2 mx-auto" style="max-width: 400px;" value="Login">{{ lang.login.login }}</button>
</div>
</form>
<div class="hr-title"><strong>{{ lang.login.other_logins }}</strong></div>
Expand Down Expand Up @@ -90,12 +92,17 @@
</div>

{% if custom_login.hide_user_quicklink != 1 or custom_login.hide_domainadmin_quicklink != 1 %}
<p class="text-center mt-3 text-muted" style="font-size: 0.9rem;">
{{ lang.login.login_linkstext }}<br>
{% if custom_login.hide_user_quicklink != 1 %}<a href="/">{{ lang.login.login_usertext }}</a>{% endif %}
{% if custom_login.hide_user_quicklink != 1 and custom_login.hide_domainadmin_quicklink != 1 %}|{% endif %}
{% if custom_login.hide_domainadmin_quicklink != 1 %}<a href="/domainadmin">{{ lang.login.login_domainadmintext }}</a>{% endif %}
</p>
<div class="text-center mt-4">
<div class="text-muted mb-2" style="font-size: 0.9rem;">{{ lang.login.login_linkstext }}</div>
<div class="d-flex justify-content-center gap-2 flex-wrap">
{% if custom_login.hide_user_quicklink != 1 %}
<a href="/" class="btn btn-sm btn-outline-success">{{ lang.login.login_usertext }}</a>
{% endif %}
{% if custom_login.hide_domainadmin_quicklink != 1 %}
<a href="/domainadmin" class="btn btn-sm btn-outline-primary">{{ lang.login.login_domainadmintext }}</a>
{% endif %}
</div>
</div>
{% endif %}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion data/web/templates/base.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<link rel="shortcut icon" href="/favicon.png" type="image/png">
<link rel="icon" href="/favicon.png" type="image/png">
</head>
<body>
<body class="{% block body_class %}{% endblock %}">
<div class="overlay"></div>
{% block navbar %}
<nav class="navbar navbar-expand-lg navbar-light bg-light sticky-top p-0">
Expand Down
21 changes: 14 additions & 7 deletions data/web/templates/domainadmin_index.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

{% block navbar %}{% endblock %}

{% block body_class %}login-portal login-portal-domainadmin{% endblock %}

{% block content %}
<div class="row mb-4" style="margin-top: 60px">
<div class="col-12 col-md-7 col-lg-6 col-xl-5 ms-auto me-auto">
Expand Down Expand Up @@ -52,7 +54,7 @@
</div>
</div>
<div class="d-flex justify-content-between mt-4" style="position: relative">
<button type="submit" class="btn btn-xs-lg btn-success w-100 mt-2 mx-auto" style="max-width: 400px;" value="Login">{{ lang.login.login }}</button>
<button type="submit" class="btn btn-xs-lg btn-primary w-100 mt-2 mx-auto" style="max-width: 400px;" value="Login">{{ lang.login.login }}</button>
</div>
</form>
<div class="hr-title"><strong>{{ lang.login.other_logins }}</strong></div>
Expand Down Expand Up @@ -90,12 +92,17 @@
</div>

{% if custom_login.hide_user_quicklink != 1 or custom_login.hide_admin_quicklink != 1 %}
<p class="text-center mt-3 text-muted" style="font-size: 0.9rem;">
{{ lang.login.login_linkstext }}<br>
{% if custom_login.hide_user_quicklink != 1 %}<a href="/">{{ lang.login.login_usertext }}</a>{% endif %}
{% if custom_login.hide_user_quicklink != 1 and custom_login.hide_admin_quicklink != 1 %}|{% endif %}
{% if custom_login.hide_admin_quicklink != 1 %}<a href="/admin">{{ lang.login.login_admintext }}</a>{% endif %}
</p>
<div class="text-center mt-4">
<div class="text-muted mb-2" style="font-size: 0.9rem;">{{ lang.login.login_linkstext }}</div>
<div class="d-flex justify-content-center gap-2 flex-wrap">
{% if custom_login.hide_user_quicklink != 1 %}
<a href="/" class="btn btn-sm btn-outline-success">{{ lang.login.login_usertext }}</a>
{% endif %}
{% if custom_login.hide_admin_quicklink != 1 %}
<a href="/admin" class="btn btn-sm btn-outline-danger">{{ lang.login.login_admintext }}</a>
{% endif %}
</div>
</div>
{% endif %}
</div>
</div>
Expand Down
19 changes: 13 additions & 6 deletions data/web/templates/user_index.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

{% block navbar %}{% endblock %}

{% block body_class %}login-portal login-portal-user{% endblock %}

{% block content %}
<div class="row mb-4" style="margin-top: 60px">
<div class="col-12 col-md-7 col-lg-6 col-xl-5 ms-auto me-auto">
Expand Down Expand Up @@ -108,12 +110,17 @@
</div>

{% if custom_login.hide_admin_quicklink != 1 or custom_login.hide_domainadmin_quicklink != 1 %}
<p class="text-center mt-3 text-muted" style="font-size: 0.9rem;">
{{ lang.login.login_linkstext }}<br>
{% if custom_login.hide_admin_quicklink != 1 %}<a href="/admin">{{ lang.login.login_admintext }}</a>{% endif %}
{% if custom_login.hide_admin_quicklink != 1 and custom_login.hide_domainadmin_quicklink != 1 %}|{% endif %}
{% if custom_login.hide_domainadmin_quicklink != 1 %}<a href="/domainadmin">{{ lang.login.login_domainadmintext }}</a>{% endif %}
</p>
<div class="text-center mt-4">
<div class="text-muted mb-2" style="font-size: 0.9rem;">{{ lang.login.login_linkstext }}</div>
<div class="d-flex justify-content-center gap-2 flex-wrap">
{% if custom_login.hide_domainadmin_quicklink != 1 %}
<a href="/domainadmin" class="btn btn-sm btn-outline-primary">{{ lang.login.login_domainadmintext }}</a>
{% endif %}
{% if custom_login.hide_admin_quicklink != 1 %}
<a href="/admin" class="btn btn-sm btn-outline-danger">{{ lang.login.login_admintext }}</a>
{% endif %}
</div>
</div>
{% endif %}
</div>
</div>
Expand Down