diff --git a/assets_build/gulp/tasks/indices.js b/assets_build/gulp/tasks/indices.js index 809821d130494fd5c5157a95011fda396fe0669c..f912bb6a26c62dd0ab01a4d78cd0a25344f1590a 100644 --- a/assets_build/gulp/tasks/indices.js +++ b/assets_build/gulp/tasks/indices.js @@ -68,7 +68,7 @@ function buildingBlocksCategoryPages() { root: '_build/', layouts: 'assets_site/layouts/building-blocks/index', partials: 'assets_site/partials/', - data: 'src/data/', + data: 'assets_site/data/', helpers: 'assets_build/panini_helpers/' })) .pipe($.if(PRODUCTION, $.revTimestamp())) diff --git a/assets_build/gulp/tasks/meta.js b/assets_build/gulp/tasks/meta.js index d02d81b476971fdcd33b24615f8deae5e4e730da..e8a573279b9fbdb46526e355461dfa449dccf2bc 100644 --- a/assets_build/gulp/tasks/meta.js +++ b/assets_build/gulp/tasks/meta.js @@ -19,7 +19,7 @@ function loadConfig() { } function buildingBlockCombineMeta() { - return gulp.src('src/patterns/**/*.{yml,yaml}') + return gulp.src('content/patterns/**/*.{yml,yaml}') .pipe($.yaml()) .pipe($.jsoncombine('building-blocks.json', function(files) { var output = {}; @@ -60,7 +60,7 @@ function majorVersions(versions) { } function kitsInitial() { - return gulp.src('src/kits/**/*.{yml,yaml}') + return gulp.src('content/kits/**/*.{yml,yaml}') .pipe($.yaml()) .pipe($.jsoncombine('kits.json', function(files) { var output = {}; @@ -155,7 +155,7 @@ gulp.task('add-git-meta', function() { var output = {}; var dateRegex = /Date:\s+(.*)/; async.eachOf(data['building-blocks'], (value, key, callback) => { - var filename = 'src/patterns/' + key + '/' + key + '.yml'; + var filename = 'content/patterns/' + key + '/' + key + '.yml'; $.git.exec({args: 'log -n 1 ' + filename}, function(err, stdout) { if (err) throw err; output[key] = value; diff --git a/assets_build/gulp/tasks/pages.js b/assets_build/gulp/tasks/pages.js index 63b7a3176947210efbbd9bd6568ea81b1d6ce327..fcf847dc82339abdfbd04a3c8959909e26064f23 100644 --- a/assets_build/gulp/tasks/pages.js +++ b/assets_build/gulp/tasks/pages.js @@ -62,7 +62,7 @@ function defaultTemplate(filename, blockname) { // Create building block layouts function buildingBlockFrameLayouts() { - return gulp.src(['src/patterns/*', '!src/patterns/*.scss']) + return gulp.src(['content/patterns/*', '!content/patterns/*.scss']) .pipe($.foreach(function(stream, file) { var fileName = file.path.substr(file.path.lastIndexOf(path.sep) + 1); var layout = file.path + "/layout.html"; @@ -85,8 +85,8 @@ function buildingBlockIframe() { .pipe(getNewPanini({ root: PATHS.build, layouts: 'assets_site/layouts/building-blocks/iframe/', - partials: 'src/patterns/*', - data: ['src/data/', PATHS.build + '/data'], + partials: 'content/patterns/*', + data: ['assets_site/data/', PATHS.build + '/data'], helpers: 'assets_build/panini_helpers/' })) .pipe($.rename(function (path) { @@ -103,7 +103,7 @@ function buildingBlockPage() { root: PATHS.build, layouts: 'assets_site/layouts/building-blocks/page/', partials: 'assets_site/partials', - data: ['src/data/', PATHS.build + '/data'], + data: ['assets_site/data/', PATHS.build + '/data'], helpers: 'assets_build/panini_helpers/' })) .pipe($.if(PRODUCTION, $.revTimestamp())) @@ -122,7 +122,7 @@ function kitsPages() { root: PATHS.build, layouts: 'assets_site/layouts/kits/page/', partials: 'assets_site/partials', - data: ['src/data/', PATHS.build + '/data'], + data: ['assets_site/data/', PATHS.build + '/data'], helpers: 'assets_build/panini_helpers/' })) .pipe($.if(PRODUCTION, $.revTimestamp())) diff --git a/assets_build/panini_helpers/bb-html.js b/assets_build/panini_helpers/bb-html.js index 26567b8bfba970fd7461280652e95bef946ba93b..ecf11e82d8eddc12a3bb977b7a9caa848914ee13 100644 --- a/assets_build/panini_helpers/bb-html.js +++ b/assets_build/panini_helpers/bb-html.js @@ -3,7 +3,7 @@ module.exports = function(page) { if(page) { var baseName = page.split('.')[0] try { - return fs.readFileSync('src/patterns/' + baseName + "/" + baseName + '.html', 'utf-8'); + return fs.readFileSync('content/patterns/' + baseName + "/" + baseName + '.html', 'utf-8'); } catch(ex) { return ''; } diff --git a/assets_build/panini_helpers/bb-js.js b/assets_build/panini_helpers/bb-js.js index 009dcdbc3cc2d6e7f41f4c9ee203dd6e42d65555..5914a61f80d8711b59326d0d32d77129f2801006 100644 --- a/assets_build/panini_helpers/bb-js.js +++ b/assets_build/panini_helpers/bb-js.js @@ -3,7 +3,7 @@ module.exports = function(page) { try { if(page) { var baseName = page.split('.')[0] - return fs.readFileSync('src/patterns/' + baseName + "/" + baseName + '.js', 'utf-8'); + return fs.readFileSync('content/patterns/' + baseName + "/" + baseName + '.js', 'utf-8'); } } catch(ex) { diff --git a/assets_build/panini_helpers/bb-scss.js b/assets_build/panini_helpers/bb-scss.js index 4173d38d52f7de5e04b07453ab4287247c782092..a7979c0f167a0f36c87d0252d5dd6c7241466ffc 100644 --- a/assets_build/panini_helpers/bb-scss.js +++ b/assets_build/panini_helpers/bb-scss.js @@ -3,7 +3,7 @@ module.exports = function(page) { try { if(page) { var baseName = page.split('.')[0] - return fs.readFileSync('src/patterns/' + baseName + "/" + baseName + '.scss', 'utf-8'); + return fs.readFileSync('content/patterns/' + baseName + "/" + baseName + '.scss', 'utf-8'); } } catch(ex) { diff --git a/src/data/global.yml b/assets_site/data/global.yml similarity index 100% rename from src/data/global.yml rename to assets_site/data/global.yml diff --git a/config.yml b/config.yml index 42bb42054ebdface2829643c13cb86e61ab763c5..d8b41f98d409a001b87c2bbd364ee4ff5406cc52 100644 --- a/config.yml +++ b/config.yml @@ -10,7 +10,7 @@ COMPATIBILITY: # UnCSS will use these settings UNCSS_OPTIONS: html: - - "src/**/*.html" + - "content/**/*.html" ignore: - !!js/regexp .foundation-mq - !!js/regexp ^\.is-.* @@ -22,8 +22,8 @@ PATHS: build: "_build" # Paths to static assets that aren't images, CSS, or JavaScript assets: - - "src/assets/**/*" - - "!src/assets/{img,js,scss}/**/*" + - "content/assets/**/*" + - "!content/assets/{img,js,scss}/**/*" # Paths to Sass libraries, which can then be loaded with @import sass: - "node_modules/highlight.js/" diff --git a/src/assets/img/icons/bb-card-view.svg b/content/assets/img/icons/bb-card-view.svg similarity index 100% rename from src/assets/img/icons/bb-card-view.svg rename to content/assets/img/icons/bb-card-view.svg diff --git a/src/assets/img/icons/filter-all.svg b/content/assets/img/icons/filter-all.svg similarity index 100% rename from src/assets/img/icons/filter-all.svg rename to content/assets/img/icons/filter-all.svg diff --git a/src/assets/img/icons/filter-containers.svg b/content/assets/img/icons/filter-containers.svg similarity index 100% rename from src/assets/img/icons/filter-containers.svg rename to content/assets/img/icons/filter-containers.svg diff --git a/src/assets/img/icons/filter-control.svg b/content/assets/img/icons/filter-control.svg similarity index 100% rename from src/assets/img/icons/filter-control.svg rename to content/assets/img/icons/filter-control.svg diff --git a/src/assets/img/icons/filter-featured.svg b/content/assets/img/icons/filter-featured.svg similarity index 100% rename from src/assets/img/icons/filter-featured.svg rename to content/assets/img/icons/filter-featured.svg diff --git a/src/assets/img/icons/filter-forms.svg b/content/assets/img/icons/filter-forms.svg similarity index 100% rename from src/assets/img/icons/filter-forms.svg rename to content/assets/img/icons/filter-forms.svg diff --git a/src/assets/img/icons/filter-media.png b/content/assets/img/icons/filter-media.png similarity index 100% rename from src/assets/img/icons/filter-media.png rename to content/assets/img/icons/filter-media.png diff --git a/src/assets/img/icons/filter-media.svg b/content/assets/img/icons/filter-media.svg similarity index 100% rename from src/assets/img/icons/filter-media.svg rename to content/assets/img/icons/filter-media.svg diff --git a/src/assets/img/icons/filter-navigation.svg b/content/assets/img/icons/filter-navigation.svg similarity index 100% rename from src/assets/img/icons/filter-navigation.svg rename to content/assets/img/icons/filter-navigation.svg diff --git a/src/assets/img/icons/filter-search.svg b/content/assets/img/icons/filter-search.svg similarity index 100% rename from src/assets/img/icons/filter-search.svg rename to content/assets/img/icons/filter-search.svg diff --git a/src/assets/img/icons/filter-status.svg b/content/assets/img/icons/filter-status.svg similarity index 100% rename from src/assets/img/icons/filter-status.svg rename to content/assets/img/icons/filter-status.svg diff --git a/src/assets/img/icons/help.svg b/content/assets/img/icons/help.svg similarity index 100% rename from src/assets/img/icons/help.svg rename to content/assets/img/icons/help.svg diff --git a/src/assets/img/icons/like.svg b/content/assets/img/icons/like.svg similarity index 100% rename from src/assets/img/icons/like.svg rename to content/assets/img/icons/like.svg diff --git a/src/assets/img/icons/menu-grey.png b/content/assets/img/icons/menu-grey.png similarity index 100% rename from src/assets/img/icons/menu-grey.png rename to content/assets/img/icons/menu-grey.png diff --git a/src/assets/img/icons/mobile-categories.svg b/content/assets/img/icons/mobile-categories.svg similarity index 100% rename from src/assets/img/icons/mobile-categories.svg rename to content/assets/img/icons/mobile-categories.svg diff --git a/src/assets/img/icons/mobile-filter.svg b/content/assets/img/icons/mobile-filter.svg similarity index 100% rename from src/assets/img/icons/mobile-filter.svg rename to content/assets/img/icons/mobile-filter.svg diff --git a/src/assets/img/icons/pagination-ellipsis.svg b/content/assets/img/icons/pagination-ellipsis.svg similarity index 100% rename from src/assets/img/icons/pagination-ellipsis.svg rename to content/assets/img/icons/pagination-ellipsis.svg diff --git a/src/assets/img/icons/pagination-next.svg b/content/assets/img/icons/pagination-next.svg similarity index 100% rename from src/assets/img/icons/pagination-next.svg rename to content/assets/img/icons/pagination-next.svg diff --git a/src/assets/img/icons/pagination-previous.svg b/content/assets/img/icons/pagination-previous.svg similarity index 100% rename from src/assets/img/icons/pagination-previous.svg rename to content/assets/img/icons/pagination-previous.svg diff --git a/src/assets/img/icons/search-close.svg b/content/assets/img/icons/search-close.svg similarity index 100% rename from src/assets/img/icons/search-close.svg rename to content/assets/img/icons/search-close.svg diff --git a/src/assets/img/icons/three-dots.svg b/content/assets/img/icons/three-dots.svg similarity index 100% rename from src/assets/img/icons/three-dots.svg rename to content/assets/img/icons/three-dots.svg diff --git a/src/assets/img/icons/vertical-line.svg b/content/assets/img/icons/vertical-line.svg similarity index 100% rename from src/assets/img/icons/vertical-line.svg rename to content/assets/img/icons/vertical-line.svg diff --git a/src/assets/img/icons/youtube.png b/content/assets/img/icons/youtube.png similarity index 100% rename from src/assets/img/icons/youtube.png rename to content/assets/img/icons/youtube.png diff --git a/src/assets/img/images/cli-lesson-thumb.png b/content/assets/img/images/cli-lesson-thumb.png similarity index 100% rename from src/assets/img/images/cli-lesson-thumb.png rename to content/assets/img/images/cli-lesson-thumb.png diff --git a/src/assets/img/images/copy-section.png b/content/assets/img/images/copy-section.png similarity index 100% rename from src/assets/img/images/copy-section.png rename to content/assets/img/images/copy-section.png diff --git a/src/assets/img/images/css-section.png b/content/assets/img/images/css-section.png similarity index 100% rename from src/assets/img/images/css-section.png rename to content/assets/img/images/css-section.png diff --git a/src/assets/img/images/docs-thumb.png b/content/assets/img/images/docs-thumb.png similarity index 100% rename from src/assets/img/images/docs-thumb.png rename to content/assets/img/images/docs-thumb.png diff --git a/src/assets/img/images/howto-layeredbb.png b/content/assets/img/images/howto-layeredbb.png similarity index 100% rename from src/assets/img/images/howto-layeredbb.png rename to content/assets/img/images/howto-layeredbb.png diff --git a/src/assets/img/images/howto-layouthtml.png b/content/assets/img/images/howto-layouthtml.png similarity index 100% rename from src/assets/img/images/howto-layouthtml.png rename to content/assets/img/images/howto-layouthtml.png diff --git a/src/assets/img/images/howto-layoutscss.png b/content/assets/img/images/howto-layoutscss.png similarity index 100% rename from src/assets/img/images/howto-layoutscss.png rename to content/assets/img/images/howto-layoutscss.png diff --git a/src/assets/img/images/howto-previewimgexample.png b/content/assets/img/images/howto-previewimgexample.png similarity index 100% rename from src/assets/img/images/howto-previewimgexample.png rename to content/assets/img/images/howto-previewimgexample.png diff --git a/src/assets/img/images/top-section.png b/content/assets/img/images/top-section.png similarity index 100% rename from src/assets/img/images/top-section.png rename to content/assets/img/images/top-section.png diff --git a/src/assets/img/images/zurbstack-lesson-thumb.png b/content/assets/img/images/zurbstack-lesson-thumb.png similarity index 100% rename from src/assets/img/images/zurbstack-lesson-thumb.png rename to content/assets/img/images/zurbstack-lesson-thumb.png diff --git a/src/kits/news/news-kit.jpg b/content/kits/news/news-kit.jpg similarity index 100% rename from src/kits/news/news-kit.jpg rename to content/kits/news/news-kit.jpg diff --git a/src/kits/news/news.yml b/content/kits/news/news.yml similarity index 100% rename from src/kits/news/news.yml rename to content/kits/news/news.yml diff --git a/src/patterns/animation/animation.html b/content/patterns/animation/animation.html similarity index 100% rename from src/patterns/animation/animation.html rename to content/patterns/animation/animation.html diff --git a/src/patterns/animation/animation.yml b/content/patterns/animation/animation.yml similarity index 100% rename from src/patterns/animation/animation.yml rename to content/patterns/animation/animation.yml diff --git a/src/patterns/animation/layout.html b/content/patterns/animation/layout.html similarity index 100% rename from src/patterns/animation/layout.html rename to content/patterns/animation/layout.html diff --git a/src/patterns/app-float.scss b/content/patterns/app-float.scss similarity index 100% rename from src/patterns/app-float.scss rename to content/patterns/app-float.scss diff --git a/src/patterns/app.scss b/content/patterns/app.scss similarity index 100% rename from src/patterns/app.scss rename to content/patterns/app.scss diff --git a/src/patterns/badges/badges.html b/content/patterns/badges/badges.html similarity index 100% rename from src/patterns/badges/badges.html rename to content/patterns/badges/badges.html diff --git a/src/patterns/badges/badges.png b/content/patterns/badges/badges.png similarity index 100% rename from src/patterns/badges/badges.png rename to content/patterns/badges/badges.png diff --git a/src/patterns/badges/badges.yml b/content/patterns/badges/badges.yml similarity index 100% rename from src/patterns/badges/badges.yml rename to content/patterns/badges/badges.yml diff --git a/src/patterns/badges/layout.html b/content/patterns/badges/layout.html similarity index 100% rename from src/patterns/badges/layout.html rename to content/patterns/badges/layout.html diff --git a/src/patterns/button-grid/button-grid.html b/content/patterns/button-grid/button-grid.html similarity index 100% rename from src/patterns/button-grid/button-grid.html rename to content/patterns/button-grid/button-grid.html diff --git a/src/patterns/button-grid/button-grid.yml b/content/patterns/button-grid/button-grid.yml similarity index 100% rename from src/patterns/button-grid/button-grid.yml rename to content/patterns/button-grid/button-grid.yml diff --git a/src/patterns/button-grid/layout.html b/content/patterns/button-grid/layout.html similarity index 100% rename from src/patterns/button-grid/layout.html rename to content/patterns/button-grid/layout.html diff --git a/src/patterns/code-highlighting/code-highlighting.html b/content/patterns/code-highlighting/code-highlighting.html similarity index 100% rename from src/patterns/code-highlighting/code-highlighting.html rename to content/patterns/code-highlighting/code-highlighting.html diff --git a/src/patterns/code-highlighting/code-highlighting.yml b/content/patterns/code-highlighting/code-highlighting.yml similarity index 100% rename from src/patterns/code-highlighting/code-highlighting.yml rename to content/patterns/code-highlighting/code-highlighting.yml diff --git a/src/patterns/code-highlighting/layout.html b/content/patterns/code-highlighting/layout.html similarity index 100% rename from src/patterns/code-highlighting/layout.html rename to content/patterns/code-highlighting/layout.html diff --git a/src/patterns/colors/colors.html b/content/patterns/colors/colors.html similarity index 100% rename from src/patterns/colors/colors.html rename to content/patterns/colors/colors.html diff --git a/src/patterns/colors/colors.png b/content/patterns/colors/colors.png similarity index 100% rename from src/patterns/colors/colors.png rename to content/patterns/colors/colors.png diff --git a/src/patterns/colors/colors.yml b/content/patterns/colors/colors.yml similarity index 100% rename from src/patterns/colors/colors.yml rename to content/patterns/colors/colors.yml diff --git a/src/patterns/colors/layout.html b/content/patterns/colors/layout.html similarity index 100% rename from src/patterns/colors/layout.html rename to content/patterns/colors/layout.html diff --git a/src/patterns/favicons/favicons.html b/content/patterns/favicons/favicons.html similarity index 100% rename from src/patterns/favicons/favicons.html rename to content/patterns/favicons/favicons.html diff --git a/src/patterns/favicons/favicons.yml b/content/patterns/favicons/favicons.yml similarity index 100% rename from src/patterns/favicons/favicons.yml rename to content/patterns/favicons/favicons.yml diff --git a/src/patterns/favicons/layout.html b/content/patterns/favicons/layout.html similarity index 100% rename from src/patterns/favicons/layout.html rename to content/patterns/favicons/layout.html diff --git a/src/patterns/formatting/formatting.html b/content/patterns/formatting/formatting.html similarity index 100% rename from src/patterns/formatting/formatting.html rename to content/patterns/formatting/formatting.html diff --git a/src/patterns/formatting/formatting.yml b/content/patterns/formatting/formatting.yml similarity index 100% rename from src/patterns/formatting/formatting.yml rename to content/patterns/formatting/formatting.yml diff --git a/src/patterns/formatting/layout.html b/content/patterns/formatting/layout.html similarity index 100% rename from src/patterns/formatting/layout.html rename to content/patterns/formatting/layout.html diff --git a/src/patterns/grid/grid.html b/content/patterns/grid/grid.html similarity index 100% rename from src/patterns/grid/grid.html rename to content/patterns/grid/grid.html diff --git a/src/patterns/grid/grid.yml b/content/patterns/grid/grid.yml similarity index 100% rename from src/patterns/grid/grid.yml rename to content/patterns/grid/grid.yml diff --git a/src/patterns/grid/layout.html b/content/patterns/grid/layout.html similarity index 100% rename from src/patterns/grid/layout.html rename to content/patterns/grid/layout.html diff --git a/src/patterns/headlines/headlines.html b/content/patterns/headlines/headlines.html similarity index 100% rename from src/patterns/headlines/headlines.html rename to content/patterns/headlines/headlines.html diff --git a/src/patterns/headlines/headlines.yml b/content/patterns/headlines/headlines.yml similarity index 100% rename from src/patterns/headlines/headlines.yml rename to content/patterns/headlines/headlines.yml diff --git a/src/patterns/headlines/layout.html b/content/patterns/headlines/layout.html similarity index 100% rename from src/patterns/headlines/layout.html rename to content/patterns/headlines/layout.html diff --git a/src/patterns/icons/icons.html b/content/patterns/icons/icons.html similarity index 100% rename from src/patterns/icons/icons.html rename to content/patterns/icons/icons.html diff --git a/src/patterns/icons/icons.yml b/content/patterns/icons/icons.yml similarity index 100% rename from src/patterns/icons/icons.yml rename to content/patterns/icons/icons.yml diff --git a/src/patterns/icons/layout.html b/content/patterns/icons/layout.html similarity index 100% rename from src/patterns/icons/layout.html rename to content/patterns/icons/layout.html diff --git a/src/patterns/image-overlays/image-overlays.html b/content/patterns/image-overlays/image-overlays.html similarity index 100% rename from src/patterns/image-overlays/image-overlays.html rename to content/patterns/image-overlays/image-overlays.html diff --git a/src/patterns/image-overlays/image-overlays.yml b/content/patterns/image-overlays/image-overlays.yml similarity index 100% rename from src/patterns/image-overlays/image-overlays.yml rename to content/patterns/image-overlays/image-overlays.yml diff --git a/src/patterns/image-overlays/layout.html b/content/patterns/image-overlays/layout.html similarity index 100% rename from src/patterns/image-overlays/layout.html rename to content/patterns/image-overlays/layout.html diff --git a/src/patterns/image-shortcuts/image-shortcuts.html b/content/patterns/image-shortcuts/image-shortcuts.html similarity index 100% rename from src/patterns/image-shortcuts/image-shortcuts.html rename to content/patterns/image-shortcuts/image-shortcuts.html diff --git a/src/patterns/image-shortcuts/image-shortcuts.yml b/content/patterns/image-shortcuts/image-shortcuts.yml similarity index 100% rename from src/patterns/image-shortcuts/image-shortcuts.yml rename to content/patterns/image-shortcuts/image-shortcuts.yml diff --git a/src/patterns/image-shortcuts/layout.html b/content/patterns/image-shortcuts/layout.html similarity index 100% rename from src/patterns/image-shortcuts/layout.html rename to content/patterns/image-shortcuts/layout.html diff --git a/src/patterns/images/images.html b/content/patterns/images/images.html similarity index 100% rename from src/patterns/images/images.html rename to content/patterns/images/images.html diff --git a/src/patterns/images/images.yml b/content/patterns/images/images.yml similarity index 100% rename from src/patterns/images/images.yml rename to content/patterns/images/images.yml diff --git a/src/patterns/images/layout.html b/content/patterns/images/layout.html similarity index 100% rename from src/patterns/images/layout.html rename to content/patterns/images/layout.html diff --git a/src/patterns/intro-unit/intro-unit.html b/content/patterns/intro-unit/intro-unit.html similarity index 100% rename from src/patterns/intro-unit/intro-unit.html rename to content/patterns/intro-unit/intro-unit.html diff --git a/src/patterns/intro-unit/intro-unit.yml b/content/patterns/intro-unit/intro-unit.yml similarity index 100% rename from src/patterns/intro-unit/intro-unit.yml rename to content/patterns/intro-unit/intro-unit.yml diff --git a/src/patterns/intro-unit/layout.html b/content/patterns/intro-unit/layout.html similarity index 100% rename from src/patterns/intro-unit/layout.html rename to content/patterns/intro-unit/layout.html diff --git a/src/patterns/labels/labels.html b/content/patterns/labels/labels.html similarity index 100% rename from src/patterns/labels/labels.html rename to content/patterns/labels/labels.html diff --git a/src/patterns/labels/labels.yml b/content/patterns/labels/labels.yml similarity index 100% rename from src/patterns/labels/labels.yml rename to content/patterns/labels/labels.yml diff --git a/src/patterns/labels/layout.html b/content/patterns/labels/layout.html similarity index 100% rename from src/patterns/labels/layout.html rename to content/patterns/labels/layout.html diff --git a/src/patterns/lists-pulse/layout.html b/content/patterns/lists-pulse/layout.html similarity index 100% rename from src/patterns/lists-pulse/layout.html rename to content/patterns/lists-pulse/layout.html diff --git a/src/patterns/lists-pulse/lists-pulse.html b/content/patterns/lists-pulse/lists-pulse.html similarity index 100% rename from src/patterns/lists-pulse/lists-pulse.html rename to content/patterns/lists-pulse/lists-pulse.html diff --git a/src/patterns/lists-pulse/lists-pulse.yml b/content/patterns/lists-pulse/lists-pulse.yml similarity index 100% rename from src/patterns/lists-pulse/lists-pulse.yml rename to content/patterns/lists-pulse/lists-pulse.yml diff --git a/src/patterns/lists/layout.html b/content/patterns/lists/layout.html similarity index 100% rename from src/patterns/lists/layout.html rename to content/patterns/lists/layout.html diff --git a/src/patterns/lists/lists.html b/content/patterns/lists/lists.html similarity index 100% rename from src/patterns/lists/lists.html rename to content/patterns/lists/lists.html diff --git a/src/patterns/lists/lists.yml b/content/patterns/lists/lists.yml similarity index 100% rename from src/patterns/lists/lists.yml rename to content/patterns/lists/lists.yml diff --git a/src/patterns/live-filter/layout.html b/content/patterns/live-filter/layout.html similarity index 100% rename from src/patterns/live-filter/layout.html rename to content/patterns/live-filter/layout.html diff --git a/src/patterns/live-filter/live-filter.html b/content/patterns/live-filter/live-filter.html similarity index 100% rename from src/patterns/live-filter/live-filter.html rename to content/patterns/live-filter/live-filter.html diff --git a/src/patterns/live-filter/live-filter.js b/content/patterns/live-filter/live-filter.js similarity index 100% rename from src/patterns/live-filter/live-filter.js rename to content/patterns/live-filter/live-filter.js diff --git a/src/patterns/live-filter/live-filter.yml b/content/patterns/live-filter/live-filter.yml similarity index 100% rename from src/patterns/live-filter/live-filter.yml rename to content/patterns/live-filter/live-filter.yml diff --git a/src/patterns/menu/layout.html b/content/patterns/menu/layout.html similarity index 100% rename from src/patterns/menu/layout.html rename to content/patterns/menu/layout.html diff --git a/src/patterns/menu/menu.html b/content/patterns/menu/menu.html similarity index 100% rename from src/patterns/menu/menu.html rename to content/patterns/menu/menu.html diff --git a/src/patterns/menu/menu.yml b/content/patterns/menu/menu.yml similarity index 100% rename from src/patterns/menu/menu.yml rename to content/patterns/menu/menu.yml diff --git a/src/patterns/meta-copy/layout.html b/content/patterns/meta-copy/layout.html similarity index 100% rename from src/patterns/meta-copy/layout.html rename to content/patterns/meta-copy/layout.html diff --git a/src/patterns/meta-copy/meta-copy.html b/content/patterns/meta-copy/meta-copy.html similarity index 100% rename from src/patterns/meta-copy/meta-copy.html rename to content/patterns/meta-copy/meta-copy.html diff --git a/src/patterns/meta-copy/meta-copy.yml b/content/patterns/meta-copy/meta-copy.yml similarity index 100% rename from src/patterns/meta-copy/meta-copy.yml rename to content/patterns/meta-copy/meta-copy.yml diff --git a/src/patterns/pullquotes/layout.html b/content/patterns/pullquotes/layout.html similarity index 100% rename from src/patterns/pullquotes/layout.html rename to content/patterns/pullquotes/layout.html diff --git a/src/patterns/pullquotes/pullquotes.html b/content/patterns/pullquotes/pullquotes.html similarity index 100% rename from src/patterns/pullquotes/pullquotes.html rename to content/patterns/pullquotes/pullquotes.html diff --git a/src/patterns/pullquotes/pullquotes.yml b/content/patterns/pullquotes/pullquotes.yml similarity index 100% rename from src/patterns/pullquotes/pullquotes.yml rename to content/patterns/pullquotes/pullquotes.yml diff --git a/src/patterns/related-links/layout.html b/content/patterns/related-links/layout.html similarity index 100% rename from src/patterns/related-links/layout.html rename to content/patterns/related-links/layout.html diff --git a/src/patterns/related-links/related-links.html b/content/patterns/related-links/related-links.html similarity index 100% rename from src/patterns/related-links/related-links.html rename to content/patterns/related-links/related-links.html diff --git a/src/patterns/related-links/related-links.yml b/content/patterns/related-links/related-links.yml similarity index 100% rename from src/patterns/related-links/related-links.yml rename to content/patterns/related-links/related-links.yml diff --git a/src/patterns/search/layout.html b/content/patterns/search/layout.html similarity index 100% rename from src/patterns/search/layout.html rename to content/patterns/search/layout.html diff --git a/src/patterns/search/search.html b/content/patterns/search/search.html similarity index 100% rename from src/patterns/search/search.html rename to content/patterns/search/search.html diff --git a/src/patterns/search/search.yml b/content/patterns/search/search.yml similarity index 100% rename from src/patterns/search/search.yml rename to content/patterns/search/search.yml diff --git a/src/patterns/select-box/layout.html b/content/patterns/select-box/layout.html similarity index 100% rename from src/patterns/select-box/layout.html rename to content/patterns/select-box/layout.html diff --git a/src/patterns/select-box/select-box.html b/content/patterns/select-box/select-box.html similarity index 100% rename from src/patterns/select-box/select-box.html rename to content/patterns/select-box/select-box.html diff --git a/src/patterns/select-box/select-box.js b/content/patterns/select-box/select-box.js similarity index 100% rename from src/patterns/select-box/select-box.js rename to content/patterns/select-box/select-box.js diff --git a/src/patterns/select-box/select-box.yml b/content/patterns/select-box/select-box.yml similarity index 100% rename from src/patterns/select-box/select-box.yml rename to content/patterns/select-box/select-box.yml diff --git a/src/patterns/spacing/layout.html b/content/patterns/spacing/layout.html similarity index 100% rename from src/patterns/spacing/layout.html rename to content/patterns/spacing/layout.html diff --git a/src/patterns/spacing/spacing.html b/content/patterns/spacing/spacing.html similarity index 100% rename from src/patterns/spacing/spacing.html rename to content/patterns/spacing/spacing.html diff --git a/src/patterns/spacing/spacing.yml b/content/patterns/spacing/spacing.yml similarity index 100% rename from src/patterns/spacing/spacing.yml rename to content/patterns/spacing/spacing.yml diff --git a/src/patterns/tables-data/layout.html b/content/patterns/tables-data/layout.html similarity index 100% rename from src/patterns/tables-data/layout.html rename to content/patterns/tables-data/layout.html diff --git a/src/patterns/tables-data/tables-data.html b/content/patterns/tables-data/tables-data.html similarity index 100% rename from src/patterns/tables-data/tables-data.html rename to content/patterns/tables-data/tables-data.html diff --git a/src/patterns/tables-data/tables-data.yml b/content/patterns/tables-data/tables-data.yml similarity index 100% rename from src/patterns/tables-data/tables-data.yml rename to content/patterns/tables-data/tables-data.yml diff --git a/src/patterns/tables-responsive/layout.html b/content/patterns/tables-responsive/layout.html similarity index 100% rename from src/patterns/tables-responsive/layout.html rename to content/patterns/tables-responsive/layout.html diff --git a/src/patterns/tables-responsive/tables-responsive.html b/content/patterns/tables-responsive/tables-responsive.html similarity index 100% rename from src/patterns/tables-responsive/tables-responsive.html rename to content/patterns/tables-responsive/tables-responsive.html diff --git a/src/patterns/tables-responsive/tables-responsive.yml b/content/patterns/tables-responsive/tables-responsive.yml similarity index 100% rename from src/patterns/tables-responsive/tables-responsive.yml rename to content/patterns/tables-responsive/tables-responsive.yml diff --git a/src/patterns/tables-sorting/layout.html b/content/patterns/tables-sorting/layout.html similarity index 100% rename from src/patterns/tables-sorting/layout.html rename to content/patterns/tables-sorting/layout.html diff --git a/src/patterns/tables-sorting/tables-sorting.html b/content/patterns/tables-sorting/tables-sorting.html similarity index 100% rename from src/patterns/tables-sorting/tables-sorting.html rename to content/patterns/tables-sorting/tables-sorting.html diff --git a/src/patterns/tables-sorting/tables-sorting.js b/content/patterns/tables-sorting/tables-sorting.js similarity index 100% rename from src/patterns/tables-sorting/tables-sorting.js rename to content/patterns/tables-sorting/tables-sorting.js diff --git a/src/patterns/tables-sorting/tables-sorting.yml b/content/patterns/tables-sorting/tables-sorting.yml similarity index 100% rename from src/patterns/tables-sorting/tables-sorting.yml rename to content/patterns/tables-sorting/tables-sorting.yml diff --git a/src/patterns/tables/layout.html b/content/patterns/tables/layout.html similarity index 100% rename from src/patterns/tables/layout.html rename to content/patterns/tables/layout.html diff --git a/src/patterns/tables/tables.html b/content/patterns/tables/tables.html similarity index 100% rename from src/patterns/tables/tables.html rename to content/patterns/tables/tables.html diff --git a/src/patterns/tables/tables.yml b/content/patterns/tables/tables.yml similarity index 100% rename from src/patterns/tables/tables.yml rename to content/patterns/tables/tables.yml diff --git a/src/patterns/tabs/layout.html b/content/patterns/tabs/layout.html similarity index 100% rename from src/patterns/tabs/layout.html rename to content/patterns/tabs/layout.html diff --git a/src/patterns/tabs/tabs.html b/content/patterns/tabs/tabs.html similarity index 100% rename from src/patterns/tabs/tabs.html rename to content/patterns/tabs/tabs.html diff --git a/src/patterns/tabs/tabs.yml b/content/patterns/tabs/tabs.yml similarity index 100% rename from src/patterns/tabs/tabs.yml rename to content/patterns/tabs/tabs.yml diff --git a/src/patterns/tags/layout.html b/content/patterns/tags/layout.html similarity index 100% rename from src/patterns/tags/layout.html rename to content/patterns/tags/layout.html diff --git a/src/patterns/tags/tags.html b/content/patterns/tags/tags.html similarity index 100% rename from src/patterns/tags/tags.html rename to content/patterns/tags/tags.html diff --git a/src/patterns/tags/tags.yml b/content/patterns/tags/tags.yml similarity index 100% rename from src/patterns/tags/tags.yml rename to content/patterns/tags/tags.yml diff --git a/src/patterns/template/layout.html b/content/patterns/template/layout.html similarity index 100% rename from src/patterns/template/layout.html rename to content/patterns/template/layout.html diff --git a/src/patterns/template/template.html b/content/patterns/template/template.html similarity index 100% rename from src/patterns/template/template.html rename to content/patterns/template/template.html diff --git a/src/patterns/template/template.yml b/content/patterns/template/template.yml similarity index 100% rename from src/patterns/template/template.yml rename to content/patterns/template/template.yml diff --git a/src/patterns/update-feed/layout.html b/content/patterns/update-feed/layout.html similarity index 100% rename from src/patterns/update-feed/layout.html rename to content/patterns/update-feed/layout.html diff --git a/src/patterns/update-feed/update-feed.html b/content/patterns/update-feed/update-feed.html similarity index 100% rename from src/patterns/update-feed/update-feed.html rename to content/patterns/update-feed/update-feed.html diff --git a/src/patterns/update-feed/update-feed.js b/content/patterns/update-feed/update-feed.js similarity index 100% rename from src/patterns/update-feed/update-feed.js rename to content/patterns/update-feed/update-feed.js diff --git a/src/patterns/update-feed/update-feed.png b/content/patterns/update-feed/update-feed.png similarity index 100% rename from src/patterns/update-feed/update-feed.png rename to content/patterns/update-feed/update-feed.png diff --git a/src/patterns/update-feed/update-feed.scss b/content/patterns/update-feed/update-feed.scss similarity index 100% rename from src/patterns/update-feed/update-feed.scss rename to content/patterns/update-feed/update-feed.scss diff --git a/src/patterns/update-feed/update-feed.yml b/content/patterns/update-feed/update-feed.yml similarity index 100% rename from src/patterns/update-feed/update-feed.yml rename to content/patterns/update-feed/update-feed.yml diff --git a/src/styleguide/index.md b/content/styleguide/index.md similarity index 100% rename from src/styleguide/index.md rename to content/styleguide/index.md diff --git a/src/styleguide/template.html b/content/styleguide/template.html similarity index 100% rename from src/styleguide/template.html rename to content/styleguide/template.html diff --git a/gulpfile.babel.js b/gulpfile.babel.js index c47a6d336c5878dc3bcf46bdb97cb1b8da04ffa6..073f823d1f7b11d3329670601d116ed3e2b30e79 100644 --- a/gulpfile.babel.js +++ b/gulpfile.babel.js @@ -104,18 +104,18 @@ function copyData() { // Copy files out of the assets folder // This task skips over the "img", "js", and "scss" folders, which are parsed separately function copyBBImages() { - return gulp.src('src/patterns/**/*.{png,jpg}') + return gulp.src('content/patterns/**/*.{png,jpg}') .pipe(gulp.dest(PATHS.dist + '/assets/img/websites/patterns/')); } function copyKitImages() { - return gulp.src('src/kits/**/*.{png,jpg}') + return gulp.src('content/kits/**/*.{png,jpg}') .pipe(gulp.dest(PATHS.dist + '/assets/img/kits/')); } function copyBBFiles() { - return gulp.src(['src/patterns/**/*.{html,js,scss}', 'dist/building-blocks/**/*.css', '!dist/building-blocks/**/layout.css']) + return gulp.src(['content/patterns/**/*.{html,js,scss}', 'dist/building-blocks/**/*.css', '!dist/building-blocks/**/layout.css']) .pipe(gulp.dest(PATHS.dist + '/files/building-blocks/')); } @@ -126,7 +126,7 @@ function kitIndex() { root: 'assets_site/pages/', layouts: 'assets_site/layouts/', partials: 'assets_site/partials/', - data: ['src/data/', PATHS.build + '/data'], + data: ['assets_site/data/', PATHS.build + '/data'], helpers: 'assets_build/panini_helpers/' })) .pipe($.if(PRODUCTION, $.revTimestamp())) @@ -142,14 +142,14 @@ function pages() { root: 'assets_site/pages/', layouts: 'assets_site/layouts/', partials: 'assets_site/partials/', - data: 'src/data/', + data: 'assets_site/data/', helpers: 'assets_build/panini_helpers/' })) .pipe(gulp.dest(PATHS.dist)); } function buildingBlockBaseStyles() { - return gulp.src(['src/patterns/app.scss', 'src/patterns/app-float.scss']) + return gulp.src(['content/patterns/app.scss', 'content/patterns/app-float.scss']) .pipe($.sass({ includePaths: PATHS.sass }) @@ -166,7 +166,7 @@ function buildingBlockBaseStyles() { // Compiles the Sass for the building blocks function buildingBlockSass() { var blocks = JSON.parse(fs.readFileSync(PATHS.build + '/data/building-blocks.json', 'utf8')); - return gulp.src(['src/patterns/**/*.scss']) + return gulp.src(['content/patterns/**/*.scss']) .pipe($.insert.transform(function(contents, file){ var pieces = file.path.split('/'); var bbName = pieces[pieces.length - 2]; @@ -193,7 +193,7 @@ function buildingBlockSass() { // Moves JS from the Building Blocks into the dist function buildingBlockJS() { - return gulp.src('src/patterns/**/*.js') + return gulp.src('content/patterns/**/*.js') .pipe(gulp.dest(PATHS.dist + "/websites/patterns/")); } @@ -205,9 +205,9 @@ function resetPages(done) { // Generate a style guide from the Markdown content and HTML template in styleguide/ function styleGuide(done) { - sherpa('src/styleguide/index.md', { + sherpa('content/styleguide/index.md', { output: PATHS.dist + '/styleguide.html', - template: 'src/styleguide/template.html' + template: 'content/styleguide/template.html' }, done); } @@ -248,7 +248,7 @@ function javascript() { // Copy images to the "dist" folder // In production, the images are compressed function images() { - return gulp.src('src/assets/img/**/*') + return gulp.src('content/assets/img/**/*') .pipe($.if(PRODUCTION, $.imagemin({ progressive: true }))) @@ -274,25 +274,25 @@ function reload(done) { function watch() { gulp.watch(PATHS.assets, gulp.series('copy', reload)); gulp.watch(['assets_site/pages/*.html', 'assets_site/pages/**/*.html']).on('all', gulp.series('kit-index', pages, kitIndex, reload)); - gulp.watch('src/{layouts,partials}/**/*.html').on('all', gulp.series(kitIndex, 'dynamic-pages', reload)); - gulp.watch('src/patterns/**/*.html').on('all', gulp.series( 'building-block-pages', 'building-block-indices', reload)); - gulp.watch('src/patterns/**/*.scss').on('all', gulp.series(buildingBlockSass, 'building-block-pages',reload)); - gulp.watch('src/patterns/**/*.js').on('all', gulp.series(buildingBlockJS, 'building-block-pages', reload)); - gulp.watch(['src/patterns/**/*.png', 'src/kits/**/*.png']).on('all', gulp.series('copy', reload)); - gulp.watch('src/patterns/**/*.yml').on('all', gulp.series('building-block-meta', 'dynamic-pages', reload)); - gulp.watch('src/kits/**/*.yml').on('all', gulp.series('building-block-meta', 'dynamic-pages', reload)); + gulp.watch('content/{layouts,partials}/**/*.html').on('all', gulp.series(kitIndex, 'dynamic-pages', reload)); + gulp.watch('content/patterns/**/*.html').on('all', gulp.series( 'building-block-pages', 'building-block-indices', reload)); + gulp.watch('content/patterns/**/*.scss').on('all', gulp.series(buildingBlockSass, 'building-block-pages',reload)); + gulp.watch('content/patterns/**/*.js').on('all', gulp.series(buildingBlockJS, 'building-block-pages', reload)); + gulp.watch(['content/patterns/**/*.png', 'content/kits/**/*.png']).on('all', gulp.series('copy', reload)); + gulp.watch('content/patterns/**/*.yml').on('all', gulp.series('building-block-meta', 'dynamic-pages', reload)); + gulp.watch('content/kits/**/*.yml').on('all', gulp.series('building-block-meta', 'dynamic-pages', reload)); gulp.watch('assets_site/scss/**/*.scss').on('all', gulp.series(sass, buildingBlockSass, reload)); gulp.watch('assets_site/js/**/*.js').on('all', gulp.series(javascript, reload)); - gulp.watch('src/assets/img/**/*').on('all', gulp.series(images, reload)); - gulp.watch('src/styleguide/**').on('all', gulp.series(styleGuide, reload)); + gulp.watch('content/assets/img/**/*').on('all', gulp.series(images, reload)); + gulp.watch('content/styleguide/**').on('all', gulp.series(styleGuide, reload)); } // Watch for changes to static assets, pages, Sass, and JavaScript function watchStatic() { gulp.watch(PATHS.assets, gulp.series('copy', reload)); gulp.watch('assets_site/pages/**/*.html').on('all', gulp.series(pages, reload)); - gulp.watch('src/{layouts,partials}/**/*.html').on('all', gulp.series(pages, reload)); + gulp.watch('content/{layouts,partials}/**/*.html').on('all', gulp.series(pages, reload)); gulp.watch('assets_site/scss/**/*.scss').on('all', gulp.series(sass, reload)); gulp.watch('assets_site/js/**/*.js').on('all', gulp.series(javascript, reload)); - gulp.watch('src/assets/img/**/*').on('all', gulp.series(images, reload)); - gulp.watch('src/styleguide/**').on('all', gulp.series(styleGuide, reload)); + gulp.watch('content/assets/img/**/*').on('all', gulp.series(images, reload)); + gulp.watch('content/styleguide/**').on('all', gulp.series(styleGuide, reload)); }