diff --git a/app/assets/bundle/trestle/auth/login.css b/app/assets/bundle/trestle/auth/login.css index 3d8d282..24adec8 100644 --- a/app/assets/bundle/trestle/auth/login.css +++ b/app/assets/bundle/trestle/auth/login.css @@ -1 +1 @@ -.auth-body{color:#fff;display:flex}.auth-body .container{margin:auto;width:320px}.auth-header{margin-bottom:20px;text-align:center}.auth-header h1{align-items:center;display:flex;font-size:1.75rem;font-weight:500;justify-content:center;padding:.75rem 1rem;text-shadow:rgba(0,0,0,.5) 0 1px 1px}.auth-header img{max-height:100%;max-width:80%}.auth-header span{margin-left:10px}.login-form .input-group>*{background:hsla(0,0%,100%,.1);border:0;margin-left:0!important}.login-form .form-control{color:#fff;font-size:1.1rem;padding:1rem .75rem}.login-form .form-control:focus{box-shadow:none;outline-color:transparent;outline-style:none}.login-form .form-control:-ms-input-placeholder{color:hsla(0,0%,100%,.5)}.login-form .form-control::placeholder{color:hsla(0,0%,100%,.5)}.login-form .form-control:-webkit-autofill{-webkit-text-fill-color:#fff}.login-form .form-control:-webkit-autofill,.login-form .form-control:-webkit-autofill:active,.login-form .form-control:-webkit-autofill:focus,.login-form .form-control:-webkit-autofill:hover{-webkit-transition:background-color 9999999s ease-in-out 0s;transition:background-color 9999999s ease-in-out 0s}.login-form .input-group-text{color:hsla(0,0%,100%,.5);padding:.375rem .25rem .375rem 1rem}.login-form .btn-primary{box-shadow:0 0 2px rgba(0,0,0,.1);padding-bottom:.75rem;padding-top:.75rem}.login-form .alert-danger{background-color:hsla(2,62%,66%,.75)}.login-form .remember-me{font-size:.95rem;line-height:1.5;padding-left:0}.login-form .remember-me .form-check-input{margin-left:1em;margin-top:.825em}.login-form .remember-me .form-check-label{background:rgba(0,0,0,.075);border-radius:.375rem;color:hsla(0,0%,100%,.75);cursor:pointer;display:block;padding:.75em 1.5em .75em 3.25em}.login-form .remember-me .form-check-label:hover{background:rgba(0,0,0,.125)} \ No newline at end of file +.auth-body{color:#fff;display:flex}.auth-body .container{margin:auto;width:320px}.auth-header{margin-bottom:20px;text-align:center}.auth-header h1{align-items:center;display:flex;font-size:1.75rem;font-weight:500;justify-content:center;padding:.75rem 1rem;text-shadow:rgba(0,0,0,.5) 0 1px 1px}.auth-header img{max-height:100%;max-width:80%}.auth-header span{margin-left:10px}.login-form .input-group>*{background:hsla(0,0%,100%,.1);border:0;margin-left:0!important}.login-form .form-control{color:#fff;font-size:1rem;padding:.875rem .625rem}.login-form .form-control:focus{box-shadow:none;outline-color:transparent;outline-style:none}.login-form .form-control:-ms-input-placeholder{color:hsla(0,0%,100%,.5)}.login-form .form-control::placeholder{color:hsla(0,0%,100%,.5)}.login-form .form-control:-webkit-autofill{-webkit-text-fill-color:#fff}.login-form .form-control:-webkit-autofill,.login-form .form-control:-webkit-autofill:active,.login-form .form-control:-webkit-autofill:focus,.login-form .form-control:-webkit-autofill:hover{-webkit-transition:background-color 9999999s ease-in-out 0s;transition:background-color 9999999s ease-in-out 0s}.login-form .input-group-text{color:hsla(0,0%,100%,.5);padding:.25rem .25rem .25rem .875rem}.login-form .btn-primary{box-shadow:0 0 2px rgba(0,0,0,.1);padding-bottom:.625rem;padding-top:.625rem}.login-form .alert-danger{background-color:hsla(2,62%,66%,.75)}.login-form .remember-me{font-size:.8125rem;line-height:1.5;padding-left:0}.login-form .remember-me .form-check-input{margin-left:1em;margin-top:.825em}.login-form .remember-me .form-check-label{background:rgba(0,0,0,.075);border-radius:.375rem;color:hsla(0,0%,100%,.75);cursor:pointer;display:block;padding:.75em 1.5em .75em 3.25em}.login-form .remember-me .form-check-label:hover{background:rgba(0,0,0,.125)} \ No newline at end of file diff --git a/app/assets/bundle/trestle/auth/userbox.css b/app/assets/bundle/trestle/auth/userbox.css index f4d36b6..0130a7b 100644 --- a/app/assets/bundle/trestle/auth/userbox.css +++ b/app/assets/bundle/trestle/auth/userbox.css @@ -1 +1 @@ -.userbox{align-items:center;display:flex;order:99;padding:2px 0}.userbox>a{color:#333;display:block;font-weight:400;line-height:40px;padding:2px 0}.userbox>a:focus,.userbox>a:hover{text-decoration:none}.userbox .avatar{margin-left:6px;vertical-align:top}.userbox .dropdown-toggle:after{vertical-align:middle}@media(max-width:575.98px){.userbox{display:block;position:relative;z-index:5}.userbox .name{display:none}.userbox .avatar{border:1px solid hsla(0,0%,100%,.25);margin-left:0}} \ No newline at end of file +.userbox{align-items:center;display:flex;order:99;padding:.125rem 0}.userbox>a{color:#333;display:block;font-weight:400;line-height:40px;padding:.125rem 0}.userbox>a:focus,.userbox>a:hover{text-decoration:none}.userbox .avatar{margin-left:.375rem;vertical-align:top}.userbox .dropdown-toggle:after{vertical-align:middle}@media(max-width:575.98px){.userbox{display:block;position:relative;z-index:5}.userbox .name{display:none}.userbox .avatar{border:1px solid hsla(0,0%,100%,.25);margin-left:0}} \ No newline at end of file diff --git a/frontend/_form.scss b/frontend/_form.scss index be58abf..19f090c 100644 --- a/frontend/_form.scss +++ b/frontend/_form.scss @@ -7,9 +7,9 @@ .form-control { color: $auth-form-control-color; - font-size: 1.1rem; + font-size: 1rem; - padding: 1rem 0.75rem; + padding: 0.875rem 0.625rem; &:focus { outline-color: transparent; @@ -32,14 +32,14 @@ .input-group-text { color: $auth-form-control-icon-color; - padding: 0.375rem 0.25rem 0.375rem 1rem; + padding: 0.25rem 0.25rem 0.25rem 0.875rem; } .btn-primary { box-shadow: rgba(black, 0.1) 0 0 2px; - padding-top: 0.75rem; - padding-bottom: 0.75rem; + padding-top: 0.625rem; + padding-bottom: 0.625rem; } .alert-danger { @@ -47,7 +47,7 @@ } .remember-me { - font-size: 0.95rem; + font-size: 0.8125rem; line-height: 1.5; padding-left: 0; diff --git a/frontend/userbox.scss b/frontend/userbox.scss index ac3e1e9..63c30ba 100644 --- a/frontend/userbox.scss +++ b/frontend/userbox.scss @@ -2,7 +2,7 @@ .userbox { order: 99; - padding: 2px 0; + padding: 0.125rem 0; display: flex; align-items: center; @@ -11,7 +11,7 @@ color: $body-color; display: block; - padding: 2px 0; + padding: 0.125rem 0; font-weight: normal; line-height: 40px; @@ -23,7 +23,7 @@ .avatar { vertical-align: top; - margin-left: 6px; + margin-left: 0.375rem; } .dropdown-toggle { diff --git a/yarn.lock b/yarn.lock index 41661c7..b6896b4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -24,9 +24,9 @@ js-tokens "^4.0.0" "@babel/runtime@^7.23.9": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.7.tgz#f4f0d5530e8dbdf59b3451b9b3e594b6ba082e12" - integrity sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw== + version "7.24.8" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.8.tgz#5d958c3827b13cc6d05e038c07fb2e5e3420d82e" + integrity sha512-5F7SDGs1T72ZczbRwbGO9lQi0NLjQxzl6i4lJxLxfW9U5UluCSyEJeniWvnhl3/euNiqQVbo8zruhsDfid0esA== dependencies: regenerator-runtime "^0.14.0" @@ -36,9 +36,9 @@ integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== "@fortawesome/fontawesome-free@^6.2.1": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.2.tgz#310fe90cb5a8dee9698833171b98e7835404293d" - integrity sha512-hRILoInAx8GNT5IMkrtIt9blOdrqHOnPBH+k70aWUAqPZPgopb9G5EQJFpaBx/S8zp2fC+mPW349Bziuk1o28Q== + version "6.6.0" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.6.0.tgz#0e984f0f2344ee513c185d87d77defac4c0c8224" + integrity sha512-60G28ke/sXdtS9KZCpZSHHkCbdsOGEhIUGlwq6yhY74UpTiToIh8np7A8yphhM4BWsvNFtIvLpi4co+h9Mr9Ow== "@hotwired/stimulus-webpack-helpers@^1.0.1": version "1.0.1" @@ -51,9 +51,9 @@ integrity sha512-eGeIqNOQpXoPAIP7tC1+1Yc1yl1xnwYqg+3mzqxyrbE5pg5YFBZcA6YoTiByJB6DKAEsiWtl6tjTJS4IYtbB7A== "@hotwired/turbo@^8.0.2": - version "8.0.4" - resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-8.0.4.tgz#5c5361c06a37cdf10dcba4223f1afd0ca1c75091" - integrity sha512-mlZEFUZrJnpfj+g/XeCWWuokvQyN68WvM78JM+0jfSFc98wegm259vCbC1zSllcspRwbgXK31ibehCy5PA78/Q== + version "8.0.5" + resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-8.0.5.tgz#abae6dad018a891e4286e87fa0959217e3866d5a" + integrity sha512-TdZDA7fxVQ2ZycygvpnzjGPmFq4sO/E2QVg+2em/sJ3YTSsIWVEis8HmWlumz+c9DjWcUkcCuB+muF08TInpAQ== "@jridgewell/gen-mapping@^0.3.5": version "0.3.5" @@ -1725,7 +1725,7 @@ to-regex-range@^5.0.1: "trestle@https://github.com/TrestleAdmin/trestle.git": version "0.10.0-pre" - resolved "https://github.com/TrestleAdmin/trestle.git#0e188066a30e9418f26f49d8bd100e12f70f33e9" + resolved "https://github.com/TrestleAdmin/trestle.git#39d92dd7b603c4148b62e8bcb76a7b76d2575c86" dependencies: "@fortawesome/fontawesome-free" "^6.2.1" "@hotwired/stimulus" "^3.2.2"