Merge pull request #425 from EverythingMe/new_logo

New logo
getredash · May 12, 2015 · 4e76c13 · 4e76c13
2 parents fc1e387 + 36ef388
commit 4e76c13
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 3 deletions.
diff --git a/rd_ui/app/images/favicon-16x16.png b/rd_ui/app/images/favicon-16x16.png
diff --git a/rd_ui/app/images/favicon-32x32.png b/rd_ui/app/images/favicon-32x32.png
diff --git a/rd_ui/app/images/favicon-96x96.png b/rd_ui/app/images/favicon-96x96.png
diff --git a/rd_ui/app/images/redash_icon_small.png b/rd_ui/app/images/redash_icon_small.png
diff --git a/rd_ui/app/index.html b/rd_ui/app/index.html
@@ -21,6 +21,11 @@
     <link rel="stylesheet" href="/bower_components/codemirror/addon/hint/show-hint.css">
     <link rel="stylesheet" href="/styles/redash.css">
     <!-- endbuild -->
+
+    <link rel="icon" type="image/png" sizes="32x32" href="/images/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="96x96" href="/images/favicon-96x96.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/images/favicon-16x16.png">
+
 </head>
 <body>
 <div growl></div>
@@ -34,7 +39,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
         </button>
-        <a class="navbar-brand" href="/"><strong>{{name}}</strong></a>
+        <a class="navbar-brand" href="/"><img src="/images/redash_icon_small.png"/></a>
     </div>
     {% raw %}
     <div class="collapse navbar-collapse navbar-ex1-collapse">

diff --git a/rd_ui/app/styles/redash.css b/rd_ui/app/styles/redash.css
@@ -14,7 +14,12 @@ a.page-title {
 }
 
 a.navbar-brand {
-    font-style: italic;
+    padding: 5px 5px 0px 0px;
+    margin-left: 0px !important;
+}
+
+a.navbar-brand img {
+    height: 40px;
 }
 
 .graph {

diff --git a/rd_ui/favicon.ico b/rd_ui/favicon.ico
diff --git a/redash/__init__.py b/redash/__init__.py
@@ -6,7 +6,7 @@
 from redash import settings
 from redash.query_runner import import_query_runners
 
-__version__ = '0.6.0'
+__version__ = '0.6.1'
 
 
 def setup_logging():