Skip to content

Commit

Permalink
Update font sizes and dimensions for latest Trestle root font-size up…
Browse files Browse the repository at this point in the history
…date
  • Loading branch information
spohlenz committed Jul 28, 2024
1 parent 74ea377 commit a4f7f58
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion app/assets/bundle/trestle/auth/login.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/assets/bundle/trestle/auth/userbox.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions frontend/_form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -32,22 +32,22 @@

.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 {
background-color: rgba($alert-danger-bg, 0.75);
}

.remember-me {
font-size: 0.95rem;
font-size: 0.8125rem;
line-height: 1.5;

padding-left: 0;
Expand Down
6 changes: 3 additions & 3 deletions frontend/userbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

.userbox {
order: 99;
padding: 2px 0;
padding: 0.125rem 0;

display: flex;
align-items: center;
Expand All @@ -11,7 +11,7 @@
color: $body-color;

display: block;
padding: 2px 0;
padding: 0.125rem 0;

font-weight: normal;
line-height: 40px;
Expand All @@ -23,7 +23,7 @@

.avatar {
vertical-align: top;
margin-left: 6px;
margin-left: 0.375rem;
}

.dropdown-toggle {
Expand Down
20 changes: 10 additions & 10 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit a4f7f58

Please sign in to comment.