diff --git a/footer.php b/footer.php index d4e57c6..be94d8a 100644 --- a/footer.php +++ b/footer.php @@ -9,15 +9,67 @@ */ ?> - - - + + diff --git a/functions.php b/functions.php index 7a6354b..5bf0c81 100644 --- a/functions.php +++ b/functions.php @@ -1,7 +1,7 @@ { console.log(e); }), -// )) -// .pipe($.if(REVISIONING && PRODUCTION || REVISIONING && DEV, $.rev())) -// .pipe(gulp.dest(PATHS.dist + '/assets/js')) -// .pipe($.if(REVISIONING && PRODUCTION || REVISIONING && DEV, $.rev.manifest())) -// .pipe(gulp.dest(PATHS.dist + '/assets/js')); -// }, -// -// watch() { -// const watchConfig = Object.assign(webpack.config, { -// watch: true, -// devtool: 'inline-source-map', -// }); -// -// return gulp.src(PATHS.entries) -// .pipe(named()) -// .pipe(webpackStream(watchConfig, webpack2, webpack.changeHandler) -// .on('error', (err) => { -// log('[webpack:error]', err.toString({ -// colors: true, -// })); -// }), -// ) -// .pipe(gulp.dest(PATHS.dist + '/assets/js')); -// }, -//}; -// -//gulp.task('webpack:build', webpack.build); -//gulp.task('webpack:watch', webpack.watch); - // Combine JavaScript into one file // In production, the file is minified function javascript() { @@ -302,6 +207,8 @@ function images() { }) ]))) .pipe(gulp.dest(PATHS.dist + '/assets/images')); +} +function img() { return gulp.src('src/assets/img/**/*') .pipe($.if(PRODUCTION, $.imagemin([ $.imagemin.jpegtran({ @@ -357,18 +264,6 @@ gulp.task('phpcbf', function () { .pipe(gulp.dest('.')); }); -// Start BrowserSync to preview the site in -//function server(done) { -// browser.init({ -// proxy: BROWSERSYNC.url, -// -// ui: { -// port: 8080 -// }, -// -// }); -// done(); -//} // Start a server with BrowserSync to preview the site in function server(done) { browser.init({ @@ -386,47 +281,32 @@ function reload(done) { // Watch for changes to static assets, pages, Sass, and JavaScript function watch() { gulp.watch(PATHS.assets, copy); -// gulp.watch('src/assets/scss/**/*.scss', sass) -// .on('change', path => log('File ' + colors.bold(colors.magenta(path)) + ' changed.')) -// .on('unlink', path => log('File ' + colors.bold(colors.magenta(path)) + ' was removed.')); +// gulp.watch('src/assets/scss/**/*.scss').on('all', sass); + gulp.watch('src/assets/scss/**/*.scss', sass) + .on('change', path => log('File ' + colors.bold(colors.magenta(path)) + ' changed.')) + .on('unlink', path => log('File ' + colors.bold(colors.magenta(path)) + ' was removed.')); + gulp.watch('src/assets/images/**/*').on('all', gulp.series(images, browser.reload)); + gulp.watch('src/assets/img/**/*').on('all', gulp.series(img, browser.reload)); + gulp.watch('src/assets/js/**/*.js').on('all', gulp.series(javascript, browser.reload)); gulp.watch('**/*.php', reload) .on('change', path => log('File ' + colors.bold(colors.magenta(path)) + ' changed.')) .on('unlink', path => log('File ' + colors.bold(colors.magenta(path)) + ' was removed.')); - gulp.watch('src/assets/images/**/*', gulp.series(images, reload)); -//} -// Watch for changes to static assets, pages, Sass, and JavaScript -//function watch() { -// gulp.watch(PATHS.assets, copy); // gulp.watch('src/pages/**/*.html').on('all', gulp.series(pages, browser.reload)); // gulp.watch('src/{layouts,partials}/**/*.html').on('all', gulp.series(resetPages, pages, browser.reload)); // gulp.watch('src/data/**/*.{js,json,yml}').on('all', gulp.series(resetPages, pages, browser.reload)); // gulp.watch('src/helpers/**/*.js').on('all', gulp.series(resetPages, pages, browser.reload)); - gulp.watch('src/assets/scss/**/*.scss').on('all', sass); - gulp.watch('src/assets/js/**/*.js').on('all', gulp.series(javascript, browser.reload)); - gulp.watch('src/assets/img/**/*').on('all', gulp.series(images, browser.reload)); // gulp.watch('src/styleguide/**').on('all', gulp.series(styleGuide, browser.reload)); } // Build the "dist" folder by running all of the below tasks gulp.task('build', - //gulp.series(clean, gulp.parallel(sass, 'webpack:build', images, copy))); - gulp.series(clean, gulp.parallel(javascript, images), sass)); + gulp.series(clean, gulp.parallel(javascript, images, img,copy), sass)); // Build the site, run the server, and watch for file changes gulp.task('default', - //gulp.series('build', server, gulp.parallel('webpack:watch', watch))); gulp.series('build', server, watch)); // Package task gulp.task('package', gulp.series('build', archive)); -// Build the "dist" folder by running all of the below tasks -// Sass must be run later so UnCSS can search for used classes in the others assets. -//gulp.task('build', - //gulp.series(clean, gulp.parallel(pages, javascript, images, copy), sass, styleGuide)); - -// Build the site, run the server, and watch for file changes -//gulp.task('default', -// gulp.series('build', server, watch)); - diff --git a/header.php b/header.php index 37d892e..6499f3f 100644 --- a/header.php +++ b/header.php @@ -18,33 +18,21 @@ > - - - - - diff --git a/index.php b/index.php index e0414ec..679dcc3 100644 --- a/index.php +++ b/index.php @@ -15,9 +15,8 @@ get_header(); ?> -
-
-
+
+
@@ -43,8 +42,7 @@ get_header(); ?>
+ -
-
false, +// 'menu_class' => 'dropdown menu desktop-menu', +// 'items_wrap' => '', +// 'theme_location' => 'top-bar-r', +// 'depth' => 3, +// 'fallback_cb' => false, +// 'walker' => new Foundationpress_Top_Bar_Walker(), +// ) +// ); +// } +//} if ( ! function_exists( 'foundationpress_top_bar_r' ) ) { function foundationpress_top_bar_r() { wp_nav_menu( array( 'container' => false, - 'menu_class' => 'dropdown menu desktop-menu', - 'items_wrap' => '', + 'menu_class' => 'menu', + 'items_wrap' => '', 'theme_location' => 'top-bar-r', 'depth' => 3, 'fallback_cb' => false, @@ -40,21 +55,22 @@ if ( ! function_exists( 'foundationpress_top_bar_r' ) ) { /** * Mobile navigation - topbar (default) or offcanvas */ -if ( ! function_exists( 'foundationpress_mobile_nav' ) ) { - function foundationpress_mobile_nav() { - wp_nav_menu( - array( - 'container' => false, // Remove nav container - 'menu' => __( 'mobile-nav', 'foundationpress' ), - 'menu_class' => 'vertical menu', - 'theme_location' => 'mobile-nav', - 'items_wrap' => '', - 'fallback_cb' => false, - 'walker' => new Foundationpress_Mobile_Walker(), - ) - ); - } -} +//if ( ! function_exists( 'foundationpress_mobile_nav' ) ) { +// function foundationpress_mobile_nav() { +// wp_nav_menu( +// array( +// 'container' => false, // Remove nav container +// 'menu' => __( 'mobile-nav', 'foundationpress' ), +// 'menu_class' => 'vertical menu', +// 'theme_location' => 'mobile-nav', +// 'items_wrap' => '', +// 'fallback_cb' => false, +// 'walker' => new Foundationpress_Mobile_Walker(), +// ) +// ); +// } +//} + /** diff --git a/404.php b/originalPHPfiles/404.php similarity index 100% rename from 404.php rename to originalPHPfiles/404.php diff --git a/archive.php b/originalPHPfiles/archive.php similarity index 100% rename from archive.php rename to originalPHPfiles/archive.php diff --git a/comments.php b/originalPHPfiles/comments.php similarity index 100% rename from comments.php rename to originalPHPfiles/comments.php diff --git a/originalPHPfiles/footer.php b/originalPHPfiles/footer.php new file mode 100644 index 0000000..d4e57c6 --- /dev/null +++ b/originalPHPfiles/footer.php @@ -0,0 +1,24 @@ + + + + + + + + + + + diff --git a/originalPHPfiles/functions.php b/originalPHPfiles/functions.php new file mode 100644 index 0000000..7a6354b --- /dev/null +++ b/originalPHPfiles/functions.php @@ -0,0 +1,58 @@ + + + > + + + + + + > + + + + + + diff --git a/originalPHPfiles/index.php b/originalPHPfiles/index.php new file mode 100644 index 0000000..e0414ec --- /dev/null +++ b/originalPHPfiles/index.php @@ -0,0 +1,50 @@ + + +
+
+
+ + + + + + + + + + + + + + + + + +
+ + +
+
+ + diff --git a/single.php b/originalPHPfiles/single.php similarity index 100% rename from single.php rename to originalPHPfiles/single.php diff --git a/woocommerce.php b/originalPHPfiles/woocommerce.php similarity index 100% rename from woocommerce.php rename to originalPHPfiles/woocommerce.php diff --git a/sidebar.php b/sidebar.php index 8b52ae3..ad3efc9 100644 --- a/sidebar.php +++ b/sidebar.php @@ -1,6 +1,6 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/imgexample/img0001.jpg b/src/assets/imgexample/img0001.jpg deleted file mode 100644 index 0b69d3a..0000000 Binary files a/src/assets/imgexample/img0001.jpg and /dev/null differ diff --git a/src/assets/imgexample/img0002.jpg b/src/assets/imgexample/img0002.jpg deleted file mode 100644 index df2bf72..0000000 Binary files a/src/assets/imgexample/img0002.jpg and /dev/null differ diff --git a/src/assets/imgexample/img0003.jpg b/src/assets/imgexample/img0003.jpg deleted file mode 100644 index 617d318..0000000 Binary files a/src/assets/imgexample/img0003.jpg and /dev/null differ diff --git a/src/assets/imgexample/img0004.jpg b/src/assets/imgexample/img0004.jpg deleted file mode 100644 index c9b964e..0000000 Binary files a/src/assets/imgexample/img0004.jpg and /dev/null differ diff --git a/src/assets/scss/global/_branding.scss b/src/assets/scss/global/_branding.scss index e22bc6c..3a53740 100644 --- a/src/assets/scss/global/_branding.scss +++ b/src/assets/scss/global/_branding.scss @@ -1,9 +1,27 @@ .brand-logo,.site-brand { - .site-name { + .site-name,.site-description { display: none; } - .logo { - max-width: 10rem; + &::before { + content: ''; + display:inline-block; + margin-top:-$global-padding; + width: 100%; + height: $global-padding*5; + background-size: contain; + background-repeat: no-repeat; + background-position: center; + } + &.archive{ + &::before { + max-width: 10rem; + background-image: url('../img/ARC-HIVE-logo.svg'); + } + } + &.eu{ + &::before { + max-width: 15rem; + background-image: url('../img/eu_flag_creative_europe_co_funded_black_right.svg'); + } } } - diff --git a/src/assets/scss/modules/_footer.scss b/src/assets/scss/modules/_footer.scss index 8b38128..4468e97 100644 --- a/src/assets/scss/modules/_footer.scss +++ b/src/assets/scss/modules/_footer.scss @@ -1,10 +1,6 @@ @include breakpoint(small) { footer { - // @include xy-grid-container(); background-color: $secondary-color; - //.h1,.h2,.h3,.h4,.h5,.h6 { - //font-variant:all-small-caps; - //} a { color: $body-font-color; &:hover { diff --git a/src/assets/scss/modules/_header.scss b/src/assets/scss/modules/_header.scss index 40d0939..42f7f9f 100644 --- a/src/assets/scss/modules/_header.scss +++ b/src/assets/scss/modules/_header.scss @@ -5,6 +5,7 @@ @include xy-cell(shrink); @include flex-align(left, middle); padding: $global-padding*2; + min-width: 14rem; } nav { @include xy-cell(auto); diff --git a/template-parts/content.php b/template-parts/content.php index f5c759b..bd180e0 100644 --- a/template-parts/content.php +++ b/template-parts/content.php @@ -19,7 +19,7 @@ the_title( '

', '

' ); } ?> - +