diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-06-28 11:11:18 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-06-28 11:11:18 +0200 |
commit | fe5f6bc7edf42e8c87dbdfa98f5707020e42d400 (patch) | |
tree | 2e632dfa964aad5cf118930389cf95904f3bd82a /app/javascript/styles/mastodon/admin.scss | |
parent | 63f79874b59b3ba28c0f940b9d36ea7aacb44c93 (diff) | |
parent | 02851848e964675bb59919fa5fd1bdee2c1c29db (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/workflows/build-image.yml`: Fix erroneous deletion in a previous merge. - `Gemfile`: Conflict caused by glitch-soc-only hCaptcha dependency - `app/controllers/auth/sessions_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/controllers/filters_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/serializers/rest/status_serializer.rb`: Minor conflict due to glitch-soc having an extra `local_only` property
Diffstat (limited to 'app/javascript/styles/mastodon/admin.scss')
-rw-r--r-- | app/javascript/styles/mastodon/admin.scss | 40 |
1 files changed, 38 insertions, 2 deletions
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index f4f5bf752..f606bfa4a 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/app/javascript/styles/mastodon/admin.scss @@ -75,6 +75,13 @@ $content-width: 840px; height: 100px; } + .logo--wordmark { + display: inherit; + margin: inherit; + width: inherit; + height: 20px; + } + @media screen and (max-width: $no-columns-breakpoint) { & > a:first-child { display: none; @@ -924,7 +931,8 @@ a.name-tag, text-align: center; } -.applications-list__item { +.applications-list__item, +.filters-list__item { padding: 15px 0; background: $ui-base-color; border: 1px solid lighten($ui-base-color, 4%); @@ -932,7 +940,8 @@ a.name-tag, margin-top: 15px; } -.announcements-list { +.announcements-list, +.filters-list { border: 1px solid lighten($ui-base-color, 4%); border-radius: 4px; @@ -985,6 +994,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 { margin-top: 10px; } |