post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Merge remote-tracking branch 'origin/kb_development' into kb_migration

Browse source
This commit is contained in:
KMY 2023-04-06 16:57:01 +09:00
commit 94cd200097
50 changed files with 801 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/javascript/styles/mastodon-light/diff.scss
View file

@ -289,7 +289,8 @@ html {
background: $ui-base-color;
}
.privacy-dropdown.active .privacy-dropdown__value.active .icon-button {
.privacy-dropdown.active .privacy-dropdown__value.active .icon-button,
.expiration-dropdown.active .expiration-dropdown__value.active .icon-button {
color: $white;
}
@ -321,6 +322,14 @@ html {
.privacy-dropdown__option.active .privacy-dropdown__option__content strong,
.privacy-dropdown__option:hover .privacy-dropdown__option__content,
.privacy-dropdown__option:hover .privacy-dropdown__option__content strong,
.expiration-dropdown__option.active,
.expiration-dropdown__option:hover,
.expiration-dropdown__option.active .expiration-dropdown__option__content,
.expiration-dropdown__option.active
.expiration-dropdown__option__content
strong,
.expiration-dropdown__option:hover .expiration-dropdown__option__content,
.expiration-dropdown__option:hover .expiration-dropdown__option__content strong,
.dropdown-menu__item a:active,
.dropdown-menu__item a:focus,
.dropdown-menu__item a:hover,

43
app/javascript/styles/mastodon/components.scss
View file

@ -468,6 +468,13 @@ body > [data-popper-placement] {
inset-inline-end: 0;
}
.expiration-dropdown {
position: absolute;
top: 32px;
right: 4px;
transform: scale(1.2);
}
.compose-form__autosuggest-wrapper {
position: relative;
}
@ -4695,7 +4702,8 @@ a.status-card.compact:hover {
filter: none;
}
.privacy-dropdown__dropdown {
.privacy-dropdown__dropdown,
.expiration-dropdown__dropdown {
background: $simple-background-color;
box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4);
border-radius: 4px;
@ -4711,16 +4719,19 @@ a.status-card.compact:hover {
}
}
.modal-root__container .privacy-dropdown {
.modal-root__container .privacy-dropdown,
.modal-root__container .expiration-dropdown {
flex-grow: 0;
}
.modal-root__container .privacy-dropdown__dropdown {
.modal-root__container .privacy-dropdown__dropdown,
.modal-root__container .ezpiration-dropdown__dropdown {
pointer-events: auto;
z-index: 9999;
}
.privacy-dropdown__option {
.privacy-dropdown__option,
.expiration-dropdown__option {
color: $inverted-text-color;
padding: 10px;
cursor: pointer;
@ -4770,8 +4781,10 @@ a.status-card.compact:hover {
}
}
.privacy-dropdown.active {
.privacy-dropdown__value {
.privacy-dropdown.active,
.expiration-dropdown.active {
.privacy-dropdown__value,
.expiration-dropdown__value {
background: $simple-background-color;
border-radius: 4px 4px 0 0;
box-shadow: 0 -4px 4px rgba($base-shadow-color, 0.1);
@ -4789,16 +4802,30 @@ a.status-card.compact:hover {
}
}
&.top .privacy-dropdown__value {
&.top .privacy-dropdown__value,
&.top .expiration-dropdown__value {
border-radius: 0 0 4px 4px;
}
.privacy-dropdown__dropdown {
.privacy-dropdown__dropdown,
.expiration-dropdown__dropdown {
display: block;
box-shadow: 2px 4px 6px rgba($base-shadow-color, 0.1);
}
}
.privacy-dropdown .privacy-dropdown__value.searchability {
position: relative;
.searchability-dropdown__value-overlay {
position: absolute;
right: 0;
bottom: 0;
color: purple;
pointer-events: none;
}
}
.language-dropdown {
&__dropdown {
background: $simple-background-color;