mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-21 12:05:07 +01:00
Code Issues Projects Releases Wiki Activity

Fix placeholder colors for inputs not being explicitly defined (#11890)

Browse Source 
Fix #11841
This commit is contained in:
Eugen Rochko 2019-09-19 19:58:40 +02:00 committed by GitHub
parent 129bc871a0
commit b6df9c1067
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 52 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/javascript/styles/mastodon/_mixins.scss
View File

@ -22,24 +22,6 @@
color: $darker-text-color; color: $darker-text-color;
font-size: 14px; font-size: 14px;
margin: 0; margin: 0;
&::-moz-focus-inner {
border: 0;
}
&::-moz-focus-inner,
&:focus,
&:active {
outline: 0 !important;
}
&:focus {
background: lighten($ui-base-color, 4%);
}
@media screen and (max-width: 600px) {
font-size: 16px;
}
} }
@mixin search-popout { @mixin search-popout {

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

@ -421,6 +421,10 @@
border: 0; border: 0;
outline: 0; outline: 0;
&::placeholder {
color: $dark-text-color;
}
&:focus { &:focus {
outline: 0; outline: 0;
} }
@ -3533,6 +3537,28 @@ a.status-card.compact:hover {
.column-select { .column-select {
&__control { &__control {
@include search-input; @include search-input;
&::placeholder {
color: lighten($darker-text-color, 4%);
}
&::-moz-focus-inner {
border: 0;
}
&::-moz-focus-inner,
&:focus,
&:active {
outline: 0 !important;
}
&:focus {
background: lighten($ui-base-color, 4%);
}
@media screen and (max-width: 600px) {
font-size: 16px;
}
} }
&__placeholder { &__placeholder {
@ -4046,6 +4072,28 @@ a.status-card.compact:hover {
padding-right: 30px; padding-right: 30px;
line-height: 18px; line-height: 18px;
font-size: 16px; font-size: 16px;
&::placeholder {
color: lighten($darker-text-color, 4%);
}
&::-moz-focus-inner {
border: 0;
}
&::-moz-focus-inner,
&:focus,
&:active {
outline: 0 !important;
}
&:focus {
background: lighten($ui-base-color, 4%);
}
@media screen and (max-width: 600px) {
font-size: 16px;
}
} }
.search__icon { .search__icon {

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

@ -338,6 +338,10 @@ code {
border-radius: 4px; border-radius: 4px;
padding: 10px; padding: 10px;
&::placeholder {
color: lighten($darker-text-color, 4%);
}
&:invalid { &:invalid {
box-shadow: none; box-shadow: none;
} }