From 8f76a54c6ae7c06abc9cbed600e590a71bcc51d7 Mon Sep 17 00:00:00 2001 From: John Cowen Date: Thu, 24 May 2018 13:08:08 +0100 Subject: [PATCH] Change KV inputs to textareas, also JSON > CODE As the input field was used for KV's it looked like you couldn't save multiline KV's. Changed to textarea so you can see the multilines. Also, JSON is slightly misleading as clicking the toggle doesn't necessarily mean 'I'm going to edit some JSON' it means I want the code editor with syntax highlighting, so renamed the toggle to say 'Code' --- ui-v2/app/styles/components/form-elements.scss | 10 +++++++--- ui-v2/app/styles/core/typography.scss | 1 + ui-v2/app/templates/dc/kv/-form.hbs | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ui-v2/app/styles/components/form-elements.scss b/ui-v2/app/styles/components/form-elements.scss index 683678c079..fa2eae5e06 100644 --- a/ui-v2/app/styles/components/form-elements.scss +++ b/ui-v2/app/styles/components/form-elements.scss @@ -14,8 +14,10 @@ display: block; max-width: 100%; min-width: 100%; - padding: 0.625em; + min-height: 70px; + padding: 0.625em 15px; resize: vertical; + line-height: 1.5; } %form-element [type='text'], %form-element [type='password'] { @@ -37,14 +39,16 @@ box-shadow: none; border-radius: $radius-small; } -.has-error > input { +.has-error > input, +.has-error > textarea { border: 1px solid; } %form-element > span { color: $text-gray; } %form-element [type='text'], -%form-element [type='password'] { +%form-element [type='password'], +%form-element textarea { color: $user-text-gray; } %form-element [type='text'], diff --git a/ui-v2/app/styles/core/typography.scss b/ui-v2/app/styles/core/typography.scss index 43ccd83c3d..9527d094f8 100644 --- a/ui-v2/app/styles/core/typography.scss +++ b/ui-v2/app/styles/core/typography.scss @@ -63,6 +63,7 @@ h2, body, pre code, input, +textarea, td { font-size: $size-6; } diff --git a/ui-v2/app/templates/dc/kv/-form.hbs b/ui-v2/app/templates/dc/kv/-form.hbs index a001faeaed..16d7f41bc3 100644 --- a/ui-v2/app/templates/dc/kv/-form.hbs +++ b/ui-v2/app/templates/dc/kv/-form.hbs @@ -11,14 +11,14 @@