Merge pull request #78 from elixir-europe/elixir-bsc

Elixir bsc
elixir-europe · Mar 6, 2024 · 231f0f3 · 231f0f3
2 parents b237584 + bfe3e5c
commit 231f0f3
Show file tree

Hide file tree

Showing 11 changed files with 69 additions and 134 deletions.
diff --git a/frontend/public/CINECA_logo.png b/frontend/public/CINECA_logo.png
diff --git a/frontend/public/ISCIII_logo.png b/frontend/public/ISCIII_logo.png
diff --git a/frontend/public/elixirLogo.png b/frontend/public/elixirLogo.png
diff --git a/frontend/public/horizonEuropeLogo.png b/frontend/public/horizonEuropeLogo.png
diff --git a/frontend/public/impactLogo.png b/frontend/public/impactLogo.png
diff --git a/frontend/public/index.html b/frontend/public/index.html
@@ -22,7 +22,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-  <title>IMPaCT Beacon network demo</title>
+  <title>ELIXIR Beacon network demo</title>
 </head>
 
 <body class="dx-viewport">

diff --git a/frontend/public/laMaratoLogo.png b/frontend/public/laMaratoLogo.png
diff --git a/frontend/public/ministerio_logo.png b/frontend/public/ministerio_logo.png
diff --git a/frontend/src/App.css b/frontend/src/App.css
@@ -66,9 +66,9 @@ html {
 }
 
 .version {
-  margin-bottom: 27px;
-  margin-right: 27px;
-  margin-top: -10px;
+  margin-bottom: 19px;
+  margin-right: 25px;
+  margin-top: 4px;
   color: rgb(102 116 152) !important;
   font-weight: 700 !important;
 }
@@ -603,77 +603,44 @@ html {
   align-items: center;
 }
 
