github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor: improve login page ui (#6832) 

#### What type of PR is this?

/area core
/kind improvement
/milestone 2.20.x

#### What this PR does / why we need it:

优化登录等页面的 UI，主要优化低分屏下的 UI 表现，防止元素过大。

#### Does this PR introduce a user-facing change?

```release-note
优化登录等页面的 UI，优化低分屏下的 UI 表现，防止元素过大。
```
pull/6849/head
Ryan Wang 2024-10-12 17:21:10 +08:00 committed by GitHub
parent 6d149ae3bb
commit b9da9d05ea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 91 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
application/src/main/resources/static/styles/main.css
View File

@ -1,4 +1,3 @@
/* Base */
.gateway-page { .gateway-page {
width: 100%; width: 100%;
height: 100vh; height: 100vh;
@ -7,18 +6,13 @@
.gateway-wrapper, .gateway-wrapper,
.gateway-wrapper:before, .gateway-wrapper:before,
.gateway-wrapper:after { .gateway-wrapper:after,
box-sizing: border-box;
border-width: 0;
border-style: solid;
}
.gateway-wrapper *, .gateway-wrapper *,
.gateway-wrapper *:before, .gateway-wrapper :before,
.gateway-wrapper *:after { .gateway-wrapper :after {
box-sizing: border-box; box-sizing: border-box;
border-width: 0;
border-style: solid; border-style: solid;
border-width: 0;
} }
.gateway-wrapper { .gateway-wrapper {
@ -30,58 +24,48 @@
--rounded-sm: 0.125em; --rounded-sm: 0.125em;
--rounded-base: 0.25em; --rounded-base: 0.25em;
--rounded-lg: 0.5em; --rounded-lg: 0.5em;
--spacing-2xl: 1.5em;
--spacing-xl: 1.25em; --spacing-xl: 1.25em;
--spacing-lg: 1em; --spacing-lg: 1em;
--spacing-md: 0.875em; --spacing-md: 0.875em;
--spacing-sm: 0.625em; --spacing-sm: 0.625em;
--spacing-xs: 0.5em; --spacing-xs: 0.5em;
--text-xl: 1.25em;
--text-2xl: 1.5em;
--text-lg: 1.125em;
--text-base: 1em; --text-base: 1em;
--text-sm: 0.875em; --text-sm: 0.875em;
} --font-size-base: 16px;
--font-size-md: 14px;
.gateway-wrapper { padding: 5% var(--spacing-lg);
margin: 0 auto; font-size: var(--font-size-base);
max-width: 28em; max-width: 28em;
padding: 5% 1em; margin: 0 auto;
font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Helvetica Neue, Arial,
Noto Sans, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji;
line-height: 1.5; line-height: 1.5;
font-family:
ui-sans-serif,
system-ui,
-apple-system,
BlinkMacSystemFont,
Segoe UI,
Roboto,
Helvetica Neue,
Arial,
Noto Sans,
sans-serif,
"Apple Color Emoji",
"Segoe UI Emoji",
Segoe UI Symbol,
"Noto Color Emoji";
} }
/* Form */
.halo-form-wrapper { .halo-form-wrapper {
border-radius: var(--rounded-lg); border-radius: var(--rounded-lg);
border: 1px solid #dfe6ecb3; padding: var(--spacing-2xl);
background: #fff; background: #fff;
padding: 1.5em; border: 1px solid #dfe6ecb3;
} }
.form-title { .form-title {
all: unset; all: unset;
margin-bottom: 1em; font-size: var(--text-2xl);
display: block; margin-bottom: var(--spacing-lg);
font-weight: 500; font-weight: 500;
font-size: 1.75em; display: block;
} }
.halo-form .form-item { .halo-form .form-item {
display: flex; margin-bottom: var(--spacing-2xl);
flex-direction: column; flex-direction: column;
margin-bottom: 1.5em;
width: 100%; width: 100%;
display: flex;
} }
.halo-form .form-item:last-of-type { .halo-form .form-item:last-of-type {
@ -90,9 +74,9 @@
.halo-form .form-item-group { .halo-form .form-item-group {
gap: var(--spacing-lg); gap: var(--spacing-lg);
display: flex; margin-bottom: var(--spacing-2xl);
align-items: flex-start; align-items: flex-start;
margin-bottom: 1.5em; display: flex;
} }
.halo-form .form-item-group .form-item { .halo-form .form-item-group .form-item {
@ -102,27 +86,25 @@
.halo-form .form-input { .halo-form .form-input {
border-radius: var(--rounded-base); border-radius: var(--rounded-base);
border: 1px solid var(--color-border); border: 1px solid var(--color-border);
height: 2.5em;
background: #fff; background: #fff;
height: 2.5em;
padding: 0 0.75rem; padding: 0 0.75rem;
} }
.halo-form .form-input:focus-within { .halo-form .form-input:focus-within {
border-color: var(--color-primary); border-color: var(--color-primary);
outline: 2px solid transparent;
outline-offset: "2px"; outline-offset: "2px";
outline: 2px solid #0000;
} }
.halo-form .form-item input { .halo-form .form-item input {
appearance: none; appearance: none;
-webkit-appearance: none; font-size: var(--text-base);
-moz-appearance: none;
display: block;
font-size: 1em;
box-shadow: none; box-shadow: none;
background: none;
width: 100%; width: 100%;
height: 100%; height: 100%;
background: transparent; display: block;
} }
.halo-form .form-item input:focus { .halo-form .form-item input:focus {
@ -130,28 +112,27 @@
} }
.halo-form .form-input-stack { .halo-form .form-input-stack {
display: flex;
align-items: center; align-items: center;
gap: 0.5em; gap: 0.5em;
display: flex;
} }
.halo-form .form-input-stack-icon { .halo-form .form-input-stack-icon {
display: inline-flex;
align-items: center;
color: var(--color-text); color: var(--color-text);
cursor: pointer; cursor: pointer;
align-items: center;
display: inline-flex;
} }
.halo-form .form-input-stack-select { .halo-form .form-input-stack-select {
all: unset; all: unset;
color: var(--color-text); color: var(--color-text);
font-size: var(--text-sm); font-size: var(--text-sm);
background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='1em' height='1em' viewBox='0 0 24 24'%3E%3Cpath fill='%23000' d='m12 13.171l4.95-4.95l1.414 1.415L12 16L5.636 9.636L7.05 8.222z'/%3E%3C/svg%3E")
right 0.3em center no-repeat;
align-items: center;
padding-right: 1.85em; padding-right: 1.85em;
display: inline-flex; display: inline-flex;
align-items: center;
background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='1em' height='1em' viewBox='0 0 24 24'%3E%3Cpath fill='%23000' d='m12 13.171l4.95-4.95l1.414 1.415L12 16L5.636 9.636L7.05 8.222z'/%3E%3C/svg%3E");
background-repeat: no-repeat;
background-position: right 0.3em center;
} }
.halo-form .form-input-stack-text { .halo-form .form-input-stack-text {
@ -161,16 +142,16 @@
.halo-form .form-item label { .halo-form .form-item label {
color: var(--color-text); color: var(--color-text);
margin-bottom: 0.75rem;
font-size: var(--text-base); font-size: var(--text-base);
margin-bottom: 0.75rem;
font-weight: 500; font-weight: 500;
} }
.halo-form .form-item .form-label-group { .halo-form .form-item .form-label-group {
margin-bottom: 0.75em;
display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin-bottom: 0.75em;
display: flex;
} }
.halo-form .form-item .form-label-group label { .halo-form .form-item .form-label-group label {
@ -185,9 +166,9 @@
.halo-form .form-item-compact { .halo-form .form-item-compact {
gap: var(--spacing-sm); gap: var(--spacing-sm);
margin-bottom: 1.5em; margin-bottom: var(--spacing-2xl);
display: flex;
align-items: center; align-items: center;
display: flex;
} }
.halo-form .form-item-compact label { .halo-form .form-item-compact label {
@ -198,10 +179,10 @@
.halo-form button[type="submit"] { .halo-form button[type="submit"] {
background: var(--color-secondary); background: var(--color-secondary);
border-radius: var(--rounded-base); border-radius: var(--rounded-base);
height: 2.5em;
color: #fff; color: #fff;
border: none;
cursor: pointer; cursor: pointer;
border: none;
height: 2.5em;
} }
.halo-form button[type="submit"]:hover { .halo-form button[type="submit"]:hover {
@ -220,44 +201,39 @@
border: 1px solid var(--color-border); border: 1px solid var(--color-border);
border-radius: var(--rounded-sm); border-radius: var(--rounded-sm);
appearance: none; appearance: none;
-webkit-appearance: none;
-moz-appearance: none;
padding: 0;
print-color-adjust: exact; print-color-adjust: exact;
display: inline-block;
vertical-align: middle; vertical-align: middle;
background-origin: border-box;
user-select: none; user-select: none;
flex-shrink: 0;
height: 1em;
width: 1em;
color: #2563eb; color: #2563eb;
background-color: #fff; background-color: #fff;
background-origin: border-box;
flex-shrink: 0;
width: 1em;
height: 1em;
padding: 0;
display: inline-block;
} }
.halo-form input[type="checkbox"]:focus { .halo-form input[type="checkbox"]:focus {
outline: 2px solid transparent;
outline-offset: 2px; outline-offset: 2px;
box-shadow: outline: 2px solid #0000;
rgb(255, 255, 255) 0px 0px 0px 2px, box-shadow: 0 0 0 2px #fff, 0 0 0 4px #2563eb, 0 0 #0000;
rgb(37, 99, 235) 0px 0px 0px 4px,
rgba(0, 0, 0, 0) 0px 0px 0px 0px;
} }
.halo-form input[type="checkbox"]:checked { .halo-form input[type="checkbox"]:checked {
border-color: transparent;
background-color: currentColor; background-color: currentColor;
background-size: 100% 100%; background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e");
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;
background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e"); background-size: 100% 100%;
border-color: #0000;
} }
.halo-form .form-input-group { .halo-form .form-input-group {
gap: var(--spacing-sm); gap: var(--spacing-sm);
display: grid;
grid-template-columns: repeat(3, minmax(0, 1fr)); grid-template-columns: repeat(3, minmax(0, 1fr));
align-items: center; align-items: center;
display: grid;
} }
.halo-form .form-input { .halo-form .form-input {
@ -269,10 +245,10 @@
border: 1px solid var(--color-border); border: 1px solid var(--color-border);
color: var(--color-text); color: var(--color-text);
font-size: var(--text-sm); font-size: var(--text-sm);
grid-column: span 1 / span 1;
height: 100%;
cursor: pointer; cursor: pointer;
background: #fff; background: #fff;
grid-column: span 1 / span 1;
height: 100%;
} }
.halo-form .form-input-group button:hover { .halo-form .form-input-group button:hover {
@ -287,30 +263,30 @@
.pill-items { .pill-items {
all: unset; all: unset;
gap: var(--spacing-sm); gap: var(--spacing-sm);
margin: 0;
display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: center; justify-content: center;
margin: 0;
display: flex;
} }
.pill-items li { .pill-items li {
all: unset; all: unset;
border-radius: var(--rounded-lg); border-radius: var(--rounded-lg);
overflow: hidden;
border: 1px solid #e5e7eb; border: 1px solid #e5e7eb;
transition-property: all; transition-property: all;
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
transition-duration: 0.15s; transition-duration: 0.15s;
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
overflow: hidden;
} }
.pill-items li a { .pill-items li a {
gap: var(--spacing-sm); gap: var(--spacing-sm);
font-size: var(--text-sm); font-size: var(--text-sm);
padding: 0.6em 0.9em;
display: flex;
align-items: center;
color: #1f2937; color: #1f2937;
align-items: center;
padding: 0.6em 0.9em;
text-decoration: none; text-decoration: none;
display: flex;
} }
.pill-items li img { .pill-items li img {
@ -335,44 +311,44 @@
color: var(--color-text); color: var(--color-text);
font-size: var(--text-sm); font-size: var(--text-sm);
gap: var(--spacing-lg); gap: var(--spacing-lg);
display: flex;
align-items: center; align-items: center;
margin: 1.5em 0; margin: 1.5em 0;
display: flex;
} }
.divider-wrapper hr { .divider-wrapper hr {
flex-grow: 1;
overflow: hidden;
border: 0; border: 0;
border-top: 1px solid #f3f4f6; border-top: 1px solid #f3f4f6;
flex-grow: 1;
overflow: hidden;
} }
.alert { .alert {
border: 1px solid #e5e7eb;
border-radius: var(--rounded-base); border-radius: var(--rounded-base);
margin-bottom: var(--spacing-xl); margin-bottom: var(--spacing-xl);
padding: var(--spacing-md) var(--spacing-xl); padding: var(--spacing-md) var(--spacing-xl);
font-size: var(--text-sm); font-size: var(--text-sm);
overflow: hidden;
position: relative;
color: var(--color-text); color: var(--color-text);
border: 1px solid #e5e7eb;
position: relative;
overflow: hidden;
} }
.alert::before { .alert:before {
content: ""; content: "";
position: absolute;
height: 100%;
left: 0;
background: #d1d5db; background: #d1d5db;
width: 0.25em; width: 0.25em;
height: 100%;
position: absolute;
top: 0; top: 0;
left: 0;
} }
.alert-warning { .alert-warning {
border-color: #fde047; border-color: #fde047;
} }
.alert-warning::before { .alert-warning:before {
background: #ea580c; background: #ea580c;
} }
@ -380,7 +356,7 @@
border-color: #fca5a5; border-color: #fca5a5;
} }
.alert-error::before { .alert-error:before {
background: #dc2626; background: #dc2626;
} }
@ -388,7 +364,7 @@
border-color: #86efac; border-color: #86efac;
} }
.alert-success::before { .alert-success:before {
background: #16a34a; background: #16a34a;
} }
@ -396,14 +372,12 @@
border-color: #7dd3fc; border-color: #7dd3fc;
} }
.alert-info::before { .alert-info:before {
background: #0284c7; background: #0284c7;
} }
@media (forced-colors: active) { @media (forced-colors: active) {
.halo-form input[type="checkbox"]:checked { .halo-form input[type="checkbox"]:checked {
-webkit-appearance: auto;
-moz-appearance: auto;
appearance: auto; appearance: auto;
} }
} }
@ -414,6 +388,18 @@
} }
} }
@media screen and (min-width: 1201px) and (max-width: 1600px) {
.gateway-wrapper {
font-size: var(--font-size-md);
}
}
@media screen and (min-width: 1601px) {
.gateway-wrapper {
font-size: var(--font-size-base);
}
}
::-ms-reveal { ::-ms-reveal {
display: none; display: none;
} }

2
application/src/main/resources/templates/signup.html
View File

@ -6,7 +6,7 @@
<th:block th:fragment="head"> <th:block th:fragment="head">
<style> <style>
.signup-page-wrapper { .signup-page-wrapper {
max-width: 35em; max-width: 38em;
} }
</style> </style>
</th:block> </th:block>