Merge branch 'main' of github.com:DemocraciaEnRed/presupuesto-partici…

…pativo
DemocraciaEnRed · Sep 19, 2024 · b0331eb · b0331eb
2 parents 085b697 + 5baa643
commit b0331eb
Show file tree

Hide file tree

Showing 81 changed files with 733 additions and 3,770 deletions.
diff --git a/ext/lib/site/Popup/styles.styl b/ext/lib/site/Popup/styles.styl
@@ -8,7 +8,7 @@
     padding: 0 20px;
     margin: 0;
     cursor: pointer;
-    background: #24436f;
+    background: $primary;
     border-radius: 4px 4px 0px 0px;
     box-shadow: 0px 2px 12px rgba(0, 0, 0, 0.06), 0px 2px 4px rgba(0, 0, 0, 0.08);
     display: flex;
@@ -71,7 +71,7 @@
     padding: 0 20px;
     margin: 0;
     cursor: pointer;
-    background: #24436F;
+    background: $primary;
     border-radius: 4px 4px 0px 0px;
     box-shadow: 0px 2px 12px rgba(0, 0, 0, 0.06), 0px 2px 4px rgba(0, 0, 0, 0.08);
     display: flex;
@@ -103,7 +103,7 @@
     padding:0 20px;
     margin:0;
     cursor:pointer;
-    background:#24436f;
+    background:$primary;
     border-radius:4px 4px 0px 0px;
     box-shadow:0px 2px 12px rgba(0, 0, 0, 0.06), 0px 2px 4px rgba(0, 0, 0, 0.08);
     display:flex;

diff --git a/ext/lib/site/assets/styles.styl b/ext/lib/site/assets/styles.styl
@@ -129,7 +129,7 @@
           content: none
 
 .btn-primary-mgp
-  background: #24436F;
+  background: $primary;
   color: #fff;
   &:hover
     color: #fff
diff --git a/ext/lib/site/banner-foro-vecinal/styles.styl b/ext/lib/site/banner-foro-vecinal/styles.styl
@@ -18,7 +18,7 @@
     height: 360px
     background-size: cover
     background-repeat: no-repeat
-    background-color: #24436F
+    background-color: $secondary
     padding: 0
     overflow: hidden
     @media(min-width: 2100px)
@@ -61,7 +61,7 @@
       font-family: 'AlfabetLight', sans-serif
       justify-content: center
       align-items: center
-      background-color: #24436F
+      background-color: $primary
       color: white
       text-align: center
       margin: 0 auto
@@ -85,4 +85,4 @@
       text-transform: uppercase
 
 .fondo-rosa
