diff options
| author | ThibG <thib@sitedethib.com> | 2020-01-13 16:07:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-13 16:07:40 +0100 |
| commit | ddcf78d8d3e2a8cb9aa04f8ff42f9d8e185b0354 (patch) | |
| tree | 14bcdbeac5f8d904cad3d13a469869c5baf9db99 /app/javascript/flavours | |
| parent | 180f1383943ad171d8394ef9af7c7861bfc08056 (diff) | |
| parent | 83f8bf48d91605fa63325b4d4acec717031da025 (diff) | |
Merge pull request #1263 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours')
| -rw-r--r-- | app/javascript/flavours/glitch/styles/admin.scss | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss index d2f477d19..a1895d066 100644 --- a/app/javascript/flavours/glitch/styles/admin.scss +++ b/app/javascript/flavours/glitch/styles/admin.scss @@ -186,17 +186,22 @@ $content-width: 840px; padding-bottom: 40px; border-bottom: 1px solid lighten($ui-base-color, 8%); - margin-bottom: 40px; + + margin: -15px -15px 40px 0; flex-wrap: wrap; align-items: center; - justify-content: space-between; + & > * { + margin-top: 15px; + margin-right: 15px; + } + &-actions { display: inline-flex; - & > * { + & > :not(:first-child) { margin-left: 5px; } } @@ -894,3 +899,7 @@ a.name-tag, color: $primary-text-color; } } + +.center-text { + text-align: center; +} |