diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-03-02 21:47:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-02 21:47:03 +0100 |
| commit | 3637a0101e1f5095397f190e88f281d603797c32 (patch) | |
| tree | 290569d5d454dc1a1478c35b7a4d6755ccfcad2c /app/javascript | |
| parent | d9e30efa5ecc87bc9be7b2e28baaf34bd01032f5 (diff) | |
| parent | c69d94ef7e13360e502635fc8bb1bbf8e13dfd74 (diff) | |
Merge pull request #1710 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/flavours/glitch/styles/admin.scss | 8 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/styles/forms.scss | 1 | ||||
| -rw-r--r-- | app/javascript/styles/mastodon/admin.scss | 8 | ||||
| -rw-r--r-- | app/javascript/styles/mastodon/forms.scss | 1 |
4 files changed, 18 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss index ea9d04e82..73414785c 100644 --- a/app/javascript/flavours/glitch/styles/admin.scss +++ b/app/javascript/flavours/glitch/styles/admin.scss @@ -904,6 +904,14 @@ a.name-tag, text-align: center; } +.applications-list__item { + padding: 15px 0; + background: $ui-base-color; + border: 1px solid lighten($ui-base-color, 4%); + border-radius: 4px; + margin-top: 15px; +} + .announcements-list { border: 1px solid lighten($ui-base-color, 4%); border-radius: 4px; diff --git a/app/javascript/flavours/glitch/styles/forms.scss b/app/javascript/flavours/glitch/styles/forms.scss index b108e5ce2..e36fab8fa 100644 --- a/app/javascript/flavours/glitch/styles/forms.scss +++ b/app/javascript/flavours/glitch/styles/forms.scss @@ -1126,6 +1126,7 @@ code { &:last-child { border-bottom: 0; + padding-bottom: 0; } } } diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index ea9d04e82..73414785c 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/app/javascript/styles/mastodon/admin.scss @@ -904,6 +904,14 @@ a.name-tag, text-align: center; } +.applications-list__item { + padding: 15px 0; + background: $ui-base-color; + border: 1px solid lighten($ui-base-color, 4%); + border-radius: 4px; + margin-top: 15px; +} + .announcements-list { border: 1px solid lighten($ui-base-color, 4%); border-radius: 4px; diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss index 6e02e2332..90d56b075 100644 --- a/app/javascript/styles/mastodon/forms.scss +++ b/app/javascript/styles/mastodon/forms.scss @@ -1069,6 +1069,7 @@ code { &:last-child { border-bottom: 0; + padding-bottom: 0; } } } |