luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-24 14:17:08 +00:00
Code Issues Projects Releases Wiki Activity

[Glitch] [SSR only] Revamp post filtering system

Browse source 
Port CSS and JS for Server-Side Rendered pages from 02851848e9

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
Claire 2022-06-28 09:42:13 +02:00
parent 97f81577f1
commit f218e633b4
3 changed files with 63 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/javascript/flavours/glitch/packs/settings.js
View file

@ -2,6 +2,7 @@ import 'packs/public-path';
import loadPolyfills from 'flavours/glitch/util/load_polyfills'; import loadPolyfills from 'flavours/glitch/util/load_polyfills';
import ready from 'flavours/glitch/util/ready'; import ready from 'flavours/glitch/util/ready';
import loadKeyboardExtensions from 'flavours/glitch/util/load_keyboard_extensions'; import loadKeyboardExtensions from 'flavours/glitch/util/load_keyboard_extensions';
import 'cocoon-js-vanilla';
function main() { function main() {
const { delegate } = require('@rails/ujs'); const { delegate } = require('@rails/ujs');

33
app/javascript/flavours/glitch/styles/admin.scss
View file

@ -934,7 +934,8 @@ a.name-tag,
text-align: center; text-align: center;
} }
.applications-list__item { .applications-list__item,
.filters-list__item {
padding: 15px 0; padding: 15px 0;
background: $ui-base-color; background: $ui-base-color;
border: 1px solid lighten($ui-base-color, 4%); border: 1px solid lighten($ui-base-color, 4%);
@ -942,7 +943,8 @@ a.name-tag,
margin-top: 15px; margin-top: 15px;
} }
.announcements-list { .announcements-list,
.filters-list {
border: 1px solid lighten($ui-base-color, 4%); border: 1px solid lighten($ui-base-color, 4%);
border-radius: 4px; border-radius: 4px;
@ -995,6 +997,33 @@ a.name-tag,
} }
} }
.filters-list__item {
&__title {
display: flex;
justify-content: space-between;
margin-bottom: 0;
}
&__permissions {
margin-top: 0;
margin-bottom: 10px;
}
.expiration {
font-size: 13px;
}
&.expired {
.expiration {
color: lighten($error-red, 12%);
}
.permissions-list__item__icon {
color: $dark-text-color;
}
}
}
.dashboard__counters.admin-account-counters { .dashboard__counters.admin-account-counters {
margin-top: 10px; margin-top: 10px;
} }

31
app/javascript/flavours/glitch/styles/forms.scss
View file

@ -1065,3 +1065,34 @@ code {
} }
} }
} }
.keywords-table {
thead {
th {
white-space: nowrap;
}
th:first-child {
width: 100%;
}
}
tfoot {
td {
border: 0;
}
}
.input.string {
margin-bottom: 0;
}
.label_input__wrapper {
margin-top: 10px;
}
.table-action-link {
margin-top: 10px;
white-space: nowrap;
}
}