From eb085aa0003c219c191d23f75082c035984de4a5 Mon Sep 17 00:00:00 2001
From: Olivier Mayer <blind1009@gmail.com>
Date: Tue, 21 Apr 2015 20:11:50 +0900
Subject: [PATCH] Facettes + issue overflow basket

---
 templates/web/prod/index.html.twig  |   2 +-
 www/skins/icons/bgd_facetFilter.png | Bin 0 -> 1081 bytes
 www/skins/prod/000000/prodcolor.css |  66 +++++++++++++++++++++-------
 3 files changed, 50 insertions(+), 18 deletions(-)
 create mode 100644 www/skins/icons/bgd_facetFilter.png

diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig
index 73742ee0f6..209288f67a 100644
--- a/templates/web/prod/index.html.twig
+++ b/templates/web/prod/index.html.twig
@@ -211,7 +211,7 @@
                         {{WorkZoneMacros.make_bloc(app, WorkZone)}}
                     </div>
                     {% if GV_thesaurus %}
-                    <div id="proposals" class="PNB" style="top:85px;"
+                    <div id="proposals" class="PNB"
                         ondblclick="return(thesau_dblclickThesaurus(event));" onclick="return(thesau_clickThesaurus(event));">
                         <button id="facets-back-btn" style="display:none;">back</button>
                     </div>
diff --git a/www/skins/icons/bgd_facetFilter.png b/www/skins/icons/bgd_facetFilter.png
new file mode 100644
index 0000000000000000000000000000000000000000..e17a856441242c9a7f38f2cd3a87b12770a7b524
GIT binary patch
literal 1081
zcmaJ=Pe>F|7@ttY7Bwpq^WtMHQ)*{+cGt}rU2UCN-9=~H)`j-y?99_0bpAN=bVm<q
zf%H$JC?dKDQV|K^Nr(;|szcq34iZ8g!Y)M=K^+2nqpo&n8{WJ>AK&ly{l52o?{YHH
zTj{Cy5Cl;fj|nNfR=Iz98J-(r-W9wYM$rr!FosZGvLF#rj4T9kO&W$NC@GU;uV4p3
zlpImh8I%$GIoZ%C$@QTe&BSPe=;(4xNgja+WZ|%?hsm!`pOHXS!sOXj(I=Wb%&D;{
z3l2;r((=@Z%qnD8C+KiEOrSv|0Y@9vZO#dko4g#}yJngMn=WW1Om2zFh)KX376h$S
zz$^P0282Qs6KoBIm=nP7WBjxakC2xMa;+iGe-dneB#ve&LtIMe*^Y%zVKRr1$<cH^
zpQrKx%CLrMhGkio!|(TE53fC`BgygVc4L7-fVOO@CQ=O@xQtTP7)N0eE8R*#Gk0ip
zd;6O3h0%^=(hTKuQz|%$;{RPWZO7Y2DY&cmpTu^0(u8yh+Qzsg<H8L!x}i*tx1fX!
zD{UB~g<DMK3}o0j!vy?52sDe5tm>|zWfLKaTwJ%2q{}cagh|Xnsj9-UY<G7sAaqB4
zfe^z)gAq0uz@w)v%JM#*jTEqgA&+ZNM+L01i{*=A-Dc2C99e*tIsug)%h14P(wtgc
z3tN<L8><x85-EzMu^8Gd?O&xXm~j8N+nvV6hn?1kI_`H1H}=@)MhZWQ#kdejJMXf;
zH#WLT>X%Bh`@rql?+qp2szB$p1<$?xSMJX^U#8avz3IwKxc_Ez_4|#}b!!(N&5o@7
zn0J=;K3J&{7aA^UH-0TA8D-G(W_7M9S2{lHtqGiZc|CGGX13h@&<mD%Pq6)Ao&V1B
z(u&pT3WcZz=VqGL%U^t&S*?BDReGrX>b>=&(ewNSO5P%332UzHz>{OueFW3|c0Swp
ak=Rp4jLHYkEOOjW_c6z#3E^?~;DtX)!C86$

literal 0
HcmV?d00001

diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css
index 2ddb17ebb9..ad8375723f 100644
--- a/www/skins/prod/000000/prodcolor.css
+++ b/www/skins/prod/000000/prodcolor.css
@@ -1196,7 +1196,7 @@ div.diapo {
     left: 0pt;
     right: 1px;
     bottom: 0px;
-    overflow-y: hidden;
+    overflow-y: auto;
     overflow-x: hidden;
 }
 
@@ -2149,6 +2149,20 @@ H4 {
 
 /******* PROPOSALS ************************************************************/
 
+#proposals {
+    border-top: 1px solid #303030;
+    top: 87px !important;
+}
+
+#proposals ul li {
+    line-height: 17px;
+    font-size: 13px;
+}
+
+#proposals ul ul {
+    background-color: #292929;
+}
+
 #proposals *:focus{
     outline: none;
 }
@@ -2157,21 +2171,36 @@ H4 {
     background-color:  #3b3b3b;
     border: 0px none transparent;
     overflow-x: hidden;
+    padding-left: 0;
+    padding-top: 0;
 }
 
 #proposals UL.fancytree-container UL {
-    padding: 0;
-    padding-left: 6px;
-    margin-right: 30px;
+    padding: 20px 0;
     overflow: hidden;
+    width: 101%;
+}
+
+#proposals UL.fancytree-container UL li {
+    padding-left: 30px;
+    line-height: 25px;
+}
+
+#proposals UL.fancytree-container UL li:hover {
+    background-color: #4c5d84;
 }
 
 #proposals .fancytree-folder {
     font-weight: bold;
     height: 30px;
-    padding-top: 7px;
-    border-left: 4px solid #4c5d84;
+    padding-top: 13px;    
     margin-left: 0;
+    border-left: 4px solid #3b3b3b;
+    border-bottom: 1px solid #303030;
+}
+
+#proposals .fancytree-folder:hover {
+    border-left: 4px solid #4c5d84;
 }
 
 #proposals .fancytree-expander {
@@ -2211,18 +2240,20 @@ H4 {
     font-weight: normal;
     position:absolute;
     width:100px;
-    height:22px;
+    height:25px;
+    line-height: 25px;
+    vertical-align: middle;
     border-radius: 4px;
-    right:30px;
-    background-color: #606060;
-    padding-top: 3px;
-    padding-left: 4px;
-    padding-right: 4px;
+    right:28px;
+    background-color: #4c5d84;
+    padding-left: 13px;
+    padding-right: 13px;
+    margin-top: -4px;
 }
 
 #proposals .facetFilter-label {
     position:absolute;
-    left:4px;
+    left:13px;
     right: 14px;
     overflow:hidden;
     cursor: default;
@@ -2232,17 +2263,18 @@ H4 {
     position:absolute;
     width:20px;
     right: 0px;
-    background-image: linear-gradient(to right, transparent, #606060);
 }
 
 #proposals .facetFilter-closer {
     position:absolute;
-    right:5px;
+    right:13px;
     cursor: pointer;
 }
 
-#proposals .facetFilter-closer:before {
-    content: 'x';
+#proposals .facetFilter-closer {
+    background: url('../../icons/bgd_facetFilter.png') 0 5px no-repeat;
+    height: 25px;
+    width: 14px;
 }
 
 /******* /PROPOSALS ************************************************************/