Skip to content

Commit 21863a6

Browse files
committed
Merge branch '4.x' into 5.x
* 4.x: - Minor improvements in the login page design Adding space above the header on the login page
2 parents 9d8163b + 7ac96a7 commit 21863a6

4 files changed

Lines changed: 42 additions & 31 deletions

File tree

assets/css/easyadmin-theme/pages.css

Lines changed: 39 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
/* Page templates available or custom backends
22
/* ------------------------------------------------------------------------- */
3-
3+
html,
4+
body {
5+
block-size: 100%;
6+
margin: 0;
7+
}
48
body.page-login {
5-
background: var(--page-login-bg);
9+
background: var(--body-bg);
610
}
7-
@media (min-width: 992px) {
11+
@media (min-width: 576px) {
812
body.page-login {
9-
align-items: center;
10-
display: flex;
11-
block-size: 100vh;
12-
justify-content: center;
13-
overflow: hidden;
14-
position: absolute;
15-
inline-size: 100vw;
13+
background: var(--page-login-bg);
14+
min-block-size: 100vh;
15+
display: grid;
16+
place-items: center;
1617
}
1718
}
1819
body.page-login #flash-messages {
@@ -22,43 +23,48 @@ body.page-login #flash-messages {
2223
inline-size: 100%;
2324
}
2425

25-
.login-wrapper {
26-
align-items: center;
27-
display: flex;
28-
flex-direction: column;
29-
margin: 0 auto;
30-
max-inline-size: 28rem;
31-
inline-size: 94%;
32-
}
33-
@media (min-width: 992px) {
26+
@media (min-width: 576px) {
3427
.login-wrapper {
35-
margin-block-start: -225px;
36-
inline-size: 100%;
28+
margin: 0 auto;
29+
inline-size: 25rem;
3730
}
3831
}
3932
.login-wrapper .main-header {
4033
display: block;
4134
padding-inline-end: 0;
4235
}
36+
.login-wrapper .main-header #header-logo {
37+
border-block-end: var(--border-width) var(--border-style) var(--border-secondary-color);
38+
margin: 1.5rem 0 1rem;
39+
padding-block-end: 1rem;
40+
}
41+
@media (min-width: 576px) {
42+
.login-wrapper .main-header #header-logo {
43+
border-block-end: none;
44+
}
45+
}
4346
.login-wrapper .main-header #header-logo a {
4447
font-size: var(--font-size-lg);
4548
text-align: center;
49+
margin: 0;
50+
padding: 0;
4651
}
47-
@media (min-width: 992px) {
52+
@media (min-width: 576px) {
4853
.login-wrapper .main-header #header-logo a {
4954
font-size: var(--font-size-xl);
5055
}
5156
}
5257
.login-wrapper .content {
53-
background-color: var(--page-login-form-bg);
54-
border-radius: var(--border-radius);
55-
box-shadow: var(--shadow-lg);
58+
background-color: var(--body-bg);
5659
padding: 15px 30px;
5760
inline-size: 100%;
5861
}
59-
@media (min-width: 992px) {
62+
@media (min-width: 576px) {
6063
.login-wrapper .content {
61-
padding: 2rem 2.5rem;
64+
background: var(--page-login-form-bg);
65+
border-radius: var(--border-radius-lg);
66+
box-shadow: var(--shadow-lg);
67+
padding: 2.5rem 3rem;
6268
}
6369
}
6470
.login-wrapper .form-widget input {
@@ -68,8 +74,13 @@ body.page-login #flash-messages {
6874
block-size: 38px;
6975
line-height: 38px;
7076
}
71-
.login-wrapper .form-widget .btn-primary {
77+
.login-wrapper .form-group label.required:after {
78+
display: none;
79+
}
80+
.login-wrapper .btn-primary {
7281
background-color: var(--page-login-form-control-button-bg);
82+
font-size: var(--font-size-base);
83+
margin-block-start: 1rem;
7384
}
7485
.login-wrapper .form-text {
7586
font-size: inherit;
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/entrypoints.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"entrypoints": {
33
"app": {
44
"css": [
5-
"/app.f338b557.css"
5+
"/app.5839fe72.css"
66
],
77
"js": [
88
"/app.8c79e3ec.js"

public/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"app.css": "app.f338b557.css",
2+
"app.css": "app.5839fe72.css",
33
"app.js": "app.8c79e3ec.js",
44
"form.js": "form.5bccac01.js",
55
"page-layout.js": "page-layout.6e9fe55d.js",

0 commit comments

Comments
 (0)