From 32191267a55253e823c35efce8d99424d06241e1 Mon Sep 17 00:00:00 2001 From: Sasha Sorokin Date: Sat, 11 Jan 2020 08:14:45 +0700 Subject: [Glitch] Use heading actions and placeholders in settings Port SCSS changes from 36426ed4ad450320f4a4e598c41355a6d8faad66 to glitch-soc Signed-off-by: Thibaut Girka --- app/javascript/flavours/glitch/styles/admin.scss | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'app/javascript/flavours') diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss index d2f477d19..e7c9855b8 100644 --- a/app/javascript/flavours/glitch/styles/admin.scss +++ b/app/javascript/flavours/glitch/styles/admin.scss @@ -894,3 +894,7 @@ a.name-tag, color: $primary-text-color; } } + +.center-text { + text-align: center; +} -- cgit From 7ab12b7654f04b2ea71cada9c8f0a41825864939 Mon Sep 17 00:00:00 2001 From: Sasha Sorokin Date: Sun, 12 Jan 2020 20:16:20 +0700 Subject: [Glitch] Correct margins for heading actions Port SCSS changes from 5dcca33c561ebeca9cf12eba8a39efee0dd484d0 to glitch-soc Signed-off-by: Thibaut Girka --- app/javascript/flavours/glitch/styles/admin.scss | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'app/javascript/flavours') diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss index e7c9855b8..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; } } -- cgit