diff --git a/.gitignore b/.gitignore index aafef6a..96abb00 100644 --- a/.gitignore +++ b/.gitignore @@ -63,8 +63,7 @@ data/ node_modules/ # Compiled assets -public/css/ -public/js/ +public/*/ # Ignore production configuration files to protect against credential leaks config/production.yaml diff --git a/assets/img/app-logo.png b/assets/img/app-logo.png new file mode 100644 index 0000000..7ff358b Binary files /dev/null and b/assets/img/app-logo.png differ diff --git a/assets/img/favicon.png b/assets/img/favicon.png new file mode 100644 index 0000000..f60080b Binary files /dev/null and b/assets/img/favicon.png differ diff --git a/assets/styles/rimmington.sass b/assets/styles/rimmington.sass index d13a0f3..24a8b1c 100644 --- a/assets/styles/rimmington.sass +++ b/assets/styles/rimmington.sass @@ -19,3 +19,12 @@ table padding: 1.5rem 2rem border: 1px solid #bbb border-radius: 8px + +#main-nav + li + a + font-size: 1.25rem + +#site-title + img + max-height: 40px diff --git a/gulpfile.js b/gulpfile.js index 3002acc..ab3df1e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -20,16 +20,23 @@ function compileCoffee() { .pipe(gulp.dest('public/js', { sourcemaps: '.' })); } +// Copy image files to public/img/ +function copyImages() { + return gulp.src('assets/img/**/*', {encoding: false}) + .pipe(gulp.dest('public/img/')); +} + // Watch files for changes function watchFiles(cb) { gulp.watch('assets/styles/**/*.sass', compileSass); gulp.watch('assets/scripts/**/*.coffee', compileCoffee); + gulp.watch('assets/img/**/*', copyImages) cb(); } // Chain all asset builds together function buildAssets() { - return gulp.parallel(compileSass, compileCoffee); + return gulp.parallel(compileSass, compileCoffee, copyImages); } // Perform initial build then watch diff --git a/views/layout.erb b/views/layout.erb index 314410f..2911076 100644 --- a/views/layout.erb +++ b/views/layout.erb @@ -4,6 +4,7 @@ + <%= title %> | Game Data diff --git a/views/partials/navbar.erb b/views/partials/navbar.erb index f396e5a..fe8ad1a 100644 --- a/views/partials/navbar.erb +++ b/views/partials/navbar.erb @@ -1,6 +1,9 @@