Added images and fixed merge conflicts

2020-01-08 11:55:52 -05:00 · 2020-01-08 11:55:52 -05:00 · fa196c0b27
commit fa196c0b27
parent 0a38afdc20
9 changed files with 2 additions and 2 deletions
--- a/static/css/style.css
+++ b/static/css/style.css
@ -57,7 +57,7 @@ h6 {
 }*/

 .silver-sponsors img {
-	max-height: 30px;
+	max-height: 25px;
 }

 /*.bronze-sponsors img {
--- a/static/img/hacklogo.png
+++ b/static/img/hacklogo.png
--- a/static/img/logos/abbvie.png
+++ b/static/img/logos/abbvie.png
--- a/static/img/logos/boozallenhamilton.png
+++ b/static/img/logos/boozallenhamilton.png
--- a/static/img/logos/carbonblack.png
+++ b/static/img/logos/carbonblack.png
--- a/static/img/logos/iboss.png
+++ b/static/img/logos/iboss.png
--- a/static/img/logos/kronos.png
+++ b/static/img/logos/kronos.png
--- a/static/img/logos/synopses.png
+++ b/static/img/logos/synopses.png
--- a/templates/index.html
+++ b/templates/index.html
@ -4,7 +4,7 @@
        <!--Logo + Date+ Hosted By -->
        <div class="container">
            <div class="row center">
-                <img src="../static/img/logo1.png" alt="logo" style='height: 100%; width: 100%; object-fit: contain'/>
+                <img src="../static/img/hacklogo.png" alt="logo" style='height: 100%; width: 100%; object-fit: contain'/>
            </div>
        </div>