Refactor styles (#7)

Platoniq · Jun 15, 2021 · ed8001a · ed8001a
1 parent 441322a
commit ed8001a
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 39 deletions.
diff --git a/app/assets/config/decidim_admin_alternative_landing_manifest.css b/app/assets/config/decidim_admin_alternative_landing_manifest.css
diff --git a/app/assets/config/decidim_admin_alternative_landing_manifest.js b/app/assets/config/decidim_admin_alternative_landing_manifest.js
diff --git a/app/assets/javascripts/decidim/alternative_landing/admin.js b/app/assets/javascripts/decidim/alternative_landing/admin.js
diff --git a/app/assets/javascripts/decidim/alternative_landing/application.js b/app/assets/javascripts/decidim/alternative_landing/application.js
diff --git a/app/assets/stylesheets/decidim/alternative_landing/admin.scss b/app/assets/stylesheets/decidim/alternative_landing/admin.scss
diff --git a/app/assets/stylesheets/decidim/alternative_landing/alternative_landing.scss b/app/assets/stylesheets/decidim/alternative_landing/alternative_landing.scss
@@ -0,0 +1,2 @@
+//= require_tree ./content_blocks
+//= require_self
diff --git a/app/assets/stylesheets/decidim/alternative_landing/application.scss b/app/assets/stylesheets/decidim/alternative_landing/application.scss
diff --git a/app/assets/stylesheets/decidim/alternative_landing/content_blocks/_tiles.scss b/app/assets/stylesheets/decidim/alternative_landing/content_blocks/_tiles.scss
@@ -19,18 +19,17 @@
     min-height: 4em;
     padding: $gap;
 
-    .tile-title {
-      grid-column: span 3;
-      background: $alternative-color-2;
-      margin: 0;
-    }
-
     .tile-body {
       max-width: 20em;
       background: $alternative-color-1;
       padding: $gap;
     }
 
+    &-heading {
+      grid-column: span 3;
+      background: $alternative-color-2;
+      margin: 0;
+    }
     &-1 {
       grid-column: span 2;
       grid-row: 2;

diff --git a/app/cells/decidim/alternative_landing/content_blocks/base_cell.rb b/app/cells/decidim/alternative_landing/content_blocks/base_cell.rb
@@ -6,16 +6,6 @@ module ContentBlocks
       class BaseCell < Decidim::ViewModel
         include Decidim::SanitizeHelper
         include Decidim::TranslationsHelper
-
-        delegate :snippets, to: :controller
-
-        def show
-          unless snippets.any?(:alternative_landing)
-            snippets.add(:alternative_landing, stylesheet_link_tag("decidim/alternative_landing/application"))
-            snippets.add(:head, snippets.for(:alternative_landing))
-          end
-          super
-        end
       end
     end
   end

diff --git a/app/cells/decidim/alternative_landing/content_blocks/tiles/show.erb b/app/cells/decidim/alternative_landing/content_blocks/tiles/show.erb
@@ -1,6 +1,6 @@
 <section class="alternative-landing tiles-4">
   <div class="tiles">
-    <h1 class="tile tile-title heading1">
+    <h1 class="tile tile-heading heading1">
       <%= decidim_sanitize translated_title %>
     </h1>
     <% 1.upto(4) do |item_number| %>

diff --git a/spec/system/homepage_spec.rb b/spec/system/homepage_spec.rb
@@ -135,7 +135,7 @@
       it "renders all elements" do
         within ".alternative-landing.tiles-4" do
           within ".tiles" do
-            within ".tile-title" do
+            within ".tile-heading" do
               expect(page).to have_i18n_content(tiles_block.settings.title)
             end
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		//= require_tree ./content_blocks
		//= require_self