steve
/
mybuddy
mirror of https://github.com/snachodog/mybuddy.git
1
0
Fork 0
Code Issues 3 Packages Projects 1 Releases Wiki Activity

Use logo in app.

This commit is contained in:
Christopher Charbonneau Wells 2018-05-20 15:59:45 -07:00
parent f59bbc03df
commit 2bc9d4703d
5 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
babybuddy/static_src/logo/icon-brand.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

2
babybuddy/static_src/scss/themes/blueorange.scss
View File

@ -4,7 +4,7 @@
// Color system // Color system
// //
$blue: #236e96; $blue: #226f97;
$indigo: #472395; $indigo: #472395;
$purple: #712395; $purple: #712395;
$pink: #952393; $pink: #952393;

7
babybuddy/templates/babybuddy/nav-dropdown.html
View File

@ -1,9 +1,12 @@
{% extends 'babybuddy/base.html' %} {% extends 'babybuddy/base.html' %}
{% load babybuddy_tags timers %} {% load babybuddy_tags static timers %}
{% block nav %} {% block nav %}
<nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top"> <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"> <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> <a class="text-success mr-2" href="{% url 'core:timer-add-quick' %}"><i class="icon icon-2x icon-timer" aria-hidden="true"></i></a>

4
gulpfile.js/config.js
View File

@ -19,6 +19,10 @@ module.exports = {
dest: basePath + 'img/', dest: basePath + 'img/',
files: '**/static_src/img/**/*' files: '**/static_src/img/**/*'
}, },
logo: {
dest: basePath + 'logo/',
files: 'babybuddy/static_src/logo/**/*'
},
root: { root: {
dest: basePath + 'root/', dest: basePath + 'root/',
files: 'babybuddy/static_src/root/*' files: 'babybuddy/static_src/root/*'

10
gulpfile.js/tasks/extras.js
View File

@ -6,7 +6,7 @@ var pump = require('pump');
var extrasConfig = require('../config.js').extrasConfig; 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) { gulp.task('extras:fonts', function(cb) {
pump([ pump([
@ -23,6 +23,14 @@ gulp.task('extras:images', function(cb) {
], 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) { gulp.task('extras:root', function(cb) {
pump([ pump([
gulp.src(extrasConfig.root.files), gulp.src(extrasConfig.root.files),