From d0edf2c394ccf5f86b7a6aa8c611ba232a315aa4 Mon Sep 17 00:00:00 2001
From: Nicolas Bally <nico@Heribook.local>
Date: Mon, 10 Aug 2020 12:42:01 +0200
Subject: [PATCH] suite

---
 app/views/layouts/admin.html.haml             | 83 ++++++++++---------
 app/views/layouts/public.html.haml            | 47 ++++++++---
 .../render_public/_linkcontent.html.haml      |  2 +-
 3 files changed, 78 insertions(+), 54 deletions(-)

diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index c86707c..55bf99e 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -20,7 +20,7 @@
 
 %body.admin{:id => "body_#{@admin_space}"}
   #right_bar
-    =link_to image_tag("/logo-mmsc.png"), "/", :id => "logo"
+    =#link_to image_tag("/logo-mmsc.png"), "/", :id => "logo"
     
     -if false
       .element
@@ -38,59 +38,60 @@
     
     
     
-    -if true
+    -if false
       -if current_admin.has_permission?("customer.view")
         .element
           =link_to admin_p_customers_path do
             .cat#big_cat_clients
               =ic :"address-book-o"
               Utilisateurs
-            
-      -if current_admin.has_permission?("odr_rep.view_for_my") or current_admin.has_permission?("odr_rep.view")
-        .element
-          =link_to admin_circuits_path do
-            .cat#big_cat_stocks
-              =ic :"motorcycle"
-              Bases
-      
-      
-    
       -if false
-        .element
-          =link_to admin_p_customer_sheets_path do
-            .cat#big_cat_ventes
-              =ic :"shopping-cart"
-              Commandes
+            
+        -if current_admin.has_permission?("odr_rep.view_for_my") or current_admin.has_permission?("odr_rep.view")
+          .element
+            =link_to admin_circuits_path do
+              .cat#big_cat_stocks
+                =ic :"motorcycle"
+                Bases
+      
+      
     
-        .element
-          =link_to admin_price_documents_path do
-            .cat#big_cat_documents
-              =ic :"file-text-o"
-              Documents
+        -if false
+          .element
+            =link_to admin_p_customer_sheets_path do
+              .cat#big_cat_ventes
+                =ic :"shopping-cart"
+                Commandes
+    
+          .element
+            =link_to admin_price_documents_path do
+              .cat#big_cat_documents
+                =ic :"file-text-o"
+                Documents
               
-      -if current_admin.has_permission?("virements.view")        
-        .element
-          =link_to admin_m_odr_virements_path do
-            .cat#big_cat_payments
-              =ic :"eur"
-              Primes
+        -if current_admin.has_permission?("virements.view")        
+          .element
+            =link_to admin_m_odr_virements_path do
+              .cat#big_cat_payments
+                =ic :"eur"
+                Primes
 
               
-      -if false
-        -if current_admin.has_permission?("file_tunels.view")
-          .element
-            =link_to admin_file_tunels_path do
-              .cat#big_cat_tournees
-                =ic :"lock"
-                Tunnels fichier sécurisés
+        -if false
+          -if current_admin.has_permission?("file_tunels.view")
+            .element
+              =link_to admin_file_tunels_path do
+                .cat#big_cat_tournees
+                  =ic :"lock"
+                  Tunnels fichier sécurisés
         
       
-      -if false
-        .element
-          =link_to admin_p_stats_path do
-            .cat#big_cat_statistiques
-              =ic :"bar-chart"
-              Stats
+        -if false
+          .element
+            =link_to admin_p_stats_path do
+              .cat#big_cat_statistiques
+                =ic :"bar-chart"
+                Stats
           
     .bottom
       .element
diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml
index f3a8c58..dd37e68 100644
--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@@ -117,17 +117,27 @@
       .clear
       
       :scss
+        body{
+          font-family: 'Lato', sans-serif;
+        }
       
+        .btn{
+          background:red;
+          color:white;
+          border-radius:0;
+          
+          &:hover{
+            background:darken(red, 10%);
+            color:white;
+          }
+        }
+        
         .contact_form{
           margin:auto;
           width:800px;
           margin:auto;
           
-          .btn{
-            background:red;
-            color:white;
-            border-radius:0;
-          }
+         
         }
         #menu_top{
           #header{
@@ -153,7 +163,7 @@
           margin:auto;
         }
         h1,h2,h3{
-          
+          font-weight:bold;
           text-transform:uppercase;
           strong{
             color:red;
@@ -165,12 +175,12 @@
         }
         
         h2{
-          font-weight:normal;
+          
           font-size:20px;
         }
         
         h3{
-          font-weight:normal;
+          
           font-size:16px;
         }
         
@@ -178,14 +188,27 @@
           max-width:100%;
         }
         #home{
+          text-align:center;
+          h2,h1{
+            background:rgba(255,255,255,0.7);
+            display:inline-block;
+            padding:7px 12px;
+            margin:0;
+            p{margin:0;padding:0;}
+          }
+          h1{
+            font-size:26px;
+          }
           h2{
-            max-width:600px;
-            display:block;
-            float:right;
+            font-size:22px;
+            font-weight:bold;
+            margin-top:10px;
           }
         }
         
-        
+        ul{
+          padding-left:20px;
+        }
         .quote{
   
           padding:10px 70px;
diff --git a/app/views/portlets/render_public/_linkcontent.html.haml b/app/views/portlets/render_public/_linkcontent.html.haml
index 352ada9..c3b1430 100644
--- a/app/views/portlets/render_public/_linkcontent.html.haml
+++ b/app/views/portlets/render_public/_linkcontent.html.haml
@@ -6,7 +6,7 @@
   -url = input.cible.cible_url(@lang)
 -else 
   -url = ""
-=link_to input.name.to_s, url.to_s, :class => "external_link btn "+("orange" if input.style == "CTA orange").to_s, :style => "display: inline-block;color: #ffffff;font-size: 14px;font-weight: medium;background-color: #027878;box-shadow: 7px 7px 5px rgba(0,0,0,0.4);border: 0;padding: 8px 12px;margin: 0 5px;cursor: pointer; "+("background: #e1852a;" if input.style == "CTA orange").to_s, :target => ("_blank" if input.popup).to_s
+=link_to input.name.to_s, url.to_s, :class => "external_link btn btn-primay "+("orange" if input.style == "CTA orange").to_s, :target => ("_blank" if input.popup).to_s