Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/status.rb`: Upstream updated media and edit-related code textually close to glitch-soc additions (local-only and content-type). Ported upstream changes. - `app/models/status_edit.rb`: Upstream changes textually close to glitch-soc additions (content-type). Ported upstream changes. - `app/serializers/activitypub/note_serializer.rb`: Upstream changed how media attachments are handled. Not really a conflict, but textually close to glitch-soc additions (directMessage attribute). Ported upstream changes. - `app/services/remove_status_service.rb`: Upstream changed how media attachments are handled. Not really a conflict, but textually close to glitch-soc additions (DM timeline). Ported upstream changes. - `app/services/update_status_service.rb`: Upstream fixed an issue with language selection. Not really a conflict, but textually close to glitch-soc additions (content-type). Ported upstream changes. - `db/schema.rb`: Upstream added columns to the `status_edits` table, the conflict is because of an additional column (`content-type`) in glitch-soc. Ported upstream changes. - `package.json`: Upstream dependency (express) textually adjacent to a glitch-soc-specific one (favico.js) got updated. Updated it as well.
This commit is contained in:
@ -367,6 +367,21 @@ body,
|
||||
}
|
||||
}
|
||||
|
||||
.positive-hint,
|
||||
.negative-hint,
|
||||
.neutral-hint {
|
||||
a {
|
||||
color: inherit;
|
||||
text-decoration: underline;
|
||||
|
||||
&:focus,
|
||||
&:hover,
|
||||
&:active {
|
||||
text-decoration: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.positive-hint {
|
||||
color: $valid-value-color;
|
||||
font-weight: 500;
|
||||
@ -1612,3 +1627,38 @@ a.sparkline {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.availability-indicator {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-bottom: 30px;
|
||||
font-size: 14px;
|
||||
line-height: 21px;
|
||||
|
||||
&__hint {
|
||||
padding: 0 15px;
|
||||
}
|
||||
|
||||
&__graphic {
|
||||
display: flex;
|
||||
margin: 0 -2px;
|
||||
|
||||
&__item {
|
||||
display: block;
|
||||
flex: 0 0 auto;
|
||||
width: 4px;
|
||||
height: 21px;
|
||||
background: lighten($ui-base-color, 8%);
|
||||
margin: 0 2px;
|
||||
border-radius: 2px;
|
||||
|
||||
&.positive {
|
||||
background: $valid-value-color;
|
||||
}
|
||||
|
||||
&.negative {
|
||||
background: $error-value-color;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user