A platform for community discussion. Free, open, simple.
Keep the category action bar clear of the Powered by badge (#43841)
Penar Musaraj3217d40c4ea3
diff --git a/app/assets/stylesheets/common/base/edit-category.scss b/app/assets/stylesheets/common/base/edit-category.scssindex d558768f353..882333e3c4c 100644--- a/app/assets/stylesheets/common/base/edit-category.scss+++ b/app/assets/stylesheets/common/base/edit-category.scss@@ -230,6 +230,24 @@ $number-input-width: var(--form-kit-small-input);max-width: var(--form-kit-max-input);flex-direction: row-reverse;align-items: center;+ bottom: var(--powered-by-height, 0);++ @include viewport.until(sm) {+ &__main-label {+ display: none;+ }+ }++ @include viewport.from(sm) {+ bottom: calc(var(--powered-by-height, 0px) + var(--space-5));++ .footer-nav-visible & {+ bottom: calc(+ var(--footer-nav-height) + env(safe-area-inset-bottom) ++ var(--powered-by-height, 0px) + var(--space-5)+ );+ }+ }.controls {flex-direction: row-reverse;@@ -238,10 +256,6 @@ $number-input-width: var(--form-kit-small-input);}}-#main-outlet:has(.edit-category) + .powered-by-discourse {- display: none; // hide for now due to alignment-}-.edit-category-description-container {.readonly-field {width: 100%;diff --git a/spec/system/new_category_spec.rb b/spec/system/new_category_spec.rbindex b06fc717987..7f69343b31b 100644--- a/spec/system/new_category_spec.rb+++ b/spec/system/new_category_spec.rb@@ -3,9 +3,25 @@describe "New Category" dofab!(:admin)let(:category_page) { PageObjects::Pages::Category.new }+ let(:category_type_card) { PageObjects::Components::CategoryTypeCard.new }+ let(:form) { PageObjects::Components::FormKit.new(".form-kit") }before { sign_in(admin) }+ it "keeps the action bar clear of the Powered by Discourse badge" do+ SiteSetting.enable_powered_by_discourse = true++ category_page.visit_new_category+ if page.current_path == "/new-category/setup"+ category_type_card.find_type_card("discussion").click+ end+ form.field("name").fill_in("New Category")++ expect(category_page).to have_changes_banner+ expect(category_page).to have_powered_by_discourse+ expect(category_page.changes_banner_is_clear_of_powered_by_discourse?).to eq(true)+ end+it "defaults minimum_required_tags to zero when creating a category" docategory_page.visit_new_categorydiff --git a/spec/system/page_objects/pages/category.rb b/spec/system/page_objects/pages/category.rbindex b7e1b48be6c..c635a2b56c0 100644--- a/spec/system/page_objects/pages/category.rb+++ b/spec/system/page_objects/pages/category.rb@@ -184,6 +184,21 @@ module PageObjectspage.has_no_css?(tab_css)end+ def has_changes_banner?+ page.has_css?(".admin-changes-banner")+ end++ def has_powered_by_discourse?+ page.has_css?(".powered-by-discourse")+ end++ def changes_banner_is_clear_of_powered_by_discourse?+ page.evaluate_script(<<~JS)+ document.querySelector(".admin-changes-banner").getBoundingClientRect().bottom <=+ document.querySelector(".powered-by-discourse").getBoundingClientRect().top+ JS+ end+def has_category_title?(title)page.has_css?(".category-header h1", text: title)end