Mattias Bodlund 7 months ago
parent
commit
be1120c43c
5 changed files with 15 additions and 10 deletions
  1. +5
    -5
      app/assets/stylesheets/application.css
  2. +2
    -3
      app/views/languages/_intro.html.erb
  3. +4
    -1
      app/views/languages/index.html.erb
  4. +3
    -0
      app/views/site/tmpl_article.html.erb
  5. +1
    -1
      config/locales/en.yml

+ 5
- 5
app/assets/stylesheets/application.css View File

@ -197,8 +197,7 @@ footer {
font-size: var(--fs-base); font-size: var(--fs-base);
font-family: var(--ff-ikea); font-family: var(--ff-ikea);
font-weight: 700; font-weight: 700;
line-height: 1.4;
height: 60px;
line-height: 1.2;
border-radius: 400px; border-radius: 400px;
width: 100%; width: 100%;
cursor: pointer; cursor: pointer;
@ -206,7 +205,7 @@ footer {
display: inline-block; display: inline-block;
text-align: center; text-align: center;
box-sizing: border-box; box-sizing: border-box;
padding: 0.888888888888889em 1.333333333333333em;
padding: 0.62em 1em;
} }
.button__base-light { .button__base-light {
@ -252,8 +251,9 @@ main {
line-height: 1.4; line-height: 1.4;
} }
.intro-content-container button {
margin: 4px 0 0 0
.intro-content-container > :last-child {
margin-top: 4px;
} }


+ 2
- 3
app/views/languages/_intro.html.erb View File

@ -2,6 +2,5 @@
<%= tag.div attachment.body.html_safe, class: i == 0 ? "intro-content-header" : "intro-content-body" %> <%= tag.div attachment.body.html_safe, class: i == 0 ? "intro-content-header" : "intro-content-body" %>
<% end %> <% end %>
<button type="button" class="button__base">
<%= t('get_started') %>
</button>
<%= link_to t('get_started'), Node.roots.first.children.first.url, class: 'button__base' %>

+ 4
- 1
app/views/languages/index.html.erb View File

@ -1,7 +1,9 @@
<%- content_for :title, t('project_name') %> <%- content_for :title, t('project_name') %>
<%= turbo_frame_tag 'main' do %>
<div class="intro-container"> <div class="intro-container">
<div data-controller="locale" data-locale-url-value="<%= url_for(controller: 'languages', action: 'update') %>"> <div data-controller="locale" data-locale-url-value="<%= url_for(controller: 'languages', action: 'update') %>">
<div class="language__selector-select"> <div class="language__selector-select">
@ -27,4 +29,5 @@
<%= render partial: 'intro' %> <%= render partial: 'intro' %>
</div> </div>
</div>
</div>
<% end %>

+ 3
- 0
app/views/site/tmpl_article.html.erb View File

@ -8,3 +8,6 @@
content_for :meta_description, @node.page_description.blank? ? article_parts[:description] : @node.page_description content_for :meta_description, @node.page_description.blank? ? article_parts[:description] : @node.page_description
%> %>
<%= turbo_frame_tag 'main' do %>
Hej
<% end %>

+ 1
- 1
config/locales/en.yml View File

@ -7,7 +7,7 @@ en:
hello: Hello! hello: Hello!
please_select_a_language_to_get_started: Please select a language to get started. please_select_a_language_to_get_started: Please select a language to get started.
confirm: Confirm confirm: Confirm
get_started: Get started
get_started: Let’s go!
learn_more: Learn more learn_more: Learn more
spot_another_link: Spot another link spot_another_link: Spot another link
challange_a_friend: Challenge a friend challange_a_friend: Challenge a friend


Loading…
Cancel
Save