resolve merge conflicts

uc-cdis · Apr 16, 2020 · 06f58ef · 06f58ef
2 parents 0b26291 + 00589be
commit 06f58ef
Show file tree

Hide file tree

Showing 30 changed files with 62,885 additions and 56 deletions.
diff --git a/...atacommons.io/dashboard/Public/index.html → ...secommons.org/dashboard/Public/index.html b/...atacommons.io/dashboard/Public/index.html → ...secommons.org/dashboard/Public/index.html
@@ -14,7 +14,7 @@
 <body>
   <div id='header'>
     <div class='header__img-wrapper'>
-      <a href="https://covid19.datacommons.io" target="_blank"><img src="./sponsors-logo/chicagoland_covid19_commons.png" height="100px" /></a>
+      <a href="https://chicagoland.pandemicresponsecommons.org" target="_blank"><img src="./sponsors-logo/chicagoland_covid19_commons.png" height="100px" /></a>
     </div>
   </div>
   <div class='container'>
@@ -74,6 +74,18 @@ <h1>Chicagoland COVID-19 Project Partners</h1>
             datasets in a scalable, reproducible, and secure manner. </p>
         </div>
       </div>
+
+      <div class='partner'>
+        <div class="partner-content">
+
+          <a href="https://www.burwood.com/"><img src="./sponsors-logo/burwood_group.jpg" class="image-wrapper" /></a>
+        </div>
+        <div class="partner-content">
+
+          <p class="text-wrapper"> Burwood Group is an IT consulting and integration firm, helping organizations realize digital transformation through cloud adoption, data intelligence, and infrastructure automation. Burwood Group is honored to be
+            able to contribute our security, compute, automation, testing, and accessibility expertise for the data commons. </p>
+        </div>
+      </div>
     </div>
   </div>
 </body>

diff --git a/....datacommons.io/dashboard/Public/main.css → ...onsecommons.org/dashboard/Public/main.css b/....datacommons.io/dashboard/Public/main.css → ...onsecommons.org/dashboard/Public/main.css
@@ -61,7 +61,7 @@
 }
 
 .text-wrapper {
-  height: 150px;
+  height: 175px;
   padding: 0.5em;
   vertical-align: top;
   font-size: 20px;