From 3372db3f0fef7c6be728c033fd394f3b43e1ef7a Mon Sep 17 00:00:00 2001 From: Thomas von Deyen Date: Mon, 2 Nov 2020 09:16:00 +0100 Subject: [PATCH 1/4] Add large select style --- app/assets/stylesheets/alchemy/_variables.scss | 2 ++ app/assets/stylesheets/alchemy/selects.scss | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/alchemy/_variables.scss b/app/assets/stylesheets/alchemy/_variables.scss index e4f7b26e1f..49d66d8f6c 100644 --- a/app/assets/stylesheets/alchemy/_variables.scss +++ b/app/assets/stylesheets/alchemy/_variables.scss @@ -159,6 +159,8 @@ $datepicker_day_color: $text-color !default; $select-hover-bg-color: $dark-blue !default; $select-hover-text-color: $white !default; +$medium-select-box-width: 90px; +$large-select-box-width: 120px; $thumbnail-background-color: opacify($default-border-color, 1) !default; $medium-screen-break-point: 700px; diff --git a/app/assets/stylesheets/alchemy/selects.scss b/app/assets/stylesheets/alchemy/selects.scss index 1af2d44cf8..a86cf99782 100644 --- a/app/assets/stylesheets/alchemy/selects.scss +++ b/app/assets/stylesheets/alchemy/selects.scss @@ -1,5 +1,3 @@ -$medium-select-box-width: 90px; - select { @include button-defaults( $background-color: $form-field-background-color, @@ -76,6 +74,10 @@ select { width: $medium-select-box-width; } + &.large { + width: $large-select-box-width; + } + &.select2-container-active { .select2-choice, .select2-choices { From 6c025037af737fa783b7c8ff0792a2ca93468e11 Mon Sep 17 00:00:00 2001 From: Thomas von Deyen Date: Mon, 2 Nov 2020 09:15:48 +0100 Subject: [PATCH 2/4] Allow multiple preview sources Currently only one page preview source is available. Allowing to add more preview sources the user can select from makes it possible to see the same page content in different contexts (Static Frontends, A/B-Testing, etc.) --- .../alchemy/alchemy.preview_window.js.coffee | 12 +++++- .../alchemy/admin/pages_controller.rb | 7 +++- app/views/alchemy/admin/pages/edit.html.erb | 10 ++++- config/locales/alchemy.en.yml | 2 + lib/alchemy.rb | 37 +++++++++++++++++++ lib/alchemy/admin/preview_url.rb | 2 + lib/alchemy/engine.rb | 4 -- spec/dummy/config/locales/alchemy.en.yml | 4 ++ .../admin/page_editing_feature_spec.rb | 22 +++++++++++ 9 files changed, 92 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/alchemy/alchemy.preview_window.js.coffee b/app/assets/javascripts/alchemy/alchemy.preview_window.js.coffee index 92405a5b14..b94fd7ccc5 100644 --- a/app/assets/javascripts/alchemy/alchemy.preview_window.js.coffee +++ b/app/assets/javascripts/alchemy/alchemy.preview_window.js.coffee @@ -5,7 +5,8 @@ Alchemy.PreviewWindow = HEIGHT: 75 # Top menu height init: (url) -> - $iframe = $("