From e192462c4ac50b05d190ff9fb0083f2e77bd0a9d Mon Sep 17 00:00:00 2001 From: guerler Date: Tue, 19 Mar 2019 14:29:48 -0400 Subject: [PATCH 1/2] Increase spacing between tool execution button and help text --- .../galaxy/scripts/mvc/tool/tool-form-base.js | 3 +-- client/galaxy/style/scss/base.scss | 18 +++++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/client/galaxy/scripts/mvc/tool/tool-form-base.js b/client/galaxy/scripts/mvc/tool/tool-form-base.js index 08d79e4f368..646115ff9b6 100644 --- a/client/galaxy/scripts/mvc/tool/tool-form-base.js +++ b/client/galaxy/scripts/mvc/tool/tool-form-base.js @@ -267,8 +267,7 @@ export default FormBase.extend({ /** Templates */ _templateHelp: function(options) { var $tmpl = $("
") - .addClass("form-help") - .addClass("form-text") + .addClass("form-help form-text mt-4") .append(options.help); $tmpl.find("a").attr("target", "_blank"); $tmpl.find("img").each(function() { diff --git a/client/galaxy/style/scss/base.scss b/client/galaxy/style/scss/base.scss index ca467b2c230..738aa4fc9bd 100644 --- a/client/galaxy/style/scss/base.scss +++ b/client/galaxy/style/scss/base.scss @@ -840,9 +840,9 @@ button { .warningmessagelarge, .donemessagelarge, .infomessagelarge, -.ui-form-help .error, -.ui-form-help .warning, -.ui-form-help .note { +.form-help .error, +.form-help .warning, +.form-help .note { @extend .alert; min-height: 36px; padding-left: 52px; @@ -891,9 +891,9 @@ button { .warningmessagesmall, .donemessagesmall, .infomessagesmall, -.ui-form-help .error, -.ui-form-help .warning, -.ui-form-help .note { +.form-help .error, +.form-help .warning, +.form-help .note { @extend .alert; padding: 5px; padding-left: 25px; @@ -907,13 +907,13 @@ button { .errormessage, .errormessagesmall, -.ui-form-help .error { +.form-help .error { @extend .alert-danger; } .warningmessage, .warningmessagesmall, -.ui-form-help .warning { +.form-help .warning { @extend .alert-warning; background-image: url(../../images/warn_small.png); } @@ -926,7 +926,7 @@ button { .infomessage, .infomessagesmall, -.ui-form-help .note { +.form-help .note { @extend .alert-info; background-image: url(../../images/info_small.png); } From dc48dffb29dc8fbd50a147d592c4d1afe4322cba Mon Sep 17 00:00:00 2001 From: guerler Date: Tue, 19 Mar 2019 18:09:22 -0400 Subject: [PATCH 2/2] Fix spacing for info text in data selectors --- client/galaxy/scripts/mvc/form/form-input.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/galaxy/scripts/mvc/form/form-input.js b/client/galaxy/scripts/mvc/form/form-input.js index aa92a5b84a5..245d19287ed 100644 --- a/client/galaxy/scripts/mvc/form/form-input.js +++ b/client/galaxy/scripts/mvc/form/form-input.js @@ -201,7 +201,7 @@ export default Backbone.View.extend({ .append( $("
") .addClass("ui-form-field") - .append($("").addClass("ui-form-info form-text text-muted")) + .append($("").addClass("ui-form-info form-text text-muted mt-2")) .append($("
").addClass("ui-form-backdrop")) ) .append($("
").addClass("ui-form-preview"));