tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2022-10-28 19:41:11 +02:00
parent 592147b902 5fa340931e
commit b514998dc1
18 changed files with 82 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/styles/mastodon/components.scss
View File

@ -279,11 +279,12 @@
display: inline-flex;
align-items: center;
width: auto !important;
padding: 0 4px 0 2px;
}
&__counter {
display: inline-block;
width: 14px;
width: auto;
margin-left: 4px;
font-size: 12px;
font-weight: 500;
@ -7277,6 +7278,7 @@ noscript {
align-items: center;
padding: 15px;
border-bottom: 1px solid lighten($ui-base-color, 8%);
gap: 15px;
&:last-child {
border-bottom: 0;
@ -7318,8 +7320,6 @@ noscript {
font-size: 24px;
font-weight: 500;
text-align: right;
padding-right: 15px;
margin-left: 5px;
color: $secondary-text-color;
text-decoration: none;
}

5
app/javascript/styles/mastodon/forms.scss
View File

@ -404,6 +404,7 @@ code {
input[type="email"],
input[type="password"],
input[type="url"],
input[type="datetime-local"],
textarea {
box-sizing: border-box;
font-size: 16px;
@ -444,7 +445,8 @@ code {
input[type="text"],
input[type="number"],
input[type="email"],
input[type="password"] {
input[type="password"],
input[type="datetime-local"] {
&:focus:invalid:not(:placeholder-shown),
&:required:invalid:not(:placeholder-shown) {
border-color: lighten($error-red, 12%);
@ -460,6 +462,7 @@ code {
input[type="number"],
input[type="email"],
input[type="password"],
input[type="datetime-local"],
textarea,
select {
border-color: lighten($error-red, 12%);