acm-uiuc
diff --git a/‎public/favicon.ico
-3.78 KB b/‎public/favicon.ico
-3.78 KB
diff --git a/‎public/favicon.jpg
-16.6 KB b/‎public/favicon.jpg
-16.6 KB
diff --git a/‎public/favicon.png
103 KB b/‎public/favicon.png
103 KB
diff --git a/‎public/index.html
Lines changed: 1 addition & 1 deletion b/‎public/index.html
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Header.js
Lines changed: 14 additions & 2 deletions b/‎src/Header.js
Lines changed: 14 additions & 2 deletions
diff --git a/‎src/assets/favicon.png
103 KB b/‎src/assets/favicon.png
103 KB
diff --git a/‎src/assets/logo.png
132 KB b/‎src/assets/logo.png
132 KB
diff --git a/‎src/logo.svg
Lines changed: 0 additions & 7 deletions b/‎src/logo.svg
Lines changed: 0 additions & 7 deletions
@@ -3,7 +3,7 @@
 
 <head>
   <meta charset="utf-8">
-  <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.jpg">
+  <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.png">
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <meta name="theme-color" content="#000000">
   <!--
 
@@ -2,11 +2,23 @@ import React from "react";
 import { NavLink } from "react-router-dom";
 import { Navbar, Nav } from "react-bootstrap";
 
+import favicon from "./assets/favicon.png";
+import logo from "./assets/logo.png";
+
 const Header = () => (
   <Navbar expand="md" variant="light" bg="light" sticky="top">
     <Navbar.Brand as={NavLink} exact to="/">
-      <span className="full-brand">ACM SIGGRAPH University of Illinois</span>
-      <span className="abbrev-brand">SIGGRAPH UIUC</span>
+      <span className="full-brand">
+        <img
+          src={favicon}
+          width="30"
+          height="30"
+          className="d-inline-block align-top mr-1"
+          alt="siggraph logo"
+        />
+        ACM SIGGRAPH University of Illinois
+      </span>
+      <img className="abbrev-brand" height={50} src={logo}></img>
     </Navbar.Brand>
     <Navbar.Toggle aria-controls="navbar-nav" />
     <Navbar.Collapse id="navbar-nav">