chinwag/chinwagsocial
chinwag/chinwagsocial
2
0
Fork 0
Code Issues Pull requests Releases 14 Wiki Activity

Merge tag 'v3.5.3'

Browse source
This commit is contained in:
Mike Barnes 2022-05-27 18:31:42 +10:00
commit ed34f4b9a4
292 changed files with 11462 additions and 3972 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -330,6 +330,7 @@ html {
.actions-modal ul li:not(:empty) a:focus button,
.actions-modal ul li:not(:empty) a:hover,
.actions-modal ul li:not(:empty) a:hover button,
.language-dropdown__dropdown__results__item.active,
.admin-wrapper .sidebar ul .simple-navigation-active-leaf a,
.simple_form .block-button,
.simple_form .button,
@ -337,6 +338,14 @@ html {
color: $white;
}
.language-dropdown__dropdown__results__item .language-dropdown__dropdown__results__item__common-name {
color: lighten($ui-base-color, 8%);
}
.language-dropdown__dropdown__results__item.active .language-dropdown__dropdown__results__item__common-name {
color: darken($ui-base-color, 12%);
}
.dropdown-menu__separator,
.dropdown-menu__item.edited-timestamp__history__item,
.dropdown-menu__container__header,
@ -371,12 +380,13 @@ html {
border: 1px solid lighten($ui-base-color, 8%);
}
.reactions-bar__item {
&:hover,
&:focus,
&:active {
background-color: $ui-base-color;
}
.reactions-bar__item:hover,
.reactions-bar__item:focus,
.reactions-bar__item:active,
.language-dropdown__dropdown__results__item:hover,
.language-dropdown__dropdown__results__item:focus,
.language-dropdown__dropdown__results__item:active {
background-color: $ui-base-color;
}
.reactions-bar__item.active {

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

@ -2469,6 +2469,10 @@ a.account__display-name {
.columns-area__panels__pane--compositional {
display: none;
}
.with-fab .scrollable .item-list:last-child {
padding-bottom: 5.25rem;
}
}
@media screen and (min-width: 600px + (285px * 1) + (10px * 1)) {
@ -4033,6 +4037,15 @@ a.status-card.compact:hover {
vertical-align: middle;
}
.limited-account-hint {
p {
color: $secondary-text-color;
font-size: 15px;
font-weight: 500;
margin-bottom: 20px;
}
}
.empty-column-indicator,
.error-column,
.follow_requests-unlocked_explanation {
@ -4336,7 +4349,6 @@ a.status-card.compact:hover {
background: $simple-background-color;
box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4);
border-radius: 4px;
margin-left: 40px;
overflow: hidden;
z-index: 2;
@ -4437,6 +4449,71 @@ a.status-card.compact:hover {
}
}
.language-dropdown {
&__dropdown {
position: absolute;
background: $simple-background-color;
box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4);
border-radius: 4px;
overflow: hidden;
z-index: 2;
&.top {
transform-origin: 50% 100%;
}
&.bottom {
transform-origin: 50% 0;
}
.emoji-mart-search {
padding-right: 10px;
}
.emoji-mart-search-icon {
right: 10px + 5px;
}
.emoji-mart-scroll {
padding: 0 10px 10px;
}
&__results {
&__item {
cursor: pointer;
color: $inverted-text-color;
font-weight: 500;
padding: 10px;
border-radius: 4px;
&:focus,
&:active,
&:hover {
background: $ui-secondary-color;
}
&__common-name {
color: $darker-text-color;
}
&.active {
background: $ui-highlight-color;
color: $primary-text-color;
outline: 0;
.language-dropdown__dropdown__results__item__common-name {
color: $secondary-text-color;
}
&:hover {
background: lighten($ui-highlight-color, 4%);
}
}
}
}
}
}
.search {
position: relative;
}