A logo on the navbar

apache · Apr 4, 2016 · 6f96252 · 6f96252
1 parent 0b93fd3
commit 6f96252
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/caravel/assets/images/caravel_logo.png b/caravel/assets/images/caravel_logo.png
diff --git a/caravel/templates/appbuilder/navbar.html b/caravel/templates/appbuilder/navbar.html
@@ -12,15 +12,13 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            {% if appbuilder.app_icon %}
-                <a class="navbar-brand" style="padding:10px;" href="{{appbuilder.get_url_for_index}}">
-                  <img width="30" src="{{appbuilder.app_icon}}">
+                <a class="navbar-brand" style="padding:7px;opacity:0.9;" href="{{appbuilder.get_url_for_index}}">
+                  <img width="50" src="/static/assets/images/caravel_logo.png">
                 </a>
-            {% endif %}
                 <span class="navbar-brand">
-                <a href="{{appbuilder.get_url_for_index}}">
-                  {{ appbuilder.app_name }}
-                </a>
+                  <a href="{{appbuilder.get_url_for_index}}">
+                    {{ appbuilder.app_name }}
+                  </a>
                 </span>
         </div>
         <div class="navbar-collapse collapse">

diff --git a/caravel/templates/caravel/welcome.html b/caravel/templates/caravel/welcome.html
@@ -10,7 +10,7 @@
 {% block body %}
 <div class="container welcome">
   <div class="header">
-    <h3><i class='fa fa-star'></i> Welcome!</h3>
+    <h3>Welcome!</h3>
   </div>
   <hr/>
   <div id="cal-heatmap"></div>