add the official logo to the main page and favicon

closes #618 Thanks @kadimisetty!
dc-js · Jan 12, 2015 · cbfe3f7 · cbfe3f7
1 parent 01756a8
commit cbfe3f7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 1 deletion.
diff --git a/AUTHORS b/AUTHORS
@@ -48,3 +48,4 @@ Robert Paskowitz <[email protected]>
 Jasmine Hegman <[email protected]>
 Davis Ford <[email protected]>
 gal12 <[email protected]>
+Sri Kadimisetty
diff --git a/Changelog.md b/Changelog.md
@@ -1,11 +1,14 @@
+## add-logo tag
+ * Added logo to main page and favicon (#618)
+
 ## 2.0.0 beta 1
  * Merged #800: unselectable ids starting with numbers #789. Thanks Jasmine Hegman!
  * Interface and features frozen - from this point all fixes will be merged to
    `master` and `develop`, and all interface changes only merged to `develop`.
 
 ## Starting dc.js Changelog
  * Here we start using git-flow, start a changelog, and start 2015.  Under git-flow,
-   the latest release (currently 2.0.0 alpha 6) is always on the master branch,
+   the latest release (starting with 2.0.0-beta.1) is always on the master branch,
    development (2.1.0-dev) is on the develop branch, and releases and fixes are always
    merged into develop.
  * Read about git-flow here: http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/

diff --git a/regression/rendered-stock-fixture.html b/regression/rendered-stock-fixture.html
@@ -5,19 +5,26 @@
 
     <link rel="stylesheet" type="text/css" href="css/bootstrap.min.css">
     <link rel="stylesheet" type="text/css" href="css/dc.css">
+    <link rel="icon" type="image/x-icon" href="dc.logo.png">
 
     <style>
         #monthly-volume-chart g.y {
             display: none;
         }
+        #logo {
+            margin-right: 2em;
+            margin-top: 2em;
+        }
     </style>
 </head>
 <body>
 
 <div class="container">
 
+<img id="logo" src="dc.logo.png" style="float:left" width="125" height="125">
 <h2>dc.js - Dimensional Charting Javascript Library</h2>
 
+
 <p>
     dc.js is a javascript charting library with native <a href="http://square.github.com/crossfilter/">crossfilter</a>
     support and allowing highly efficient exploration on large multi-dimensional dataset (inspired by crossfilter's

diff --git a/web/dc.logo.png b/web/dc.logo.png
diff --git a/web/index.html b/web/index.html
@@ -7,19 +7,26 @@
 
     <link rel="stylesheet" type="text/css" href="css/bootstrap.min.css">
     <link rel="stylesheet" type="text/css" href="css/dc.css"/>
+    <link rel="icon" type="image/x-icon" href="dc.logo.png"/>
 
     <style>
         #monthly-volume-chart g.y {
             display: none;
         }
+        #logo {
+            margin-right: 2em;
+            margin-top: 2em;
+        }
     </style>
 </head>
 <body>
 
 <div class="container">
 
+<img id="logo" src="dc.logo.png" style="float:left" width=125 height=125></img>
 <h2>dc.js - Dimensional Charting Javascript Library</h2>
 
+
 <p>
     dc.js is a javascript charting library with native <a href="http://square.github.com/crossfilter/">crossfilter</a>
     support and allowing highly efficient exploration on large multi-dimensional dataset (inspired by crossfilter's