ouidade 1 week ago
parent
commit
f74ef1208d

+ 27 - 6
web/themes/custom/eql/dist/assets/css/bundle.css

@@ -2453,6 +2453,9 @@ svg.ext {
   color: rgb(0, 158, 227);
   font-weight: 800;
 }
+.page-node-type-ressource .layout__region--third .block-region-third .block-entity-fieldnodefield-liens {
+  order: 3;
+}
 .page-node-type-ressource .layout__region--third .block-region-third .block-entity-fieldnodefield-liens .field--name-field-liens .field__item {
   margin: auto;
   height: fit-content;
@@ -2472,15 +2475,17 @@ svg.ext {
   font-weight: 800;
 }
 .page-node-type-ressource .layout__region--third .block-region-third .block-entity-fieldnodefield-liens .field--name-field-liens a::before {
-  content: url("../images/pictos/noun_External Link_674151.svg");
+  content: url("../images/pictos/external_link.png");
   min-width: 30px;
   height: auto;
   padding-right: 1rem;
+  margin-right: 1rem;
 }
 .page-node-type-ressource .layout__region--third .block-region-third .block-entity-fieldnodefield-liens .field--name-field-liens a svg.ext {
   display: none;
 }
 .page-node-type-ressource .layout__region--third .block-region-third .block-entity-fieldnodefield-ress {
+  order: 4;
   margin-top: 3rem;
 }
 .page-node-type-ressource .layout__region--third .block-region-third .block-entity-fieldnodefield-ress .field--name-field-ress .field__label {
@@ -2590,6 +2595,7 @@ svg.ext {
   display: none;
 }
 .page-node-type-ressource .layout__region--third .block-region-third .block-entity-fieldnodefield-projets-liee {
+  order: 1;
   margin-top: 3rem;
 }
 @media (max-width: 479px) {
@@ -2598,6 +2604,7 @@ svg.ext {
   }
 }
 .page-node-type-ressource .layout__region--third .block-region-third .block-entity-fieldnodefield-projets-liee h2 {
+  display: none;
   font-size: 0.8rem;
   color: rgb(0, 0, 0);
   font-weight: 900;
@@ -2605,20 +2612,34 @@ svg.ext {
 .page-node-type-ressource .layout__region--third .block-region-third .block-entity-fieldnodefield-projets-liee .field--name-field-projets-liee {
   display: flex;
   flex-direction: column;
-  border: 2px solid rgb(0, 158, 227);
+  border-bottom: 1px solid rgb(0, 0, 0);
   padding: 1rem;
   height: fit-content;
-  margin-bottom: 1rem;
+  margin-bottom: 3rem;
   background-color: rgb(255, 255, 255);
 }
 .page-node-type-ressource .layout__region--third .block-region-third .block-entity-fieldnodefield-projets-liee .field--name-field-projets-liee .field__label {
   display: none;
 }
+.page-node-type-ressource .layout__region--third .block-region-third .block-entity-fieldnodefield-projets-liee .field--name-field-projets-liee .field__items :before {
+  content: url("../images/pictos/picto_lieu_blue.svg");
+  display: inline-block;
+  color: rgb(9, 57, 139);
+  margin-right: 1rem;
+}
+.page-node-type-ressource .layout__region--third .block-region-third .block-entity-fieldnodefield-projets-liee .field--name-field-projets-liee .field__item {
+  display: flex;
+  flex-direction: row;
+}
+.page-node-type-ressource .layout__region--third .block-region-third .block-entity-fieldnodefield-projets-liee .field--name-field-projets-liee .field__item :before {
+  content: "Voir le projet";
+  display: block;
+  color: rgb(9, 57, 139);
+}
 .page-node-type-ressource .layout__region--third .block-region-third .block-entity-fieldnodefield-projets-liee .field--name-field-projets-liee .field__item a {
-  color: rgb(0, 0, 0);
+  color: rgb(9, 57, 139);
   font-size: 1rem;
   font-weight: 900;
-  font-style: italic;
 }
 
 .offresdeservices .layout-content .region-content #block-contenudelapageprincipale span {
@@ -5533,7 +5554,7 @@ svg.ext {
   flex-direction: row;
   align-items: center;
 }
-.path-ressources .layout-content .region-content #block-contenudelapageprincipale .layout--onecol .layout__region--content .block-region-content .block-views-blockbase-de-donnees-block-1 .view-base-de-donnees .view-content .view-type-ressource-slide:not(footer) h3.type-publication-issue-du-programme-eqld a:before {
+.path-ressources .layout-content .region-content #block-contenudelapageprincipale .layout--onecol .layout__region--content .block-region-content .block-views-blockbase-de-donnees-block-1 .view-base-de-donnees .view-content .view-type-ressource-slide:not(footer) h3.type-productions-du-programme-engages-pour-la-qualite-du-logement-de-demain a:before {
   content: url("../images/pictos/picto-ressource-eqld.svg");
   padding-right: 1rem;
 }

BIN
web/themes/custom/eql/dist/assets/images/pictos/external_link.png


+ 70 - 0
web/themes/custom/eql/dist/assets/images/pictos/external_link.svg

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 7500 9375"
+   xml:space="preserve"
+   id="svg20"
+   sodipodi:docname="noun_External Link_674151.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
+   width="7500"
+   height="9375"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata26"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+     id="defs24" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1015"
+     id="namedview22"
+     showgrid="false"
+     inkscape:zoom="6.92"
+     inkscape:cx="50"
+     inkscape:cy="159.82431"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg20"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"><inkscape:page
+       x="0"
+       y="0"
+       width="7500"
+       height="9375"
+       id="page2"
+       margin="0"
+       bleed="0" /></sodipodi:namedview><g
+     id="g14"
+     inkscape:export-filename="external_.png"
+     inkscape:export-xdpi="300"
+     inkscape:export-ydpi="300"
+     transform="translate(-1260,-1575)"><g
+       id="g4"><rect
+         x="31.4"
+         y="35.099998"
+         transform="matrix(0.7071,-0.7071,0.7071,0.7071,-7.65,55.5169)"
+         width="63.599998"
+         height="3.7"
+         id="rect2" /></g><g
+       id="g8"><polygon
+         points="59.4,12.6 87.6,12.6 87.6,40.7 83.8,40.7 83.8,16.4 59.4,16.4 "
+         id="polygon6" /></g><g
+       id="g12"><polygon
+         points="46.3,23.9 16.3,23.9 16.3,83.9 76.3,83.9 76.3,53.9 80.1,53.9 80.1,87.6 12.6,87.6 12.6,20.1 46.3,20.1 "
+         id="polygon10" /></g></g></svg>

+ 38 - 0
web/themes/custom/eql/dist/assets/images/pictos/noun_External Link.svg

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 50 50"
+   xml:space="preserve"
+   id="svg20"
+   width="50 "
+   height="50"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata26"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+     id="defs24" /><g
+     id="g14"
+     transform="translate(-1210,-1556.8138)"><g
+       id="g4"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"><rect
+         x="31.4"
+         y="35.099998"
+         transform="matrix(0.7071,-0.7071,0.7071,0.7071,-7.65,55.5169)"
+         width="63.599998"
+         height="3.7"
+         id="rect2"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" /></g><g
+       id="g8"><polygon
+         points="59.4,12.6 87.6,12.6 87.6,40.7 83.8,40.7 83.8,16.4 59.4,16.4 "
+         id="polygon6" /></g><g
+       id="g12"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"><polygon
+         points="46.3,23.9 16.3,23.9 16.3,83.9 76.3,83.9 76.3,53.9 80.1,53.9 80.1,87.6 12.6,87.6 12.6,20.1 46.3,20.1 "
+         id="polygon10"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" /></g></g></svg>

+ 18 - 38
web/themes/custom/eql/dist/assets/images/pictos/noun_External Link_674151.svg

@@ -1,55 +1,35 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    x="0px"
    y="0px"
-   viewBox="0 0 100 125"
-   style="enable-background:new 0 0 100 100;"
+   viewBox="0 0 50 50"
    xml:space="preserve"
    id="svg20"
-   sodipodi:docname="noun_External Link_674151.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"><metadata
+   width="50"
+   height="50"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
      id="metadata26"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs24" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1015"
-     id="namedview22"
-     showgrid="false"
-     inkscape:zoom="6.92"
-     inkscape:cx="50"
-     inkscape:cy="159.82431"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg20" /><g
-     id="g14"><g
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+     id="defs24" /><g
+     id="g14"
+     transform="translate(-1260,-1575)"><g
        id="g4"><rect
          x="31.4"
-         y="35.1"
-         transform="matrix(0.7071 -0.7071 0.7071 0.7071 -7.65 55.5169)"
-         width="63.6"
+         y="35.099998"
+         transform="matrix(0.7071,-0.7071,0.7071,0.7071,-7.65,55.5169)"
+         
+         width="63.599998"
          height="3.7"
          id="rect2" /></g><g
        id="g8"><polygon
-         points="87.6,40.7 83.8,40.7 83.8,16.4 59.4,16.4 59.4,12.6 87.6,12.6   "
+         points="59.4,12.6 87.6,12.6 87.6,40.7 83.8,40.7 83.8,16.4 59.4,16.4 "
          id="polygon6" /></g><g
        id="g12"><polygon
-         points="80.1,87.6 12.6,87.6 12.6,20.1 46.3,20.1 46.3,23.9 16.3,23.9 16.3,83.9 76.3,83.9 76.3,53.9 80.1,53.9   "
+         points="46.3,23.9 16.3,23.9 16.3,83.9 76.3,83.9 76.3,53.9 80.1,53.9 80.1,87.6 12.6,87.6 12.6,20.1 46.3,20.1 "
          id="polygon10" /></g></g></svg>

File diff suppressed because it is too large
+ 63 - 0
web/themes/custom/eql/dist/assets/images/pictos/picto_lieu_blue.svg


+ 17 - 38
web/themes/custom/eql/images/pictos/noun_External Link_674151.svg

@@ -1,55 +1,34 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    x="0px"
    y="0px"
-   viewBox="0 0 100 125"
-   style="enable-background:new 0 0 100 100;"
+   viewBox="0 0 7500 9375"
    xml:space="preserve"
    id="svg20"
-   sodipodi:docname="noun_External Link_674151.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"><metadata
+   width="7500"
+   height="9375"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
      id="metadata26"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs24" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1015"
-     id="namedview22"
-     showgrid="false"
-     inkscape:zoom="6.92"
-     inkscape:cx="50"
-     inkscape:cy="159.82431"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg20" /><g
-     id="g14"><g
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+     id="defs24" /><g
+     id="g14"
+     transform="translate(-1260,-1575)"><g
        id="g4"><rect
          x="31.4"
-         y="35.1"
-         transform="matrix(0.7071 -0.7071 0.7071 0.7071 -7.65 55.5169)"
-         width="63.6"
+         y="35.099998"
+         transform="matrix(0.7071,-0.7071,0.7071,0.7071,-7.65,55.5169)"
+         width="63.599998"
          height="3.7"
          id="rect2" /></g><g
        id="g8"><polygon
-         points="87.6,40.7 83.8,40.7 83.8,16.4 59.4,16.4 59.4,12.6 87.6,12.6   "
+         points="59.4,12.6 87.6,12.6 87.6,40.7 83.8,40.7 83.8,16.4 59.4,16.4 "
          id="polygon6" /></g><g
        id="g12"><polygon
-         points="80.1,87.6 12.6,87.6 12.6,20.1 46.3,20.1 46.3,23.9 16.3,23.9 16.3,83.9 76.3,83.9 76.3,53.9 80.1,53.9   "
+         points="46.3,23.9 16.3,23.9 16.3,83.9 76.3,83.9 76.3,53.9 80.1,53.9 80.1,87.6 12.6,87.6 12.6,20.1 46.3,20.1 "
          id="polygon10" /></g></g></svg>

File diff suppressed because it is too large
+ 63 - 0
web/themes/custom/eql/images/pictos/picto_lieu_blue.svg


+ 35 - 8
web/themes/custom/eql/scss/pages/_ressource.scss

@@ -253,7 +253,8 @@
                 width: 70%;    
                 @media (max-width: 810px){
                     width: 100%;
-                }             
+                }  
+         
                 .block-entity-fieldnodefield-fichiers{
                     height: fit-content;
                     border: 2px solid $blue-light;
@@ -294,6 +295,7 @@
             
                 }
                 .block-entity-fieldnodefield-liens{
+                    order: 3;
                     .field--name-field-liens{
                         .field__item{
                             margin: auto;  
@@ -305,7 +307,8 @@
                             padding-left: 1rem;
                             padding-top: 1rem;
                             margin-bottom: 1rem;
-                            padding: 1rem
+                            padding: 1rem;
+                            
                         }
                         a{
                             display: inline-flex;
@@ -313,10 +316,12 @@
                             color: $blue-light;
                             font-weight: 800;
                             &::before{
-                                content: url("../images/pictos/noun_External Link_674151.svg");
+                                content: url("../images/pictos/external_link.png");
                                 min-width: 30px;
                                 height: auto;
                                 padding-right: 1rem;
+                                margin-right: 1rem;
+
                             }
                             svg.ext{
                                 display: none;
@@ -328,6 +333,7 @@
                
             
                 .block-entity-fieldnodefield-ress{
+                    order: 4;
                     margin-top: 3rem; 
                     .field--name-field-ress{
                         .field__label{
@@ -447,11 +453,13 @@
                 }    
                 
                 .block-entity-fieldnodefield-projets-liee{
+                    order: 1;
                     margin-top: 3rem;        
                     @media(max-width:479px){
                         margin-top: 2rem;
                     }
                     h2{
+                        display: none;
                         font-size: 0.8rem;
                         color: $black;
                         font-weight: 900;
@@ -459,20 +467,39 @@
                     .field--name-field-projets-liee{
                         display: flex;
                         flex-direction: column;
-                        border: 2px solid $blue-light;
+                        border-bottom: 1px solid $black;
                         padding: 1rem;
                 
                         height: fit-content;
-                        margin-bottom: 1rem;
+                        margin-bottom: 3rem;
                         background-color: $white;
-
+                        
+                      
                         .field__label{ display: none;}
+                        .field__items{
+                           
+                            :before{
+                                content: url("../images/pictos/picto_lieu_blue.svg");
+                                display: inline-block;
+                                color: $blue-dark;
+                                margin-right: 1rem;
+                            }
+                        }
                         .field__item{
+                            display: flex;
+                            flex-direction: row;
+                            :before{
+                                content: 'Voir le projet';
+                                display: block;
+                                color: $blue-dark;
+                              
+                            }
                             a{
-                                color: $black;
+                                color: $blue-dark;
                                 font-size: 1rem;
                                 font-weight: 900;
-                                font-style: italic;
+                                // font-style: italic;
+                               
                             }
                         }
                     }

+ 1 - 1
web/themes/custom/eql/scss/pages/ressources.scss

@@ -212,7 +212,7 @@
                                                 flex-direction: row;
                                                 align-items: center;
                                             }
-                                            h3.type-publication-issue-du-programme-eqld a{
+                                            h3.type-productions-du-programme-engages-pour-la-qualite-du-logement-de-demain a{
                                                 &:before{
                                                     content:url("../images/pictos/picto-ressource-eqld.svg");
                                                     padding-right: 1rem;

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