add updates

pypsa-meets-earth · Sep 16, 2022 · 1fc2e46 · 1fc2e46
1 parent db22409
commit 1fc2e46
Show file tree

Hide file tree

Showing 15 changed files with 847 additions and 62 deletions.
diff --git a/assets/css/style.css b/assets/css/style.css
@@ -122,7 +122,7 @@ h6 {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    padding: 10px 0 10px 30px;
+    padding: 10px 20px 10px 10px;
     font-size: 14px;
     color: #0f334e;
     white-space: nowrap;
@@ -620,8 +620,9 @@ section {
 }
 
 .getinvolved img {
-    width: 100%;
-    height: auto;
+    width: auto;
+    height: 180px;
+    padding-top: 10px;
 }
 
 .getinvolved2 {

diff --git a/assets/img/discord-logo-mini.png b/assets/img/discord-logo-mini.png
diff --git a/assets/img/mission/diamond.png b/assets/img/mission/diamond.png
diff --git a/assets/img/mission/diamond_yellow.png b/assets/img/mission/diamond_yellow.png
diff --git a/assets/img/mission/rocket.png b/assets/img/mission/rocket.png
diff --git a/assets/img/mission/rocket_yellow.png b/assets/img/mission/rocket_yellow.png
diff --git a/assets/img/mission/telescope.png b/assets/img/mission/telescope.png
diff --git a/assets/img/mission/telescope_yellow.png b/assets/img/mission/telescope_yellow.png
diff --git a/assets/img/people/maxparzen.jpg b/assets/img/people/maxparzen.jpg
diff --git a/assets/img/people/maxparzen_cropped.jpg b/assets/img/people/maxparzen_cropped.jpg
diff --git a/index.html b/index.html
@@ -55,9 +55,9 @@
     <link href="assets/vendor/glightbox/css/glightbox.min.css" rel="stylesheet">
     <link href="assets/vendor/swiper/swiper-bundle.min.css" rel="stylesheet">
 
-    <!-- Bootstrap CSS 
+    <!-- Bootstrap CSS
   <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">    
-  
+  -->
   <!-- Template Main CSS File -->
     <link href="assets/css/style.css" rel="stylesheet">
 
@@ -86,18 +86,16 @@
     <!-- ======= Header ======= -->
     <header id="header">
         <div class="container d-flex align-items-center justify-content-around justify-content-md-between">
-
             <div class="logo">
                 <!-- <h1><a href="index.html">Bocor<span>.</span></a></h1> -->
                 <!-- Uncomment below if you prefer to use an image logo -->
                 <a href="index.html"><img src="assets/img/logo.png" alt="" class="img-fluid"></a>
             </div>
-
             <nav id="navbar" class="navbar">
                 <ul>
                     <li><a class="nav-link scrollto active" href="#hero"></a></li>
                     <li><a class="nav-link scrollto" href="index.html#intro">What we do</a></li>
-                    <li class="dropdown"><a href="#"><span>Projects</span> <i class="bi bi-chevron-down"></i></a>
+                    <li class="dropdown"><a href="projects.html"><span>Projects</span> <i class="bi bi-chevron-down"></i></a>
                         <ul>
                           <li><a href="projects.html#model">Open framework and model</a></li>
                           <li><a href="projects.html#data">Open data</a></li>
@@ -106,22 +104,26 @@
                         </ul>
                     </li>
                     <li><a class="nav-link scrollto" href="#clients">Team</a></li>
-                    <li><a class="nav-link scrollto" href="#contact">Newsletter</a></li>
-                    <li><a class="nav-link scrollto" href="highs.html">HiGHS campaign</a></li> 
-                    <li><a class="getstarted scrollto" href="#getinvolved">Get involved</a></li>
+                    <li><a class="nav-link scrollto" href="results.html">Results</a></li>
+                    <li class="dropdown"><a href="#"><span>Support us</span> <i class="bi bi-chevron-down"></i></a>
+                        <ul>
+                            <li><a href="support_us.html#developer">Are you developer?</a></li>
+                            <li><a href="support_us.html#groupleader">Are you group leader?</a></li>
+                            <li><a href="support_us.html#funder">Are you funding-provider?</a></li>
+                        </ul>
+                    </li>
                 </ul>
                 <i class="bi bi-list mobile-nav-toggle"></i>
 
                 <script src="https://platform.linkedin.com/in.js" type="text/javascript">
                     lang: en_US
                 </script>
-
                 <script type="IN/FollowCompany" data-id="77178374" data-counter="bottom"></script>
+                <div class="logo">
+                    <a href="https://discord.gg/AnuJBk23FU"><img src="assets/img/discord-logo-mini.png" alt="" class="img-fluid"></a>
+                </div>
         </div>
         </nav>
-        <!-- .navbar -->
-
-        </div>
     </header>
     <!-- End Header -->
 
@@ -141,6 +143,34 @@ <h2>An open source energy system model initiative for our Earth</h2>
         </div>
     </section>
 
+    <!-- Marketing section-->
+    <section class="py-1" id="features">
+        <div class="container marketing">
+            <div class="container my-5">
+                <div class="row gx-5">
+                    <div class="col-lg-4">
+                        <img src="assets/img/mission/rocket.png" alt="Generic placeholder image" width="100" height="100">
+                        <h2>OUR MISSION</h2>
+                        <p>To accelerate and cost-optimize the world’s transition to sustainable, accessible and reliable energy.</p>
+                    </div>
+                    <!-- /.col-lg-4 -->
+                    <div class="col-lg-4">
+                        <img src="assets/img/mission/telescope.png" alt="Generic placeholder image" width="100" height="100">
+                        <h2>OUR VISION</h2>
+                        <p>To create the most compelling energy planning initiative of the 21st century by driving the world’s transition to open-source and open-data.</p>
+                    </div>
+                    <!-- /.col-lg-4 -->
+                    <div class="col-lg-4">
+                        <img src="assets/img/mission/diamond.png" alt="Generic placeholder image" width="100" height="100">
+                        <h2>OUR VALUES</h2>
+                        <p>Freedom and openess are our core values to make developments faster
+                            and decision-making transparent and better!</p>
+                    </div>
+                    <!-- /.col-lg-4 -->
+                </div>
+            </div>
+        </div>
+    </section>
 
     <!-- ======= Get Involved Section ======= -->
     <section id="intro" class="getinvolved section-bg">
@@ -213,35 +243,6 @@ <h1 style="text-align: center;">
         </div>
     </section>
 
-    <!-- Marketing section-->
-    <section class="py-1" id="features">
-        <div class="container marketing">
-            <div class="container my-5">
-                <div class="row gx-5">
-                    <div class="col-lg-4">
-                        <img src="assets/img/mission/rocket.png" alt="Generic placeholder image" width="100" height="100">
-                        <h2>OUR MISSION</h2>
-                        <p>To accelerate and cost-optimize the world’s transition to sustainable, accessible and reliable energy</p>
-                    </div>
-                    <!-- /.col-lg-4 -->
-                    <div class="col-lg-4">
-                        <img src="assets/img/mission/telescope.png" alt="Generic placeholder image" width="100" height="100">
-                        <h2>OUR VISION</h2>
-                        <p>To create the most compelling energy planning initiative of the 21st century by driving the world’s transition to open-source and open-data.</p>
-                    </div>
-                    <!-- /.col-lg-4 -->
-                    <div class="col-lg-4">
-                        <img src="assets/img/mission/diamond.png" alt="Generic placeholder image" width="100" height="100">
-                        <h2>OUR VALUES</h2>
-                        <p>Freedom and openess are our core values to make developments faster
-                            and decision-making transparent and better!</p>
-                    </div>
-                    <!-- /.col-lg-4 -->
-                </div>
-            </div>
-        </div>
-    </section> -->
-
 
     <!-- ======= About Section ======= -->
     <section id="about" class="about section-bg">
@@ -322,11 +323,10 @@ <h4><a href="#">Initiate a stable open source support organization</a></h4>
         <section id="clients" class="clients section-bg">
             <div class="container my-5">
                 <div class="section-title">
-                    <h2 data-aos="fade-in">Our members</h2>
+                    <h2 data-aos="fade-in">Our members and users</h2>
                 </div>
                 <div class="container">
                     <h2><a href="https://pypsa-meets-africa.readthedocs.io/en/latest/project_structure_and_credits.html">Our members</a> are associated to:</h2>
-
                     <div class="row no-gutters clients-wrap clearfix wow fadeInUp">
 
                         <div class="col-lg-2 col-md-4 col-6">
@@ -473,7 +473,8 @@ <h2><a href="https://pypsa-meets-africa.readthedocs.io/en/latest/project_structu
                                 <img src="assets/img/clients/MIT_logo.svg.png" width="100px" class="img-fluid" alt="" data-aos="flip-right" data-aos-delay="500">
                             </div>
                         </div>
-
+
+                        <h2><a href="https://pypsa.readthedocs.io/en/latest/users.html"> A list of PyPSA users</a> is given in the <a href="https://pypsa.readthedocs.io/en/latest/users.html"> documentation </a></h2>
                     </div>
                 </div>
             </div>