-  background-color: #C481B6
+  background-color: $secondary-light
diff --git a/ext/lib/site/banner-invitacion/assets/icon-votar.png b/ext/lib/site/banner-invitacion/assets/icon-votar.png
diff --git a/ext/lib/site/banner-invitacion/component.js b/ext/lib/site/banner-invitacion/component.js
@@ -10,8 +10,8 @@ export default (props) =>  {
         {texts['home-banner-image'] && 
         <img src={texts['home-banner-image']} alt="Ideas"/>
         }
-        <p>{texts['home-banner-title']}</p>
-
+            <h6>{texts['home-banner-title']}</h6>
+            <p>{texts['home-banner-text']}</p>
         {texts['home-banner-button1-text'] && <a href={texts['home-banner-button1-link']} target="_blank" tabIndex="31" className="boton-foro">
             {texts['home-banner-button1-text']}
         </a>}

diff --git a/ext/lib/site/banner-listado-topics/styles.styl b/ext/lib/site/banner-listado-topics/styles.styl
@@ -8,10 +8,9 @@ header.banner-proyectos
   justify-content: center
   align-items: center
   background-size: cover
-  background-image: unquote("url('ext/lib/site/formulario-propuesta/fondo-formulario-propuestas.svg')")
   background-repeat: no-repeat
   background-position: center;
-  background-color: #C481B6
+  background-color: $secondary-light
   background-size: 100%
   text-align: center
   color: #FFF
@@ -40,7 +39,7 @@ header.banner-proyectos
     text-align: center;
     margin-top: 30px;
     box-shadow: 0 4px 4px 0 rgba(255, 255, 255, 0.25);
-    background-color: #24436F;
+    background-color: $primary;
     &:hover,&:focus
       color:white
     &:focus

diff --git a/ext/lib/site/banner-mapa-vectores/styles.styl b/ext/lib/site/banner-mapa-vectores/styles.styl
@@ -9,7 +9,7 @@
   margin: 10px auto 20px
   padding: 10px 10%;
   align-items: center
-  background-color: #24436F
+  background-color: $primary
   color: white
   text-align: center
   h2

diff --git a/ext/lib/site/footer/component.js b/ext/lib/site/footer/component.js
@@ -33,23 +33,22 @@ export default class Footer  extends Component {
         <p dangerouslySetInnerHTML={{__html: texts['footer-info']}}></p>
       </div>
       <div className='social-icon'>
-        <a aria-label='Ícono de facebook' className='social-facebook' tabIndex="102"  href='https://facebook.com/municipalidadmardelplata/ ' target="_blank"/>
-        <a aria-label='Ícono de instagram' className='social-instagram' tabIndex="103"  href='https://instagram.com/munimardelplata/' target="_blank" />
-        <a aria-label='Ícono de twitter' className='social-twitter' tabIndex="104"  href='https://twitter.com/munimardelplata/' target="_blank" />
-        <a aria-label='Ícono de mail' className='social-mail' tabIndex="105"  href='mailto:[email protected]' target="_blank"/>
-        <a aria-label='Ícono de whatsapp' className='social-whatsapp' tabIndex="106"  href='https://wa.link/69dr1s' target="_blank" />
+            <a aria-label='Ícono de facebook' className='social-facebook' tabIndex="102" href='https://www.facebook.com/democraciaenred' target="_blank" />
+            <a aria-label='Ícono de instagram' className='social-instagram' tabIndex="103" href='https://www.instagram.com/democraciaenred' target="_blank" />
+            <a aria-label='Ícono de twitter' className='social-twitter' tabIndex="104" href='https://x.com/fundacionDER' target="_blank" />
+            <a aria-label='Ícono de mail' className='social-mail' tabIndex="105" href='mailto:[email protected]' target="_blank" />
       </div>
-      <div className='logos'>
-        {/* <a href="https://democraciaenred.org/" rel="noopener noreferer" target="_blank">
+          {/* <div className='logos'>
+        <a href="https://democraciaenred.org/" rel="noopener noreferer" target="_blank">
           <div className='logo-der'>
             <img src="/ext/lib/site/footer/logo-der.png" alt="Logo democracia en red"/>
             <span>Desarrollado por<br /><b>Democracia en red</b></span>
           </div>
-        </a> */}
+        </a>
         <div className='logo'>
           <a className='logo-mgp' tabIndex="107" href='https://www.mardelplata.gob.ar/' aria-label="Link a página de Mar del Plata" rel="noopener noreferer" target="_blank" />
         </div>
-      </div>
+      </div> */}
       <div className='terminos'>
         <Link to='/s/terminos-y-condiciones' tabIndex="108"> Términos y condiciones
         </Link>

diff --git a/ext/lib/site/footer/styles.styl b/ext/lib/site/footer/styles.styl
@@ -1,6 +1,6 @@
 .footer-static
   font-family: 'AlfabetLight', sans-serif
-  background-color: #C481B6
+  background-color: $secondary
   width: 100%
   font-size: 16px
   padding: 5%
@@ -15,7 +15,7 @@
       float: left
     h3
       color: black
-      border-bottom: solid 2px #24436F
+      border-bottom: solid 2px $primary
       padding-bottom: 10px
       margin: 10px 0 20px
       font-weight: bold
@@ -24,10 +24,10 @@
       @media screen and (min-width: 769px)
         padding-left: 20px
     a
-      color: white;
+      color: #000;
       font-weight: normal;
     a:hover, a:focus, a:active
-      color: white
+      color: #000
       text-decoration: underline;
 
     .datos-contacto
@@ -41,19 +41,16 @@
           font-size: 22px
 
     p
-      color: #d8d8d8
       line-height: 1.4
       margin-bottom: 20px
       @media screen and (min-width: 769px)
         padding-left: 20px
         font-size: 18px
 
     span
-      color: #d8d8d8
       display: block
 
     span:first-child
-      color: white
       margin-bottom: 3%
       @media screen and (min-width: 500px)
         margin-bottom: 0
@@ -176,7 +173,7 @@
     text-align: center
     width: 100%
     a
-      color: #d8d8d8
+      color: #000
       display: block
 
 @media screen and (max-width: 500px)