gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-01-19 00:09:16 +08:00
Code

fix: 登录页样式修改 (#676)

Browse Source
This commit is contained in:
ssongliu 2023-04-17 18:30:40 +08:00 committed by GitHub
parent 1086597e3a
commit 5c50695bdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/init/router/router.go
View File

@ -1,10 +1,11 @@
package router
import (
"github.com/gin-contrib/gzip"
"html/template"
"net/http"
"github.com/gin-contrib/gzip"
v1 "github.com/1Panel-dev/1Panel/backend/app/api/v1"
"github.com/1Panel-dev/1Panel/backend/global"
"github.com/1Panel-dev/1Panel/backend/i18n"
@ -40,9 +41,6 @@ func setWebStatic(rootRouter *gin.Engine) {
func Routers() *gin.Engine {
Router := gin.Default()
docs.SwaggerInfo.BasePath = "/api/v1"
Router.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerfiles.Handler))
Router.Use(middleware.OperationLog())
// Router.Use(middleware.CSRF())
// Router.Use(middleware.LoadCsrfToken())

12
frontend/src/assets/iconfont/iconfont.css
View File

@ -1,9 +1,9 @@
@font-face {
font-family: "panel"; /* Project id 3575356 */
src: url('iconfont.woff2?t=1680702361679') format('woff2'),
url('iconfont.woff?t=1680702361679') format('woff'),
url('iconfont.ttf?t=1680702361679') format('truetype'),
url('iconfont.svg?t=1680702361679#panel') format('svg');
src: url('iconfont.woff2?t=1681715760705') format('woff2'),
url('iconfont.woff?t=1681715760705') format('woff'),
url('iconfont.ttf?t=1681715760705') format('truetype'),
url('iconfont.svg?t=1681715760705#panel') format('svg');
}
.panel {
@ -14,6 +14,10 @@
-moz-osx-font-smoothing: grayscale;
}
.p-yanzhengma1:before {
content: "\e744";
}
.p-tengxunyun1:before {
content: "\e651";
}

2
frontend/src/assets/iconfont/iconfont.js
View File

File diff suppressed because one or more lines are too long

7
frontend/src/assets/iconfont/iconfont.json
View File

@ -5,6 +5,13 @@
"css_prefix_text": "p-",
"description": "",
"glyphs": [
{
"icon_id": "7131916",
"name": "验证码",
"font_class": "yanzhengma1",
"unicode": "e744",
"unicode_decimal": 59204
},
{
"icon_id": "12959160",
"name": "腾讯云",

2
frontend/src/assets/iconfont/iconfont.svg
View File

@ -14,6 +14,8 @@
/>
<missing-glyph />
<glyph glyph-name="yanzhengma1" unicode="&#59204;" d="M544 627h124c17.673 0 32-14.327 32-32 0-17.673-14.327-32-32-32H544v-116a32.5 32.5 0 0 0-0.056-1.916C670.218 429.588 768 321.96299999999997 768 191.5 768 50.39099999999996 653.609-64 512.5-64 371.391-64 257 50.39099999999996 257 191.5c0 130.12 97.27 237.523 223.064 253.46A32.488 32.488 0 0 0 480 447V800c0 17.673 14.327 32 32 32 17.673 0 32-14.327 32-32v-45h192c17.673 0 32-14.327 32-32 0-17.673-14.327-32-32-32H544v-64z m-31.5-627C618.263 0 704 85.73699999999997 704 191.5S618.263 383 512.5 383 321 297.26300000000003 321 191.5 406.737 0 512.5 0z" horiz-adv-x="1024" />
<glyph glyph-name="tengxunyun1" unicode="&#58961;" d="M512 725.333333c130.474667 0 240.938667-83.797333 277.930667-199.296a198.826667 198.826667 0 0 1-41.557334 0.597334 222.293333 222.293333 0 0 1-49.706666-10.624C668.202667 586.666667 596.096 636.245333 512 636.245333c-100.266667 0-183.466667-70.528-199.381333-163.029333a279.04 279.04 0 0 1-89.429334 3.84C241.28 617.045333 363.690667 725.333333 512 725.333333zM258.474667 478.677333c54.442667 0 104.192-20.181333 142.165333-53.418666 16.085333-14.08 45.226667-39.68 87.381333-76.8l-7.381333 6.528-61.568-60.885334-54.4 54.4c-34.218667 34.261333-66.090667 47.957333-106.197333 47.957334a133.589333 133.589333 0 0 1 0-267.221334c10.666667 0 29.312-0.768 56.064-2.346666l-90.453334-77.141334A215.893333 215.893333 0 0 0 258.432 478.72zM674.346667 461.525333a215.808 215.808 0 0 0 168.618666-397.354666c-15.36-6.485333-38.186667-15.957333-63.146666-16.213334-72.106667-0.597333-244.181333-0.896-516.352-0.938666h-42.666667a206248.106667 206248.106667 0 0 1 397.013333 380.714666c18.261333 17.578667 41.130667 27.264 56.533334 33.792z m41.856-80.554666c-9.258667-3.925333-23.04-9.770667-34.048-20.352-30.165333-29.098667-109.952-105.642667-239.445334-229.632h53.418667c148.181333 0 242.773333 0.213333 283.733333 0.554666 15.061333 0.128 28.842667 5.845333 38.101334 9.813334a130.133333 130.133333 0 0 1-101.76 239.616z" horiz-adv-x="1024" />
<glyph glyph-name="qiniuyun" unicode="&#58924;" d="M512-42.667c235.648 0 426.667 191.019 426.667 426.667S747.648 810.667 512 810.667 85.333 619.648 85.333 384 276.352-42.667 512-42.667z m290.73 597.078c3.969 0.896 6.145-0.854 7.169-2.688 1.664-2.987 0.085-7.168 0.085-7.168-42.155-120.192-158.293-202.07-297.941-201.515h-0.086a339.883 339.883 0 0 0-81.365 9.43l35.541-119.723s1.963-16.342 20.95-16.342h57.002s24.875-1.92 30.464 19.328c5.334 20.182 25.6 67.414 25.6 67.414s6.315 19.2 25.088 32.512c18.774 13.312 28.032 13.013 29.227 12.288 0.981-0.64 0.64-2.176 0.64-2.176l-19.499-113.536c-2.176-37.078-28.8-61.568-64.341-61.568H464.939c-35.499 0-62.848 22.4-64.299 61.568l-21.376 137.301c-77.568 33.28-137.472 95.83-165.248 175.019 0 0-1.579 4.224 0.085 7.168 1.024 1.877 3.2 3.584 7.168 2.688 1.152-0.256 4.182-3.755 9.174-9.472 18.773-21.632 65.066-75.094 142.848-106.966l-7.979 56.747s-0.17 1.28 0.81 2.432c1.067 1.28 6.273 2.688 15.19-1.792a32.213 32.213 0 0 0 15.957-19.328l15.702-51.499a351.147 351.147 0 0 1 98.986-11.733h0.086c164.01-3.37 253.525 99.84 281.514 132.139 4.992 5.717 8.022 9.216 9.174 9.472z" horiz-adv-x="1024" />

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 65 KiB

BIN
frontend/src/assets/iconfont/iconfont.ttf
View File

Binary file not shown.

BIN
frontend/src/assets/iconfont/iconfont.woff
View File

Binary file not shown.

BIN
frontend/src/assets/iconfont/iconfont.woff2
View File

Binary file not shown.

2
frontend/src/lang/modules/en.ts
View File

@ -128,7 +128,7 @@ const message = {
mfaCode: 'MFA verification code',
title: 'Linux Server Management Panel',
licenseHelper:
'Agree to FIT2CLOUD &laquo; <a href="https://www.fit2cloud.com/legal/licenses.html" target="_blank">Community Software License Agreement</a> &raquo;',
'Agree &laquo; <a href="https://www.fit2cloud.com/legal/licenses.html" target="_blank">Community License Agreement</a> &raquo;',
errorAgree: 'Please click to agree to the Community Software License Agreement',
},
rule: {

27
frontend/src/views/login/components/login-form.vue
View File

@ -8,7 +8,7 @@
<input type="password" class="hide" id="password" />
<el-form-item prop="name" class="no-border">
<el-input
v-model="registerForm.name"
v-model.trim="registerForm.name"
:placeholder="$t('commons.login.username')"
autocomplete="off"
type="text"
@ -24,7 +24,7 @@
<el-input
type="password"
clearable
v-model="registerForm.password"
v-model.trim="registerForm.password"
show-password
:placeholder="$t('commons.login.password')"
name="passwod"
@ -41,7 +41,7 @@
<el-input
type="password"
clearable
v-model="registerForm.rePassword"
v-model.trim="registerForm.rePassword"
show-password
:placeholder="$t('commons.login.rePassword')"
>
@ -111,7 +111,7 @@
<el-form-item prop="name" class="no-border">
<el-input
v-model="loginForm.name"
v-model.trim="loginForm.name"
:placeholder="$t('commons.login.username')"
class="form-input"
>
@ -126,7 +126,7 @@
<el-input
type="password"
clearable
v-model="loginForm.password"
v-model.trim="loginForm.password"
show-password
:placeholder="$t('commons.login.password')"
>
@ -141,7 +141,11 @@
</span>
</el-form-item>
<el-form-item prop="captcha" class="login-captcha">
<el-input v-model="loginForm.captcha" :placeholder="$t('commons.login.captchaHelper')" />
<el-input v-model.trim="loginForm.captcha" :placeholder="$t('commons.login.captchaHelper')">
<template #prefix>
<svg-icon style="font-size: 7px" iconName="p-yanzhengma1"></svg-icon>
</template>
</el-input>
<img
v-if="captcha.imagePath"
:src="captcha.imagePath"
@ -168,7 +172,10 @@
<el-form-item prop="agreeLicense">
<el-checkbox v-model="loginForm.agreeLicense">
<template #default>
<span v-html="$t('commons.login.licenseHelper')"></span>
<span
style="white-space: pre-wrap; line-height: 14px"
v-html="$t('commons.login.licenseHelper')"
></span>
</template>
</el-checkbox>
<span
@ -421,6 +428,12 @@ onMounted(() => {
}
.login-captcha {
:deep(.el-input__wrapper) {
background: none !important;
box-shadow: none !important;
border-radius: 0 !important;
border-bottom: 1px solid #dcdfe6;
}
margin-top: 10px;
.el-input {
width: 50%;