From 44e15ddfaae97b5dc4bd245eda5ed137fe3375e4 Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Fri, 18 Jan 2019 11:34:52 +1100 Subject: [PATCH] various fixes --- .../{custom-wizard-start.js => wizard-custom-start.js} | 0 assets/stylesheets/wizard/wizard_custom.scss | 10 ++++++++-- config/locales/client.en.yml | 1 + plugin.rb | 2 +- views/layouts/wizard.html.erb | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) rename assets/javascripts/{custom-wizard-start.js => wizard-custom-start.js} (100%) diff --git a/assets/javascripts/custom-wizard-start.js b/assets/javascripts/wizard-custom-start.js similarity index 100% rename from assets/javascripts/custom-wizard-start.js rename to assets/javascripts/wizard-custom-start.js diff --git a/assets/stylesheets/wizard/wizard_custom.scss b/assets/stylesheets/wizard/wizard_custom.scss index dc50f6b5..ffdb53a0 100644 --- a/assets/stylesheets/wizard/wizard_custom.scss +++ b/assets/stylesheets/wizard/wizard_custom.scss @@ -112,6 +112,7 @@ flex: auto; display: flex; flex-direction: column; + max-height: 500px; width: 100%; } @@ -188,7 +189,8 @@ .control-group { display: inline-block; vertical-align: top; - margin-right: 20px; + margin-right: 10px; + margin-bottom: 20px; .controls { margin: 5px 0; @@ -207,6 +209,10 @@ ul { padding: 0; } + + .select-kit { + min-width: 200px; + } } .wizard-step-form .wizard-btn { @@ -527,4 +533,4 @@ img.avatar { visibility: hidden; } } -} \ No newline at end of file +} diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 6413d6c5..d5037a51 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -160,6 +160,7 @@ en: validation: neighbourhood: "Please enter a neighbourhood." city: "Please enter a city, town or village." + street: "Please enter a Number and Street." countrycode: "Please select a country." geo_location: "Search and select a result." diff --git a/plugin.rb b/plugin.rb index ee4b05d0..2b478876 100644 --- a/plugin.rb +++ b/plugin.rb @@ -17,7 +17,7 @@ if Rails.env.production? wizard-custom-lib.js wizard-custom.js wizard-plugin.js - wizard-start.js + wizard-custom-start.js stylesheets/wizard/wizard_custom.scss stylesheets/wizard/wizard_composer.scss stylesheets/wizard/wizard_variables.scss diff --git a/views/layouts/wizard.html.erb b/views/layouts/wizard.html.erb index 37d9e97e..5b1d1843 100644 --- a/views/layouts/wizard.html.erb +++ b/views/layouts/wizard.html.erb @@ -39,6 +39,6 @@ <%= raw theme_lookup("body_tag") %> <%- end %> - <%= preload_script 'custom-wizard-start' %> + <%= preload_script 'wizard-custom-start' %>