mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-22 04:25:06 +01:00
Code Issues Projects Releases Wiki Activity

Fix autosuggest-textarea backgrounds and some minor adjustments (#7817)

Browse Source
This commit is contained in:
Lynx Kotoura 2018-06-16 19:56:45 +09:00 committed by Eugen Rochko
parent ea23ef8cb6
commit a9ef82febb
1 changed files with 59 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
app/javascript/styles/mastodon-light/diff.scss
View File

@ -25,33 +25,51 @@
background: $ui-base-color url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color($white)}"/></svg>') no-repeat bottom / 100% auto; background: $ui-base-color url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color($white)}"/></svg>') no-repeat bottom / 100% auto;
} }
.compose-form .compose-form__modifiers .compose-form__upload__actions .icon-button { // Change the colors used in compose-form
color: lighten($white, 7%); .compose-form {
.compose-form__modifiers {
.compose-form__upload__actions .icon-button {
color: lighten($white, 7%);
&:active, &:active,
&:focus, &:focus,
&:hover { &:hover {
color: $white; color: $white;
}
}
.compose-form__upload-description input {
color: lighten($white, 7%);
&::placeholder {
color: lighten($white, 7%);
}
}
} }
}
.compose-form .compose-form__modifiers .compose-form__upload-description input { .compose-form__buttons-wrapper {
color: lighten($white, 7%); background: darken($ui-base-color, 6%);
&::placeholder {
color: lighten($white, 7%);
} }
}
.compose-form .compose-form__buttons-wrapper { .autosuggest-textarea__suggestions {
background: darken($ui-base-color, 6%); background: darken($ui-base-color, 6%);
}
.autosuggest-textarea__suggestions__item {
&:hover,
&:focus,
&:active,
&.selected {
background: lighten($ui-base-color, 4%);
}
}
} }
.emoji-mart-bar { .emoji-mart-bar {
border-color: lighten($ui-base-color, 8%); border-color: lighten($ui-base-color, 4%);
&:first-child { &:first-child {
background: $ui-base-color; background: darken($ui-base-color, 6%);
} }
} }
@ -60,6 +78,7 @@
border-color: $ui-base-color; border-color: $ui-base-color;
} }
// Change the background colors of statuses
.focusable:focus { .focusable:focus {
background: $ui-base-color; background: $ui-base-color;
} }
@ -77,7 +96,7 @@
background: darken($ui-base-color, 6%); background: darken($ui-base-color, 6%);
} }
// Change the background color of status__content__spoiler-link // Change the background colors of status__content__spoiler-link
.reply-indicator__content .status__content__spoiler-link, .reply-indicator__content .status__content__spoiler-link,
.status__content .status__content__spoiler-link { .status__content .status__content__spoiler-link {
background: $ui-base-lighter-color; background: $ui-base-lighter-color;
@ -87,8 +106,7 @@
} }
} }
// Change the background colors of media and video spoiler // Change the background colors of media and video spoilers
.media-spoiler, .media-spoiler,
.video-player__spoiler { .video-player__spoiler {
background: $ui-base-color; background: $ui-base-color;
@ -101,30 +119,30 @@
// Change the colors used in the dropdown menu // Change the colors used in the dropdown menu
.dropdown-menu { .dropdown-menu {
background: $ui-base-color; background: $ui-base-color;
}
.dropdown-menu__arrow { &__arrow {
&.left { &.left {
border-left-color: $ui-base-color; border-left-color: $ui-base-color;
}
&.top {
border-top-color: $ui-base-color;
}
&.bottom {
border-bottom-color: $ui-base-color;
}
&.right {
border-right-color: $ui-base-color;
}
} }
&.top { &__item {
border-top-color: $ui-base-color; a {
} background: $ui-base-color;
color: $darker-text-color;
&.bottom { }
border-bottom-color: $ui-base-color;
}
&.right {
border-right-color: $ui-base-color;
}
}
.dropdown-menu__item {
a {
background: $ui-base-color;
color: $darker-text-color;
} }
} }