diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-10-25 21:31:10 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-25 21:31:10 +0200 |
commit | e0f39626973fd9f5cce2d4cd3b166fb47e9c9059 (patch) | |
tree | e02d1e9a448960a68652f75baebb5921211ee7a1 /app/javascript/flavours/glitch/styles | |
parent | c647fa99cab9b9db81d36223cf2c2c27e065b648 (diff) | |
parent | a30ac454b2ceb381c50f5b9323e25817d784a476 (diff) |
Merge pull request #1625 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/styles')
-rw-r--r-- | app/javascript/flavours/glitch/styles/admin.scss | 8 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/styles/dashboard.scss | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss index 24618c29f..bfb09aa0a 100644 --- a/app/javascript/flavours/glitch/styles/admin.scss +++ b/app/javascript/flavours/glitch/styles/admin.scss @@ -936,6 +936,13 @@ a.name-tag, } .retention { + overflow: auto; + + > h4 { + position: sticky; + left: 0; + } + &__table { &__number { color: $secondary-text-color; @@ -1034,6 +1041,7 @@ a.name-tag, &__graph { position: absolute; bottom: 0; + width: 100%; svg { display: block; diff --git a/app/javascript/flavours/glitch/styles/dashboard.scss b/app/javascript/flavours/glitch/styles/dashboard.scss index cad5a105b..5e900e8c5 100644 --- a/app/javascript/flavours/glitch/styles/dashboard.scss +++ b/app/javascript/flavours/glitch/styles/dashboard.scss @@ -61,6 +61,10 @@ grid-template-columns: minmax(0, 1fr) minmax(0, 1fr) minmax(0, 1fr); grid-gap: 10px; + @media screen and (max-width: 1350px) { + grid-template-columns: minmax(0, 1fr) minmax(0, 1fr); + } + &__item { &--span-double-column { grid-column: span 2; |