From a2bc1c00fa70e1863b37a9a7a7bb4b57c839a819 Mon Sep 17 00:00:00 2001
From: Michael RICOIS <ricois@antadis.com>
Date: Thu, 23 Nov 2017 15:17:37 +0100
Subject: [PATCH] Conflit

---
 themes/site/css/style.css | 91 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)

diff --git a/themes/site/css/style.css b/themes/site/css/style.css
index db86c400..fb5dc986 100755
--- a/themes/site/css/style.css
+++ b/themes/site/css/style.css
@@ -7624,6 +7624,97 @@ div.addresses ul.address.item {
   width: 100%; 
 }
 
+
+.block-guide {
+  margin-bottom: 20px;
+  background: #f6f6f6;
+  background: #fff;
+  padding: 10px 20px;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  background: #fff;
+  -moz-box-shadow: 2px 2px 5px #cccccc;
+  -webkit-box-shadow: 2px 2px 5px #CCC;
+  -ms-box-shadow: 2px 2px 5px #cccccc;
+  -o-box-shadow: 2px 2px 5px #cccccc;
+  box-shadow: 2px 2px 5px #ccc;
+  color: #1e1633;
+}
+.block-guide ul {
+  margin: 0px;
+  list-style: none outside;
+  margin-left: 5px; 
+}
+.block-guide h5 {
+  margin-top: 10px;
+}
+.block-guide h5 a {
+  font-style: normal;
+  font-weight: bold;
+  font-size: 14px;
+  line-height: 1.5em;
+  color: #000;
+}
+.block-guide h5 a.selected {
+  color: #796dc7;
+}
+
+.block-guide ul li a {
+  color: #000;
+}
+.block-guide ul li.selected a {
+  color: #796dc7;	
+}
+.guide-intro {}
+.guide-intro-left {
+  width: 430px;
+  float: left;
+  color: #1e1633;
+  background: #fff;
+  font-size: 26px;
+  text-transform: none;
+  line-height: 1.5em;
+  font-weight: normal;
+  text-align: left;
+  margin: 0px 5px 20px 0px;
+  min-height: 180px;
+  padding: 10px 0px 0px 20px;
+  -moz-box-shadow: 2px 2px 5px #cccccc;
+  -webkit-box-shadow: 2px 2px 5px #cccccc;
+  -ms-box-shadow: 2px 2px 5px #cccccc;
+  -o-box-shadow: 2px 2px 5px #cccccc;
+  box-shadow: 2px 2px 5px #cccccc;
+}
+.guide-intro-right {}
+.guide-content {
+  clear: both;
+}
+.guide-content-menu {
+  width: 160px;
+  float: left;
+  background: #fff;
+  font-size: 26px;
+  text-transform: none;
+  line-height: 1.5em;
+  font-weight: normal;
+  text-align: left;
+  margin: 0px 5px 0px 0px;
+  padding: 10px 0px 10px 0px;
+  -moz-box-shadow: 2px 2px 5px #cccccc;
+  -webkit-box-shadow: 2px 2px 5px #cccccc;
+  -ms-box-shadow: 2px 2px 5px #cccccc;
+  -o-box-shadow: 2px 2px 5px #cccccc;
+  box-shadow: 2px 2px 5px #cccccc;
+}
+.guide-content-category {
+  width:50%;
+  float:left;
+  text-align:center;
+}
+.guide-content-category-title {
+  clear:both;  
+}
 .guide-content-category-title h4 {
   text-transform: uppercase;
   font-style: normal;