diff --git a/packages/hydrooj/src/model/setting.ts b/packages/hydrooj/src/model/setting.ts index a0d4f4a..dbbe2b8 100644 --- a/packages/hydrooj/src/model/setting.ts +++ b/packages/hydrooj/src/model/setting.ts @@ -242,8 +242,8 @@ SystemSetting( Setting('setting_smtp', 'smtp.secure', false, 'boolean', 'smtp.secure', 'SSL'), Setting('setting_smtp', 'smtp.verify', true, 'boolean', 'smtp.verify', 'Verify register email'), Setting('setting_server', 'server.center', 'https://hydro.ac/center', 'text', 'server.center', '', FLAG_HIDDEN), - Setting('setting_server', 'server.name', 'U+', 'text', 'server.name', 'Server Name'), - Setting('setting_server', 'server.displayName', 'U+', 'text', 'server.name', 'Server Name (Global Display)', FLAG_PRO), + Setting('setting_server', 'server.name', 'Kathy', 'text', 'server.name', 'Server Name'), + Setting('setting_server', 'server.displayName', 'Kathy', 'text', 'server.name', 'Server Name (Global Display)', FLAG_PRO), Setting('setting_server', 'server.url', '/', 'text', 'server.url', 'Server BaseURL'), Setting('setting_server', 'server.upload', '256m', 'text', 'server.upload', 'Max upload file size'), Setting('setting_server', 'server.cdn', '/', 'text', 'server.cdn', 'CDN Prefix'), diff --git a/packages/ui-default/components/dialog/dialog.page.styl b/packages/ui-default/components/dialog/dialog.page.styl index b4a5da9..cfc386b 100644 --- a/packages/ui-default/components/dialog/dialog.page.styl +++ b/packages/ui-default/components/dialog/dialog.page.styl @@ -5,13 +5,14 @@ width: 100% height: 100% opacity: 0 - z-index: 1000 // managed + z-index: 99999 // managed // display flex will be added after animation completes flex-direction: column align-items: center justify-content: center display: none - background: $dialog-layer-bg-color + // background: $dialog-layer-bg-color + background: rgba(0, 0, 0, 0.50) !important .dialog__content position: relative @@ -19,7 +20,7 @@ .dialog.withBg .dialog__content background: $dialog-bg-color border: 1px solid $dialog-border-color - box-shadow: $dialog-shadow + // box-shadow: $dialog-shadow min-width: rem(500px) max-width: rem(900px) padding: rem(40px) rem(30px) diff --git a/packages/ui-default/components/form/checkbox.page.styl b/packages/ui-default/components/form/checkbox.page.styl index c23e9cf..d79b7d7 100644 --- a/packages/ui-default/components/form/checkbox.page.styl +++ b/packages/ui-default/components/form/checkbox.page.styl @@ -11,7 +11,7 @@ $checkbox-size = 16px cursor: pointer user-select: none color: lighten($text-1-color, 30%) !important - margin: $input-margin !important + margin: $input-margin &:hover color: $text-1-color diff --git a/packages/ui-default/components/signin/signin_dialog.page.styl b/packages/ui-default/components/signin/signin_dialog.page.styl index bdf5760..a2b1d47 100644 --- a/packages/ui-default/components/signin/signin_dialog.page.styl +++ b/packages/ui-default/components/signin/signin_dialog.page.styl @@ -1,4 +1,4 @@ -$signin_form_width = 320px +$signin_form_width = 300px $signin_form_gap_v = 50px $signin_form_gap_h = 50px $signin_dialog_expand_v = 50px @@ -17,11 +17,14 @@ $signin_dialog_expand_h = 30px .dialog--signin__main background: #FFF width: rem($signin_form_width) - padding: rem($signin_form_gap_v $signin_form_gap_h) - margin-right: rem($signin_form_width - $signin_dialog_expand_h) + // padding: rem($signin_form_gap_v $signin_form_gap_h) + padding: 32px + // margin-right: rem($signin_form_width - $signin_dialog_expand_h) position: relative z-index: 2 - box-shadow: 0 0 30px rgba(#000, 0.6) + border-radius: 22px + border: 1px solid #DDD + // box-shadow: 0 0 30px rgba(#000, 0.6) .dialog--signin__side position: absolute @@ -40,15 +43,35 @@ $signin_dialog_expand_h = 30px line-height: 1.2em .dialog--signin__title - text-align: center - color: lighten($primary-color, 20%) + text-align: left + // color: lighten($primary-color, 20%) + color: #000 + font-weight: 500 + font-size: 28px .dialog--signin__note margin: 0.3em 0 2em 0 - text-align: center + text-align: left font-size: rem($font-size-secondary) + color: #878787 .dialog--signin__close-container position: absolute right: rem(15px) top: rem(15px) + +.fsz13 + font-size: 13px + +label.material > input + &::placeholder + color: #B4B4B4 + +.button-submit + width: rem($signin_form_width) + +.login-background + width: rem(868px) + height: rem(584px) + background-color: #fff + border-radius: 24px \ No newline at end of file diff --git a/packages/ui-default/misc/tailwindstylus.styl b/packages/ui-default/misc/tailwindstylus.styl index f81d445..b4ad04e 100644 --- a/packages/ui-default/misc/tailwindstylus.styl +++ b/packages/ui-default/misc/tailwindstylus.styl @@ -43,6 +43,9 @@ .items-stretch align-items: stretch +.p-0 + padding: 0 !important + .p-1 padding: 4px !important @@ -63,6 +66,9 @@ padding-top: 4px !important padding-bottom: 4px !important +.m-0 + margin: 0 !important + .m-1 margin: 4px !important @@ -92,6 +98,9 @@ .text-gray color: #888 +.text-gray-100 + color: #A3A3A3 !important + .text-red color: #F00 @@ -219,24 +228,102 @@ .mt-6 margin-top: 24px !important +.mt-7 + margin-top: 28px !important + +.mt-8 + margin-top: 32px !important + +.mt-9 + margin-top: 36px !important + +.mt-10 + margin-top: 40px !important + +.mt-11 + margin-top: 44px !important + +.mt-12 + margin-top: 48px !important + .mb-5 margin-bottom: 20px !important .mb-6 margin-bottom: 24px !important +.mb-7 + margin-bottom: 28px !important + +.mb-8 + margin-bottom: 32px !important + +.mb-9 + margin-bottom: 36px !important + +.mb-10 + margin-bottom: 40px !important + +.mb-11 + margin-bottom: 44px !important + +.mb-12 + margin-bottom: 48px !important + +.mb-13 + margin-bottom: 52px !important + +.mb-14 + margin-bottom: 56px !important + .ml-5 margin-left: 20px !important .ml-6 margin-left: 24px !important +.ml-7 + margin-left: 28px !important + +.ml-8 + margin-left: 32px !important + +.ml-9 + margin-left: 36px !important + +.ml-10 + margin-left: 40px !important + +.ml-11 + margin-left: 44px !important + +.ml-12 + margin-left: 48px !important + .mr-5 margin-right: 20px !important .mr-6 margin-right: 24px !important +.mr-7 + margin-right: 28px !important + +.mr-8 + margin-right: 32px !important + +.mr-9 + margin-right: 36px !important + +.mr-10 + margin-right: 40px !important + +.mr-11 + margin-right: 44px !important + +.mr-12 + margin-right: 48px !important + .text-xs font-size: 10px !important @@ -252,6 +339,21 @@ .text-xl font-size: 24px !important +.text-2xl + font-size: 28px !important + +.text-3xl + font-size: 32px !important + +.text-4xl + font-size: 36px !important + +.text-5xl + font-size: 40px !important + +.text-6xl + font-size: 44px !important + .w-1 width: 4px !important diff --git a/packages/ui-default/static/img/icon_login.svg b/packages/ui-default/static/img/icon_login.svg new file mode 100644 index 0000000..ea1d862 --- /dev/null +++ b/packages/ui-default/static/img/icon_login.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/packages/ui-default/templates/partials/login_dialog.html b/packages/ui-default/templates/partials/login_dialog.html index 548e7d8..1e25115 100644 --- a/packages/ui-default/templates/partials/login_dialog.html +++ b/packages/ui-default/templates/partials/login_dialog.html @@ -1,54 +1,57 @@