-.impactLogo {
-  height: 35px;
-  margin-top: 40px;
-  margin-right: 11px;
-  -webkit-filter: grayscale(20%);
-  filter: grayscale(60%);
-  -webkit-transition: 0.2s ease-in-out;
-  transition: 0.2s ease-in-out;
-}
-
-.impactLogo:hover {
-  -webkit-filter: grayscale(0%);
-  filter: grayscale(0%);
-}
-
-.federLogo {
-  height: 33px;
-  margin-top: 42px;
-  margin-right: 14px;
+.elixirLogo {
+  height: 91px;
   -webkit-filter: grayscale(20%);
   filter: grayscale(100%);
-  -webkit-transition: 0.2s ease-in-out;
-  transition: 0.2s ease-in-out;
 }
 
-.federLogo:hover {
+.elixirLogo:hover {
   -webkit-filter: grayscale(0%);
   filter: grayscale(0%);
 }
 
-.iscLogo {
-  height: 33px;
-  margin-top: 42px;
-  margin-right: 14px;
-  -webkit-filter: grayscale(20%);
-  filter: grayscale(100%);
-  -webkit-transition: 0.2s ease-in-out;
-  transition: 0.2s ease-in-out;
-}
-
-.iscLogo:hover {
-  -webkit-filter: grayscale(0%);
-  filter: grayscale(0%);
-}
-
-.ministerioLogo {
-  height: 33px;
-  margin-top: 42px;
-  margin-right: 14px;
+.laCaixaLogo {
+  height: 35px;
+  margin-right: 30px;
+  margin-top: 3px;
   -webkit-filter: grayscale(20%);
   filter: grayscale(100%);
   -webkit-transition: 0.2s ease-in-out;
   transition: 0.2s ease-in-out;
 }
 
-.ministerioLogo:hover {
+.laCaixaLogo:hover {
   -webkit-filter: grayscale(0%);
   filter: grayscale(0%);
 }
 
-.laCaixaLogo {
-  height: 33px;
-  margin-top: 42px;
-  margin-right: 30px;
+.horizonEuropeLogo{
+  height: 35px;
+  margin-right: 16px;
+  margin-left: 4px;
+  margin-top: 3px;
   -webkit-filter: grayscale(20%);
   filter: grayscale(100%);
   -webkit-transition: 0.2s ease-in-out;
   transition: 0.2s ease-in-out;
 }
 
-.laCaixaLogo:hover {
+.horizonEuropeLogo:hover {
   -webkit-filter: grayscale(0%);
   filter: grayscale(0%);
 }
@@ -803,9 +770,8 @@ hr {
 .logos {
   display: flex;
   width: 100vw;
-  align-items: flex-end;
-  margin-bottom: 19px;
-  margin-top: -8px;
+  align-items: center;
+  margin-top: 8px;
   flex-direction: row;
   justify-content: flex-end;
 }
@@ -1246,12 +1212,23 @@ h5 {
     padding-bottom: 1px;
   }
 
+  .elixirLogo {
+    height: 60px;
+    -webkit-filter: grayscale(20%);
+    filter: grayscale(100%);
+  }
+
+  .elixirLogo:hover {
+    -webkit-filter: grayscale(0%);
+    filter: grayscale(0%);
+  }
+
   .version {
-    margin-bottom: 39px;
+    margin-bottom: 63px;
     margin-right: 25px;
-    margin-top: -14px;
+    margin-top: -10px;
     color: rgb(102 116 152) !important;
-    font-weight: 700 !important;
+    font-weight: 600;
   }
 
   .logosVersionContainer {
@@ -1263,50 +1240,19 @@ h5 {
     margin-bottom: 20px;
   }
 
-  .impactLogo {
-    height: 31px;
-    margin-top: 31px;
-    margin-right: 10px;
-    -webkit-filter: grayscale(20%);
-    filter: grayscale(100%);
-    -webkit-transition: 0.2s ease-in-out;
-    transition: 0.2s ease-in-out;
-  }
-
-  .federLogo {
-    height: 31px;
-    margin-top: 31px;
-    margin-right: 10px;
-    -webkit-filter: grayscale(20%);
-    filter: grayscale(100%);
-    -webkit-transition: 0.2s ease-in-out;
-    transition: 0.2s ease-in-out;
-  }
-
-  .iscLogo {
-    height: 31px;
-    margin-top: 31px;
-    margin-right: 10px;
-    -webkit-filter: grayscale(100%);
-    filter: grayscale(100%);
-    -webkit-transition: 0.2s ease-in-out;
-    transition: 0.2s ease-in-out;
-  }
-
-  .ministerioLogo {
+  .laCaixaLogo {
     height: 31px;
-    margin-top: 31px;
-    margin-right: 10px;
+    margin-right: 30px;
     -webkit-filter: grayscale(100%);
     filter: grayscale(100%);
     -webkit-transition: 0.2s ease-in-out;
     transition: 0.2s ease-in-out;
   }
 
-  .laCaixaLogo {
+  .horizonEuropeLogo{
     height: 31px;
-    margin-top: 31px;
-    margin-right: 30px;
+    margin-right: 16px;
+    margin-left: 4px;
     -webkit-filter: grayscale(100%);
     filter: grayscale(100%);
     -webkit-transition: 0.2s ease-in-out;
@@ -1495,13 +1441,6 @@ h5 {
     margin-left: -8px;
   }
 
-  .elixirLogo {
-    height: 70px;
-    margin-top: 18px;
-    margin-bottom: 37px;
-    margin-right: 21px;
-  }
-
   .searchButton {
     height: 30px;
     cursor: pointer;

diff --git a/frontend/src/components/Footer/Footer.js b/frontend/src/components/Footer/Footer.js
@@ -72,6 +72,24 @@ function Footer (props) {
               Beacon validator
             </NavLink>
           </li>
+          <li className='social-icon__item'>
+            <a
+              className='social-icon__link'
+              href='https://github.com/elixir-europe/beacon-network-ui/'
+              target='_blank'
+              rel='noreferrer'
+            >
+              <ion-icon name='logo-github'></ion-icon>
+            </a>
+            <a
+              className='menu__link'
+              href='https://github.com/elixir-europe/beacon-network-ui/'
+              target='_blank'
+              rel='noreferrer'
+            >
+              GitHub UI
+            </a>
+          </li>
           {/* <li className='social-icon__item'>
             <a
               className='social-icon__link'
@@ -149,7 +167,7 @@ function Footer (props) {
                 to='/sign-in-options'
                 className='social-icon__link'
               >
-                <ion-icon name='log-out-outline' ></ion-icon>
+                <ion-icon name='log-out-outline'></ion-icon>
               </NavLink>
               <NavLink
                 exact

diff --git a/frontend/src/components/Layout/Layout.js b/frontend/src/components/Layout/Layout.js
@@ -538,52 +538,30 @@ function Layout (props) {
         <div className='logosVersionContainer'>
           <div className='logos'>
             <a
-              href='https://impact-data.bsc.es/'
+              href='https://elixir-europe.org/'
               className='logoInstitution'
               target='_blank'
               rel='noreferrer'
-              title="El proyecto IMPaCT-Data (Exp. IMP/00019) ha sido financiado por el Instituto de Salud Carlos III, co-financiado por el Fondo Europeo de Desarrollo Regional (FEDER, “Una manera de hacer Europa“)"
+              title='The project "Beacon Infrastructure (2021-23)" has been funded by ELIXIR Europe'
             >
               <img
-                className='impactLogo'
-                src='../impactLogo.png'
-                alt='impactLogo'
-              ></img>
-            </a>
-            <a
-              href='https://www.fondoseuropeos.hacienda.gob.es/sitios/dgfc/es-ES/paginas/feder.aspx/'
-              className='logoInstitution'
-              target='_blank'
-              rel='noreferrer'
-            >
-              <img
-                className='federLogo'
-                src='../feder_logo.png'
-                alt='federLogo'
-              ></img>
-            </a>
-            <a
-              href='https://www.ciencia.gob.es/'
-              className='logoInstitution'
-              target='_blank'
-              rel='noreferrer'
-            >
-              <img
-                className='ministerioLogo'
-                src='../ministerio_logo.png'
-                alt='ministerioLogo'
+                className='elixirLogo'
+                src='./white-orange-logo.png'
+                alt='elixirLogo'
               ></img>
             </a>
+
             <a
-              href='https://www.isciii.es/Paginas/Inicio.aspx/'
+              href='https://research-and-innovation.ec.europa.eu/funding/funding-opportunities/funding-programmes-and-open-calls/horizon-europe_en'
               className='logoInstitution'
               target='_blank'
               rel='noreferrer'
+              title='Funded by the European Union'
             >
               <img
-                className='iscLogo'
-                src='../ISCIII_logo.png'
-                alt='iscLogo'
+                className='horizonEuropeLogo'
+                src='../horizonEuropeLogo.png'
+                alt='horizonEuropeLogo'
               ></img>
             </a>
             <a