Use logo in app.

babybuddy · May 20, 2018 · 2bc9d47 · 2bc9d47
1 parent f59bbc0
commit 2bc9d47
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/babybuddy/static_src/logo/icon-brand.png b/babybuddy/static_src/logo/icon-brand.png
diff --git a/babybuddy/static_src/scss/themes/blueorange.scss b/babybuddy/static_src/scss/themes/blueorange.scss
@@ -4,7 +4,7 @@
 // Color system
 //
 
-$blue: #236e96;
+$blue: #226f97;
 $indigo: #472395;
 $purple: #712395;
 $pink: #952393;

diff --git a/babybuddy/templates/babybuddy/nav-dropdown.html b/babybuddy/templates/babybuddy/nav-dropdown.html
@@ -1,9 +1,12 @@
 {% extends 'babybuddy/base.html' %}
-{% load babybuddy_tags timers %}
+{% load babybuddy_tags static timers %}
 
 {% block nav %}
     <nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top">
-        <a class="navbar-brand" href="/"><span class="text-info">Baby</span> Buddy</a>
+        <a class="navbar-brand" href="/">
+            <img src="{% static "babybuddy/logo/icon-brand.png" %}" width="30" height="30" class="d-inline-block align-top" alt="">
+            <span class="text-primary">Baby</span> Buddy
+        </a>
 
         <div class="d-lg-none d-md-none ml-auto p-0 mr-2">
             <a class="text-success mr-2" href="{% url 'core:timer-add-quick' %}"><i class="icon icon-2x icon-timer" aria-hidden="true"></i></a>

diff --git a/gulpfile.js/config.js b/gulpfile.js/config.js
@@ -19,6 +19,10 @@ module.exports = {
             dest: basePath + 'img/',
             files: '**/static_src/img/**/*'
         },
+        logo: {
+            dest: basePath + 'logo/',
+            files: 'babybuddy/static_src/logo/**/*'
+        },
         root: {
             dest: basePath + 'root/',
             files: 'babybuddy/static_src/root/*'

diff --git a/gulpfile.js/tasks/extras.js b/gulpfile.js/tasks/extras.js
@@ -6,7 +6,7 @@ var pump = require('pump');
 var extrasConfig = require('../config.js').extrasConfig;
 
 
-gulp.task('extras', ['extras:fonts', 'extras:images', 'extras:root']);
+gulp.task('extras', ['extras:fonts', 'extras:images', 'extras:logo', 'extras:root']);
 
 gulp.task('extras:fonts', function(cb) {
     pump([
@@ -23,6 +23,14 @@ gulp.task('extras:images', function(cb) {
     ], cb);
 });
 
+gulp.task('extras:logo', function(cb) {
+    pump([
+        gulp.src(extrasConfig.logo.files),
+        flatten({ subPath: 3 }),
+        gulp.dest(extrasConfig.logo.dest)
+    ], cb);
+});
+
 gulp.task('extras:root', function(cb) {
     pump([
         gulp.src(extrasConfig.root.files),