From e667434bb3ff68b31635d0212fa12a0b3e5102ee Mon Sep 17 00:00:00 2001 From: Kris Date: Thu, 21 Dec 2017 17:13:06 -0500 Subject: [PATCH] UX: Cleaning up a few admin styles --- .../admin/templates/customize-themes-show.hbs | 4 ++-- app/assets/stylesheets/common/admin/admin_base.scss | 11 +++++++---- app/assets/stylesheets/common/admin/customize.scss | 4 ++++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs index 6f8ac614aaf..7f339d63d74 100644 --- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs +++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs @@ -1,5 +1,5 @@
-

+

{{#if editingName}} {{text-field value=model.name autofocus="true"}} {{d-button action="finishedEditingName" class="btn-primary btn-small submit-edit" icon="check"}} @@ -7,7 +7,7 @@ {{else}} {{model.name}} {{d-icon "pencil"}} {{/if}} -

+ {{#if model.remote_theme}}

diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss index dab0f7a58df..e66c539e393 100644 --- a/app/assets/stylesheets/common/admin/admin_base.scss +++ b/app/assets/stylesheets/common/admin/admin_base.scss @@ -363,12 +363,15 @@ $mobile-breakpoint: 700px; .groups, .badges, .web-hook-container { .form-horizontal { - label { - font-weight: bold; + & > div { + margin-bottom: 20px; } - & > div { - margin-top: 10px; + .d-editor-textarea-wrapper { + max-width: 60%; + .d-editor-button-bar { + overflow: hidden; + } } input, textarea, select, .select-box { diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss index efdbd08a6b1..d39b9ababe8 100644 --- a/app/assets/stylesheets/common/admin/customize.scss +++ b/app/assets/stylesheets/common/admin/customize.scss @@ -4,6 +4,10 @@ margin-bottom: 10px; input { margin-bottom: 0; + font-size: 1rem; + } + .btn-small { + font-size: 1rem; } }