Browse Source

improved footer display

Bachir Soussi Chiadmi 3 years ago
parent
commit
84ae91655e

+ 1 - 1
config/sync/block.block.cart.yml

@@ -1,6 +1,6 @@
 uuid: 90f98c52-9624-4758-9c38-3904d5ef5faa
 langcode: en
-status: true
+status: false
 dependencies:
   module:
     - commerce_cart

+ 1 - 2
config/sync/block.block.materiosimplenewssubscription.yml

@@ -20,8 +20,7 @@ settings:
   label_display: '0'
   newsletters:
     materio_newsletter: materio_newsletter
-    ze_daily_materio_: ze_daily_materio_
-  message: 'Stay informed - subscribe to our newsletter.'
+  message: 'Subscribe to our monthly newsletter.'
   unique_id: d0c7bdf4-c218-4ded-840a-9c4c731ec469
 visibility:
   view_inclusion:

+ 4 - 4
web/modules/custom/materio_simplenews/src/Form/MaterioSubscriptionsBlockForm.php

@@ -47,10 +47,10 @@ class MaterioSubscriptionsBlockForm extends SubscriptionsFormBase {
 
     $form = parent::form($form, $form_state);
 
-    // $form['message'] = array(
-    //   '#type' => 'item',
-    //   '#markup' => $this->message,
-    // );
+    $form['message'] = array(
+      '#type' => 'item',
+      '#markup' => $this->message,
+    );
 
     unset($form['subscriptions']['widget']['#title']);
     unset($form['subscriptions']['widget']['#description']);

+ 5 - 0
web/themes/custom/materiotheme/assets/dist/main.css

@@ -2029,6 +2029,9 @@ article.card {
       #showrooms article.showroom figure img {
         max-width: 100%; }
 
+body:not(.path-home) footer[role="contentinfo"] {
+  display: none; }
+
 footer[role="contentinfo"] #block-materiosimplenewssubscription form {
   display: flex;
   flex-flow: row nowrap;
@@ -2044,6 +2047,8 @@ footer[role="contentinfo"] #block-materiosimplenewssubscription form {
       display: flex;
       flex-flow: row nowrap;
       align-items: center; }
+    footer[role="contentinfo"] #block-materiosimplenewssubscription form #edit-subscriptions input {
+      margin-right: 0.3em; }
   footer[role="contentinfo"] #block-materiosimplenewssubscription form #edit-mail-wrapper input[type="email"] {
     width: 10em; }
   footer[role="contentinfo"] #block-materiosimplenewssubscription form #edit-actions--2 input[type="submit"] {

File diff suppressed because it is too large
+ 27 - 0
web/themes/custom/materiotheme/assets/dist/main.js


+ 6 - 0
web/themes/custom/materiotheme/assets/styles/main.scss

@@ -1324,6 +1324,9 @@ article.card{
 // | _/ _ \/ _ \  _/ -_) '_|
 // |_|\___/\___/\__\___|_|
 footer[role="contentinfo"]{
+  body:not(.path-home) & {
+    display:none;
+  }
   #block-materiosimplenewssubscription{
     form{
       display: flex;
@@ -1342,6 +1345,9 @@ footer[role="contentinfo"]{
           flex-flow: row nowrap;
           align-items: center;
         }
+        input{
+          margin-right: 0.3em;
+        }
       }
       #edit-mail-wrapper{
         input[type="email"]{

Some files were not shown because too many files changed in this diff