From 19467ce962773c3cdb3e820f4c4941789eaea8d3 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 23 Jul 2015 15:41:03 +0200 Subject: [PATCH] add setting-controls for right aligned controls in admin areas --- app/assets/javascripts/app/views/settings/logo.jst.eco | 2 +- app/assets/stylesheets/zammad.css.scss | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/app/views/settings/logo.jst.eco b/app/assets/javascripts/app/views/settings/logo.jst.eco index dde50e7f6..3868e12f3 100644 --- a/app/assets/javascripts/app/views/settings/logo.jst.eco +++ b/app/assets/javascripts/app/views/settings/logo.jst.eco @@ -30,7 +30,7 @@ -
+
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index fd3479b12..8ea661906 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -4675,6 +4675,12 @@ footer { max-width: 700px; } +.setting-controls { + margin-top: 14px; + display: flex; + justify-content: flex-end; +} + .form-item .form-group { margin-bottom: 0; }