diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index f258144..1605931 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -209,6 +209,7 @@ main { border: 2px solid var(--clr-black); font-size: var(--fs-lg); font-weight: 700; + font-family: var(--ff-ikea); line-height: 1; color: var(--clr-black); padding: 0.888888888888889em 1.333333333333333em; @@ -460,12 +461,12 @@ ul.card__stack { .link__learn-more { font-weight: 700; - padding: 1em 0; - margin-bottom: 1em; + margin-bottom: 20px; border-top: 1px solid var(--clr-black); border-bottom: 1px solid var(--clr-black); & a { + padding: 1.25em 0; display: block; color: var(--clr-black); text-decoration: none; @@ -526,7 +527,7 @@ ul.card__stack { .link { display: grid; grid-template-columns: 1fr 1fr; - grid-template-rows: 2fr 1fr; + grid-template-rows: 1fr fit-content(84px); gap: 32px; margin-bottom: 40px; diff --git a/app/controllers/admin/admin_controller.rb b/app/controllers/admin/admin_controller.rb index 168047e..ec7e646 100644 --- a/app/controllers/admin/admin_controller.rb +++ b/app/controllers/admin/admin_controller.rb @@ -4,6 +4,7 @@ class Admin::AdminController < ApplicationController before_action :authenticate_user! before_action :only_admin! + before_action :set_locale_to_default helper_method :current_user helper_method :user_signed_in? diff --git a/app/controllers/admin/nodes_controller.rb b/app/controllers/admin/nodes_controller.rb index d50c2c9..72d9bf4 100644 --- a/app/controllers/admin/nodes_controller.rb +++ b/app/controllers/admin/nodes_controller.rb @@ -2,8 +2,6 @@ class Admin::NodesController < Admin::AdminController before_action :set_node, only: %i[ edit update destroy children sort toggle ] - before_action :set_locale_to_default, only: %i[ create ] - helper_method :current_node_id, :open_node_ids # GET /nodes diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index b04daba..dc3609c 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -19,8 +19,8 @@ class SiteController < ApplicationController redirect_to @node.children.viewable.ordered.first.url and return if @node.index? and @node.children.viewable.any? # Link or render - # @node.href.present? ? redirect_to(@node.href) : - # render(template: "site/#{@node.template}") + redirect_to(@node.href) and return if @node.href.present? + render(template: "site/#{@node.template}") end diff --git a/app/views/site/tmpl_article.html.erb b/app/views/site/tmpl_article.html.erb index e191f6a..3dba3d6 100644 --- a/app/views/site/tmpl_article.html.erb +++ b/app/views/site/tmpl_article.html.erb @@ -26,7 +26,6 @@ <%= tag.div class: "link__learn-more" do %> <%= link_to t('learn_more'), @node.href %> - <% end %> <% end %>