Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `.prettierignore`:
  Upstream added a line at the end of the file, while glitch-soc had its own
  extra lines.
  Took upstream's change.
- `CONTRIBUTING.md`:
  We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
  Ported upstream changes.
- `app/controllers/application_controller.rb`:
  Upstream made code style changes in a method that is entirely replaced
  in glitch-soc.
  Ignored the change.
- `app/models/account.rb`:
  Code style changes textually close to glitch-soc-specific changes.
  Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream code style changes.
  Ignored them.
This commit is contained in:
Claire
2023-02-25 14:00:40 +01:00
946 changed files with 4147 additions and 3072 deletions

View File

@ -384,7 +384,7 @@ $content-width: 840px;
position: fixed;
z-index: 10;
width: 100%;
height: calc(100vh - 56px);
height: calc(100% - 56px);
left: 0;
bottom: 0;
overflow-y: auto;

View File

@ -405,10 +405,7 @@ body > [data-popper-placement] {
}
input[type='checkbox'] {
display: none;
}
.checkbox {
appearance: none;
display: inline-block;
position: relative;
border: 1px solid $ui-primary-color;
@ -420,8 +417,9 @@ body > [data-popper-placement] {
top: -1px;
border-radius: 4px;
vertical-align: middle;
cursor: inherit;
&.active {
&:checked {
border-color: $highlight-text-color;
background: $highlight-text-color
url("data:image/svg+xml;utf8,<svg width='18' height='18' fill='none' xmlns='http://www.w3.org/2000/svg'><path d='M4.5 8.5L8 12l6-6' stroke='white' stroke-width='1.5'/></svg>")
@ -1200,11 +1198,12 @@ body > [data-popper-placement] {
.status__info {
font-size: 15px;
margin-bottom: 10px;
padding-bottom: 10px;
display: flex;
align-items: center;
justify-content: space-between;
gap: 10px;
cursor: pointer;
}
.status-check-box__status {
@ -4544,7 +4543,7 @@ a.status-card.compact:hover {
width: 100%;
height: 6px;
border-radius: 6px;
background: $ui-base-lighter-color;
background: darken($simple-background-color, 8%);
position: relative;
margin-top: 5px;
}