From aa43ff884204e418733954e56c6dd3bcf0909654 Mon Sep 17 00:00:00 2001 From: Barry McGee Date: Fri, 3 Feb 2017 12:00:47 +0000 Subject: [PATCH 01/12] Remove custom markdown parser from _config.yml --- _config.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/_config.yml b/_config.yml index 0daa7e224..7ac197cda 100755 --- a/_config.yml +++ b/_config.yml @@ -17,12 +17,7 @@ category_dir: / #baseurl: /path/to/blog baseurl: -#### Under the Hood Stuff ##### - -# Use rdiscount as the markdown engine because it generates html5 compliant code for stuff like footnotes -# If you use maroku (default engine) some of your generated pages may not validate or lint as html5 -# If you don't have it install it via gem install rdiscount -markdown: rdiscount +#### Under the Hood Stuff #### # Makes pretty (descriptive) permalinks. See Jekyll docs for alternatives. permalink: pretty From d2851919cf4cf9c8aa7b4338283ac3ce08a55be5 Mon Sep 17 00:00:00 2001 From: Barry McGee Date: Thu, 2 Feb 2017 17:52:22 +0000 Subject: [PATCH 02/12] Rename _text-align.md to _align.md (#802) Related #795 --- docs/utilities/{_text-align.md => _align.md} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename docs/utilities/{_text-align.md => _align.md} (84%) diff --git a/docs/utilities/_text-align.md b/docs/utilities/_align.md similarity index 84% rename from docs/utilities/_text-align.md rename to docs/utilities/_align.md index 7976b35eb..91c18cece 100644 --- a/docs/utilities/_text-align.md +++ b/docs/utilities/_align.md @@ -1,9 +1,9 @@ --- collection: utilities -title: Text align +title: Align --- -You can use these utilities to force the text inside an element to align center, left or right. +You can use these utilities to force the content inside an element to align center, left or right. ## Center From 866461675ec2ca91ffcc6fdbef936c921040725e Mon Sep 17 00:00:00 2001 From: Barry McGee Date: Fri, 3 Feb 2017 09:09:56 +0000 Subject: [PATCH 03/12] Remove gitter webhook as unused --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2f33a8b45..af93975bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,4 @@ notifications: - "chat.freenode.net#canonical-webteam" on_success: change on_failure: always - webhooks: - urls: - - "https://webhooks.gitter.im/e/9898d67dfc1dd39f9cb2" on_success: change From f668916c6f2a6791f4329ffc71dbc8b90994ac6d Mon Sep 17 00:00:00 2001 From: Barry McGee Date: Fri, 3 Feb 2017 09:10:10 +0000 Subject: [PATCH 04/12] Add percy travis commands --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index af93975bf..6c00d80ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,3 +14,12 @@ notifications: on_success: change on_failure: always on_success: change + +language: ruby +rvm: 2.1.1 +before_script: + - gem install jekyll + - gem install percy-cli +script: + - jekyll build + - percy snapshot --widths "375,768,1280" _site/ From 5e2b2c602d32216c1037c95588f2800b774b8223 Mon Sep 17 00:00:00 2001 From: Robin Winslow Date: Mon, 6 Feb 2017 16:00:12 +0000 Subject: [PATCH 05/12] Jekyll: Alternative structure (#816) (#819) * Move Jekyll files to /docs This is the *only* model under which GitHub allows Jekyll files to reside in a sub-folder: https://help.github.com/articles/configuring-a-publishing-source-for-github-pages/#publishing-your-github-pages-site-from-a-docs-folder-on-your-master-branch Also, move all actual documentation to /docs/src, so it doesn't conflict with jekyll work. * Restructure Jekyll pages Keep them in a folder called "examples" to make it clearer to everyone where to find them. Use a more Jekyll native method for building the navigation. * Use a environment variable to switch CSS location Add a plugin so that, when run locally, it will pick up on an environment variable to know that it should run in development mode. Then make it so that in development mode it will look for a css file at /css/* * Add new simpler Jekyll config * Setup "gulp jekyll" to use new model - Build jekyll from /docs folder - Set an environment variable - JEKYLL_ENV=development - to load CSS from /docs/css dir - Set up symlink from /build/css to /docs/css - Ignore the built site directory and the css symlink * Use correct place for css * Document and remove ./run - didn't work properly anyway * Improve README slightly more * Move markdown docs back home This is part of an experiment of putting Jekyll files at the top level, to make Docs live in a more sensible place. This will make docs more discoverable. It should also signify to anyone familiar wit Jekyll that they can run Jekyll from this folder, which may also help with discoverability. * Move example HTML to top level Again to help with discoverability, keep examples at the top level. * Move Jekyll files to top level * Update jekyll gulp taske * Kel jekyll directories out of the way in /_jekyll * #Fix line endings * Convert all CRLF line endings to LF --- .gitignore | 3 +- README.md | 20 +- _config.yml | 49 +-- {jekyll => _jekyll}/_layouts/default.html | 6 +- _jekyll/_plugins/environment_variables.rb | 13 + .../_base => examples/base}/blockquotes.html | 0 {jekyll/_base => examples/base}/button.html | 0 {jekyll/_base => examples/base}/code.html | 0 .../base}/forms/checkboxes.html | 0 .../base}/forms/feedback.html | 0 .../base}/forms/fieldset.html | 0 .../_base => examples/base}/forms/form.html | 0 .../_base => examples/base}/forms/labels.html | 0 .../base}/forms/radio-buttons.html | 0 .../base}/forms/select-multiple.html | 0 .../base}/forms/selects.html | 0 {jekyll/_base => examples/base}/hr.html | 0 {jekyll/_base => examples/base}/links.html | 0 .../base}/lists/definition-list.html | 0 .../base}/lists/ordered-list.html | 0 .../base}/lists/unordered-list.html | 0 {jekyll/_base => examples/base}/table.html | 0 .../patterns}/breadcrumbs.html | 0 .../patterns}/card/card.html | 0 .../patterns}/card/highlighted.html | 0 .../patterns}/code-numbered.html | 0 .../code-snippets/code-snippet-dark.html | 0 .../patterns}/code-snippets/code-snippet.html | 0 .../patterns}/footer.html | 0 .../patterns}/headings.html | 0 .../patterns}/inline-images.html | 0 .../patterns}/links/links-back-to-top.html | 0 .../patterns}/links/links-external.html | 0 .../patterns}/lists/list.html | 0 .../lists/lists-dividers-ticked.html | 0 .../patterns}/lists/lists-dividers.html | 0 .../patterns}/lists/lists-inline.html | 0 .../patterns}/lists/lists-mid-dot.html | 0 .../patterns}/lists/lists-stepped.html | 0 .../patterns}/lists/lists-ticked.html | 0 .../patterns}/matrix.html | 0 .../patterns}/navigation.html | 0 .../patterns}/notifications/action.html | 0 .../patterns}/notifications/negative.html | 0 .../notifications/notifications.html | 0 .../patterns}/notifications/positive.html | 0 .../patterns}/notifications/warning.html | 0 .../patterns}/pull-quotes.html | 0 .../patterns}/strips/strips-dark.html | 0 .../patterns}/strips/strips-light.html | 0 .../utilities}/clearfix.html | 0 .../utilities}/content-align.html | 0 .../utilities}/embedded-media.html | 0 .../utilities}/equal-height.html | 0 .../utilities}/floats.html | 0 .../utilities}/margin-collapse.html | 0 .../utilities}/off-screen.html | 0 .../utilities}/padding-collapse.html | 0 gulp/jekyll.js | 3 +- jekyll/index.html => index.html | 116 +++---- run | 66 ---- scss/grid/shelves-grid.scss | 294 +++++++++--------- scss/grid/shelves/mixins/_generators.scss | 286 ++++++++--------- 63 files changed, 401 insertions(+), 455 deletions(-) rename {jekyll => _jekyll}/_layouts/default.html (50%) create mode 100644 _jekyll/_plugins/environment_variables.rb rename {jekyll/_base => examples/base}/blockquotes.html (100%) rename {jekyll/_base => examples/base}/button.html (100%) rename {jekyll/_base => examples/base}/code.html (100%) rename {jekyll/_base => examples/base}/forms/checkboxes.html (100%) rename {jekyll/_base => examples/base}/forms/feedback.html (100%) rename {jekyll/_base => examples/base}/forms/fieldset.html (100%) rename {jekyll/_base => examples/base}/forms/form.html (100%) rename {jekyll/_base => examples/base}/forms/labels.html (100%) rename {jekyll/_base => examples/base}/forms/radio-buttons.html (100%) rename {jekyll/_base => examples/base}/forms/select-multiple.html (100%) rename {jekyll/_base => examples/base}/forms/selects.html (100%) rename {jekyll/_base => examples/base}/hr.html (100%) rename {jekyll/_base => examples/base}/links.html (100%) rename {jekyll/_base => examples/base}/lists/definition-list.html (100%) rename {jekyll/_base => examples/base}/lists/ordered-list.html (100%) rename {jekyll/_base => examples/base}/lists/unordered-list.html (100%) rename {jekyll/_base => examples/base}/table.html (100%) rename {jekyll/_patterns => examples/patterns}/breadcrumbs.html (100%) rename {jekyll/_patterns => examples/patterns}/card/card.html (100%) rename {jekyll/_patterns => examples/patterns}/card/highlighted.html (100%) rename {jekyll/_patterns => examples/patterns}/code-numbered.html (100%) rename {jekyll/_patterns => examples/patterns}/code-snippets/code-snippet-dark.html (100%) rename {jekyll/_patterns => examples/patterns}/code-snippets/code-snippet.html (100%) rename {jekyll/_patterns => examples/patterns}/footer.html (100%) rename {jekyll/_patterns => examples/patterns}/headings.html (100%) rename {jekyll/_patterns => examples/patterns}/inline-images.html (100%) rename {jekyll/_patterns => examples/patterns}/links/links-back-to-top.html (100%) rename {jekyll/_patterns => examples/patterns}/links/links-external.html (100%) rename {jekyll/_patterns => examples/patterns}/lists/list.html (100%) rename {jekyll/_patterns => examples/patterns}/lists/lists-dividers-ticked.html (100%) rename {jekyll/_patterns => examples/patterns}/lists/lists-dividers.html (100%) rename {jekyll/_patterns => examples/patterns}/lists/lists-inline.html (100%) rename {jekyll/_patterns => examples/patterns}/lists/lists-mid-dot.html (100%) rename {jekyll/_patterns => examples/patterns}/lists/lists-stepped.html (100%) rename {jekyll/_patterns => examples/patterns}/lists/lists-ticked.html (100%) rename {jekyll/_patterns => examples/patterns}/matrix.html (100%) rename {jekyll/_patterns => examples/patterns}/navigation.html (100%) rename {jekyll/_patterns => examples/patterns}/notifications/action.html (100%) rename {jekyll/_patterns => examples/patterns}/notifications/negative.html (100%) rename {jekyll/_patterns => examples/patterns}/notifications/notifications.html (100%) rename {jekyll/_patterns => examples/patterns}/notifications/positive.html (100%) rename {jekyll/_patterns => examples/patterns}/notifications/warning.html (100%) rename {jekyll/_patterns => examples/patterns}/pull-quotes.html (100%) rename {jekyll/_patterns => examples/patterns}/strips/strips-dark.html (100%) rename {jekyll/_patterns => examples/patterns}/strips/strips-light.html (100%) rename {jekyll/_utilities => examples/utilities}/clearfix.html (100%) rename {jekyll/_utilities => examples/utilities}/content-align.html (100%) rename {jekyll/_utilities => examples/utilities}/embedded-media.html (100%) rename {jekyll/_utilities => examples/utilities}/equal-height.html (100%) rename {jekyll/_utilities => examples/utilities}/floats.html (100%) rename {jekyll/_utilities => examples/utilities}/margin-collapse.html (100%) rename {jekyll/_utilities => examples/utilities}/off-screen.html (100%) rename {jekyll/_utilities => examples/utilities}/padding-collapse.html (100%) rename jekyll/index.html => index.html (56%) delete mode 100755 run diff --git a/.gitignore b/.gitignore index 165d8a92d..1ded2d5fd 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,5 @@ node_modules/ demo.html /.firebaserc /firebase.json -/_site -/jekyll/_site/ /Gemfile.lock +/_jekyll/_site/ diff --git a/README.md b/README.md index 2d205942b..3a2e76504 100644 --- a/README.md +++ b/README.md @@ -58,13 +58,23 @@ If you don't want the whole framework, you can just `@include` specific [parts]( To develop on Vanilla itself, simply pull down the project and make changes. -Once you've made your changes you can use the `run` script to build and test your code: +To test it locally using our recommended tooling, you need to first install dependencies: ``` bash -./run # List available commands -./run develop # Watch files and rebuild when changes happen -./run test # Run the Sass linter -./run build # Watch files and rebuild when changes happen +bundle install +npm install +``` + +You can then compile your Sass changes into `build/css/build.css` by running: + +``` bash +gulp build +``` + +Or you can run a local server to view your changes live with: + +``` bash +gulp jekyll ``` ## Community diff --git a/_config.yml b/_config.yml index 7ac197cda..5cd3fcabc 100755 --- a/_config.yml +++ b/_config.yml @@ -1,35 +1,14 @@ -## -## This config for the the jekyll instance at /jekyll which is used to test Examples -## during development. To view, run: `jekyll serve` -## -name: Vanilla framework - Examples - -# The directory for Jekyll setup files -source: jekyll - -# The directory for category index pages. Change it to something else if -# for example you want links like /categories/category1 instead of /category1 -category_dir: / - -# Uncomment if you are planning to run the blog in a subdirectory -# Note - if you enable this, and attempt to view your site locally you have to use the baseurl in your local path. -# Example, you must use http://localhost:4000/path/to/blog -#baseurl: /path/to/blog -baseurl: - -#### Under the Hood Stuff #### - -# Makes pretty (descriptive) permalinks. See Jekyll docs for alternatives. -permalink: pretty - -# Exclude metadata and development time dependencies (like Grunt plugins) -exclude: [README.markdown, package.json, grunt.js, Gruntfile.js, Gruntfile.coffee, node_modules] - -# collections -collections: - base: - output: true - patterns: - output: true - utilities: - output: true +name: Vanilla framework - Examples + +baseurl: /vanilla-framework + +# Makes pretty (descriptive) permalinks. See Jekyll docs for alternatives. +permalink: pretty + +# Keep Jekyll directories out of the way +plugins_dir: _jekyll/_plugins +layouts_dir: _jekyll/_layouts +destination: _jekyll/_site + +# Exclude metadata and development time dependencies (like Grunt plugins) +exclude: ["*.md", "*.scss", "node_modules", "package.json", "Gemfile", "Gemfile.lock", "gulpfile.js", "gulp", "LICENSE"] diff --git a/jekyll/_layouts/default.html b/_jekyll/_layouts/default.html similarity index 50% rename from jekyll/_layouts/default.html rename to _jekyll/_layouts/default.html index b80f2c975..8716ce032 100755 --- a/jekyll/_layouts/default.html +++ b/_jekyll/_layouts/default.html @@ -4,7 +4,11 @@ {% if page.title %} {{ page.title }} | {% endif %} {{ site.name }} - + {% if site.env == 'development' %} + + {% else %} + + {% endif %} diff --git a/_jekyll/_plugins/environment_variables.rb b/_jekyll/_plugins/environment_variables.rb new file mode 100644 index 000000000..73a850001 --- /dev/null +++ b/_jekyll/_plugins/environment_variables.rb @@ -0,0 +1,13 @@ +# Plugin to add environment variables to the `site` object in Liquid templates + +module Jekyll + + class EnvironmentVariablesGenerator < Generator + + def generate(site) + site.config['env'] = ENV['JEKYLL_ENV'] || 'production' + end + + end + +end diff --git a/jekyll/_base/blockquotes.html b/examples/base/blockquotes.html similarity index 100% rename from jekyll/_base/blockquotes.html rename to examples/base/blockquotes.html diff --git a/jekyll/_base/button.html b/examples/base/button.html similarity index 100% rename from jekyll/_base/button.html rename to examples/base/button.html diff --git a/jekyll/_base/code.html b/examples/base/code.html similarity index 100% rename from jekyll/_base/code.html rename to examples/base/code.html diff --git a/jekyll/_base/forms/checkboxes.html b/examples/base/forms/checkboxes.html similarity index 100% rename from jekyll/_base/forms/checkboxes.html rename to examples/base/forms/checkboxes.html diff --git a/jekyll/_base/forms/feedback.html b/examples/base/forms/feedback.html similarity index 100% rename from jekyll/_base/forms/feedback.html rename to examples/base/forms/feedback.html diff --git a/jekyll/_base/forms/fieldset.html b/examples/base/forms/fieldset.html similarity index 100% rename from jekyll/_base/forms/fieldset.html rename to examples/base/forms/fieldset.html diff --git a/jekyll/_base/forms/form.html b/examples/base/forms/form.html similarity index 100% rename from jekyll/_base/forms/form.html rename to examples/base/forms/form.html diff --git a/jekyll/_base/forms/labels.html b/examples/base/forms/labels.html similarity index 100% rename from jekyll/_base/forms/labels.html rename to examples/base/forms/labels.html diff --git a/jekyll/_base/forms/radio-buttons.html b/examples/base/forms/radio-buttons.html similarity index 100% rename from jekyll/_base/forms/radio-buttons.html rename to examples/base/forms/radio-buttons.html diff --git a/jekyll/_base/forms/select-multiple.html b/examples/base/forms/select-multiple.html similarity index 100% rename from jekyll/_base/forms/select-multiple.html rename to examples/base/forms/select-multiple.html diff --git a/jekyll/_base/forms/selects.html b/examples/base/forms/selects.html similarity index 100% rename from jekyll/_base/forms/selects.html rename to examples/base/forms/selects.html diff --git a/jekyll/_base/hr.html b/examples/base/hr.html similarity index 100% rename from jekyll/_base/hr.html rename to examples/base/hr.html diff --git a/jekyll/_base/links.html b/examples/base/links.html similarity index 100% rename from jekyll/_base/links.html rename to examples/base/links.html diff --git a/jekyll/_base/lists/definition-list.html b/examples/base/lists/definition-list.html similarity index 100% rename from jekyll/_base/lists/definition-list.html rename to examples/base/lists/definition-list.html diff --git a/jekyll/_base/lists/ordered-list.html b/examples/base/lists/ordered-list.html similarity index 100% rename from jekyll/_base/lists/ordered-list.html rename to examples/base/lists/ordered-list.html diff --git a/jekyll/_base/lists/unordered-list.html b/examples/base/lists/unordered-list.html similarity index 100% rename from jekyll/_base/lists/unordered-list.html rename to examples/base/lists/unordered-list.html diff --git a/jekyll/_base/table.html b/examples/base/table.html similarity index 100% rename from jekyll/_base/table.html rename to examples/base/table.html diff --git a/jekyll/_patterns/breadcrumbs.html b/examples/patterns/breadcrumbs.html similarity index 100% rename from jekyll/_patterns/breadcrumbs.html rename to examples/patterns/breadcrumbs.html diff --git a/jekyll/_patterns/card/card.html b/examples/patterns/card/card.html similarity index 100% rename from jekyll/_patterns/card/card.html rename to examples/patterns/card/card.html diff --git a/jekyll/_patterns/card/highlighted.html b/examples/patterns/card/highlighted.html similarity index 100% rename from jekyll/_patterns/card/highlighted.html rename to examples/patterns/card/highlighted.html diff --git a/jekyll/_patterns/code-numbered.html b/examples/patterns/code-numbered.html similarity index 100% rename from jekyll/_patterns/code-numbered.html rename to examples/patterns/code-numbered.html diff --git a/jekyll/_patterns/code-snippets/code-snippet-dark.html b/examples/patterns/code-snippets/code-snippet-dark.html similarity index 100% rename from jekyll/_patterns/code-snippets/code-snippet-dark.html rename to examples/patterns/code-snippets/code-snippet-dark.html diff --git a/jekyll/_patterns/code-snippets/code-snippet.html b/examples/patterns/code-snippets/code-snippet.html similarity index 100% rename from jekyll/_patterns/code-snippets/code-snippet.html rename to examples/patterns/code-snippets/code-snippet.html diff --git a/jekyll/_patterns/footer.html b/examples/patterns/footer.html similarity index 100% rename from jekyll/_patterns/footer.html rename to examples/patterns/footer.html diff --git a/jekyll/_patterns/headings.html b/examples/patterns/headings.html similarity index 100% rename from jekyll/_patterns/headings.html rename to examples/patterns/headings.html diff --git a/jekyll/_patterns/inline-images.html b/examples/patterns/inline-images.html similarity index 100% rename from jekyll/_patterns/inline-images.html rename to examples/patterns/inline-images.html diff --git a/jekyll/_patterns/links/links-back-to-top.html b/examples/patterns/links/links-back-to-top.html similarity index 100% rename from jekyll/_patterns/links/links-back-to-top.html rename to examples/patterns/links/links-back-to-top.html diff --git a/jekyll/_patterns/links/links-external.html b/examples/patterns/links/links-external.html similarity index 100% rename from jekyll/_patterns/links/links-external.html rename to examples/patterns/links/links-external.html diff --git a/jekyll/_patterns/lists/list.html b/examples/patterns/lists/list.html similarity index 100% rename from jekyll/_patterns/lists/list.html rename to examples/patterns/lists/list.html diff --git a/jekyll/_patterns/lists/lists-dividers-ticked.html b/examples/patterns/lists/lists-dividers-ticked.html similarity index 100% rename from jekyll/_patterns/lists/lists-dividers-ticked.html rename to examples/patterns/lists/lists-dividers-ticked.html diff --git a/jekyll/_patterns/lists/lists-dividers.html b/examples/patterns/lists/lists-dividers.html similarity index 100% rename from jekyll/_patterns/lists/lists-dividers.html rename to examples/patterns/lists/lists-dividers.html diff --git a/jekyll/_patterns/lists/lists-inline.html b/examples/patterns/lists/lists-inline.html similarity index 100% rename from jekyll/_patterns/lists/lists-inline.html rename to examples/patterns/lists/lists-inline.html diff --git a/jekyll/_patterns/lists/lists-mid-dot.html b/examples/patterns/lists/lists-mid-dot.html similarity index 100% rename from jekyll/_patterns/lists/lists-mid-dot.html rename to examples/patterns/lists/lists-mid-dot.html diff --git a/jekyll/_patterns/lists/lists-stepped.html b/examples/patterns/lists/lists-stepped.html similarity index 100% rename from jekyll/_patterns/lists/lists-stepped.html rename to examples/patterns/lists/lists-stepped.html diff --git a/jekyll/_patterns/lists/lists-ticked.html b/examples/patterns/lists/lists-ticked.html similarity index 100% rename from jekyll/_patterns/lists/lists-ticked.html rename to examples/patterns/lists/lists-ticked.html diff --git a/jekyll/_patterns/matrix.html b/examples/patterns/matrix.html similarity index 100% rename from jekyll/_patterns/matrix.html rename to examples/patterns/matrix.html diff --git a/jekyll/_patterns/navigation.html b/examples/patterns/navigation.html similarity index 100% rename from jekyll/_patterns/navigation.html rename to examples/patterns/navigation.html diff --git a/jekyll/_patterns/notifications/action.html b/examples/patterns/notifications/action.html similarity index 100% rename from jekyll/_patterns/notifications/action.html rename to examples/patterns/notifications/action.html diff --git a/jekyll/_patterns/notifications/negative.html b/examples/patterns/notifications/negative.html similarity index 100% rename from jekyll/_patterns/notifications/negative.html rename to examples/patterns/notifications/negative.html diff --git a/jekyll/_patterns/notifications/notifications.html b/examples/patterns/notifications/notifications.html similarity index 100% rename from jekyll/_patterns/notifications/notifications.html rename to examples/patterns/notifications/notifications.html diff --git a/jekyll/_patterns/notifications/positive.html b/examples/patterns/notifications/positive.html similarity index 100% rename from jekyll/_patterns/notifications/positive.html rename to examples/patterns/notifications/positive.html diff --git a/jekyll/_patterns/notifications/warning.html b/examples/patterns/notifications/warning.html similarity index 100% rename from jekyll/_patterns/notifications/warning.html rename to examples/patterns/notifications/warning.html diff --git a/jekyll/_patterns/pull-quotes.html b/examples/patterns/pull-quotes.html similarity index 100% rename from jekyll/_patterns/pull-quotes.html rename to examples/patterns/pull-quotes.html diff --git a/jekyll/_patterns/strips/strips-dark.html b/examples/patterns/strips/strips-dark.html similarity index 100% rename from jekyll/_patterns/strips/strips-dark.html rename to examples/patterns/strips/strips-dark.html diff --git a/jekyll/_patterns/strips/strips-light.html b/examples/patterns/strips/strips-light.html similarity index 100% rename from jekyll/_patterns/strips/strips-light.html rename to examples/patterns/strips/strips-light.html diff --git a/jekyll/_utilities/clearfix.html b/examples/utilities/clearfix.html similarity index 100% rename from jekyll/_utilities/clearfix.html rename to examples/utilities/clearfix.html diff --git a/jekyll/_utilities/content-align.html b/examples/utilities/content-align.html similarity index 100% rename from jekyll/_utilities/content-align.html rename to examples/utilities/content-align.html diff --git a/jekyll/_utilities/embedded-media.html b/examples/utilities/embedded-media.html similarity index 100% rename from jekyll/_utilities/embedded-media.html rename to examples/utilities/embedded-media.html diff --git a/jekyll/_utilities/equal-height.html b/examples/utilities/equal-height.html similarity index 100% rename from jekyll/_utilities/equal-height.html rename to examples/utilities/equal-height.html diff --git a/jekyll/_utilities/floats.html b/examples/utilities/floats.html similarity index 100% rename from jekyll/_utilities/floats.html rename to examples/utilities/floats.html diff --git a/jekyll/_utilities/margin-collapse.html b/examples/utilities/margin-collapse.html similarity index 100% rename from jekyll/_utilities/margin-collapse.html rename to examples/utilities/margin-collapse.html diff --git a/jekyll/_utilities/off-screen.html b/examples/utilities/off-screen.html similarity index 100% rename from jekyll/_utilities/off-screen.html rename to examples/utilities/off-screen.html diff --git a/jekyll/_utilities/padding-collapse.html b/examples/utilities/padding-collapse.html similarity index 100% rename from jekyll/_utilities/padding-collapse.html rename to examples/utilities/padding-collapse.html diff --git a/gulp/jekyll.js b/gulp/jekyll.js index 2bbd8b85c..b610a2572 100644 --- a/gulp/jekyll.js +++ b/gulp/jekyll.js @@ -3,5 +3,6 @@ var shell = require('gulp-shell'); // Watch tasks gulp.task('jekyll:serve', shell.task([ - 'jekyll serve' + 'JEKYLL_ENV=development bundle exec jekyll serve' ])); + diff --git a/jekyll/index.html b/index.html similarity index 56% rename from jekyll/index.html rename to index.html index f3373b656..cbfc2a39a 100755 --- a/jekyll/index.html +++ b/index.html @@ -1,55 +1,61 @@ ---- -layout: default -title: Home ---- - - -
-
-
-

{{ site.name }}

-
-
-
-
- -
-
-
-

Base

- -
-
-

Patterns

- -
-
-

Utilities

- -
-
-
+--- +layout: default +title: Home +--- + + +
+
+
+

{{ site.name }}

+
+
+
+
+ +
+
+
+

Base

+ +
+
+

Patterns

+ +
+
+

Utilities

+ +
+
+
diff --git a/run b/run deleted file mode 100755 index 5314f918b..000000000 --- a/run +++ /dev/null @@ -1,66 +0,0 @@ -#! /usr/bin/env bash - -## -# A script to install dependencies and run gulp inside docker-containers -## - -# strict mode (http://redsymbol.net/articles/unofficial-bash-strict-mode/) -set -euo pipefail - -## -# Check docker is installed correctly -## -if ! command -v docker >/dev/null 2>&1; then - echo " - Error: Docker not installed - == - Please install Docker before continuing: - https://www.docker.com/products/docker - " -fi -if grep -q '^docker:' /etc/group && ! groups | grep -q '\bdocker\b'; then - echo " - Error: `whoami` not in docker group - === - Please add this user to the docker group, e.g. with: - $$ newgrp docker - " -fi - -if [ ! -f .packages-volume-name ]; then - hash=$(uuidgen | sed 's/-//g' | cut -c1-8) - echo "node-packages-$hash" > .packages-volume-name -fi - -commands=$@ - -while [[ -n "${1:-}" ]] && [[ "${1:0:1}" == "-" ]]; do - key="$1" - - case $key in - -l|--local-override-module) - if [ -z "${2:-}" ]; then invalid; fi - override_paths+=("$2") - shift - ;; - -h|--help) commands="usage" ;; - *) invalid ;; - esac - shift -done - -if [ -n "${override_paths:-}" ]; then - overrides="" - for path in "${override_paths[@]}"; do - module_name=$(basename $path) - overrides+=" --volume '$path':/packages/overrides/$module_name" - done -fi - -docker run \ - -ti \ - --volume $(cat .packages-volume-name):/packages/node_modules \ - ${overrides:-} \ - --volume `pwd`:/app \ - ubuntudesign/node:v1.0.6 $commands - diff --git a/scss/grid/shelves-grid.scss b/scss/grid/shelves-grid.scss index 30f214c44..ea7ad72c8 100755 --- a/scss/grid/shelves-grid.scss +++ b/scss/grid/shelves-grid.scss @@ -1,147 +1,147 @@ -@import "./shelves"; - -@include shelves-base; - -// Mobile -// ---------------------------------------------------------------------------- - -@if $shelves-mobile-columns != false { - @include with-mobile-grid { - %shelves-mobile-column-base { - @include column-base; - @include column-gutter; - - .#{class-name($shelves-row-name)} &:first-child { - @extend %shelves-mobile-first-column; - } - } - - %shelves-mobile-first-column { - @include reset-column-gutter; - } - - .#{class-name($shelves-first-mobile-column-name)} { - @extend %shelves-mobile-first-column; - } - - @include shelves-columns( - $extend: "shelves-mobile-column-base", - $prefixes: $shelves-mobile-prefixes, - $suffixes: $shelves-mobile-suffixes, - $pushes: $shelves-mobile-pushes, - $pulls: $shelves-mobile-pulls, - $column-name: $shelves-mobile-column-name, - $prefix-name: $shelves-mobile-prefix-name, - $suffix-name: $shelves-mobile-suffix-name, - $push-name: $shelves-mobile-push-name, - $pull-name: $shelves-mobile-pull-name - ); - } -} - -// Tablet -// ---------------------------------------------------------------------------- - -@if $shelves-tablet-columns != false { - @include on-tablet-up { - %shelves-tablet-column-base { - @include column-base; - @include column-gutter; - - .#{class-name($shelves-row-name)} &:first-child { - @extend %shelves-tablet-first-column; - } - } - - %shelves-tablet-first-column { - @include reset-column-gutter; - } - - .#{class-name($shelves-first-tablet-column-name)} { - @extend %shelves-tablet-first-column; - } - - @include shelves-columns( - $extend: "shelves-tablet-column-base", - $prefixes: $shelves-tablet-prefixes, - $suffixes: $shelves-tablet-suffixes, - $pushes: $shelves-tablet-pushes, - $pulls: $shelves-tablet-pulls, - $column-name: $shelves-tablet-column-name, - $prefix-name: $shelves-tablet-prefix-name, - $suffix-name: $shelves-tablet-suffix-name, - $push-name: $shelves-tablet-push-name, - $pull-name: $shelves-tablet-pull-name - ); - } -} - -// Desktop -// ---------------------------------------------------------------------------- - -@if $shelves-desktop-columns != false { - @include on-desktop { - %shelves-desktop-column-base { - @include column-base; - @include column-gutter; - - .#{class-name($shelves-row-name)} &:first-child { - @extend %shelves-first-desktop-column; - } - } - - %shelves-first-desktop-column { - @include reset-column-gutter; - } - - .#{class-name($shelves-first-desktop-column-name)} { - @extend %shelves-first-desktop-column; - } - - @include shelves-columns( - $extend: "shelves-desktop-column-base", - $prefixes: $shelves-prefixes, - $suffixes: $shelves-suffixes, - $pushes: $shelves-pushes, - $pulls: $shelves-pulls - ); - - // Nested Desktop Columns - - @if $shelves-nested-columns != false { - @for $i from 1 to $shelves-desktop-columns - 1 { - // Loop background through the columns - // to cascade the nested column properties. - $i: $shelves-desktop-columns - $i; - - .#{class-name($shelves-desktop-column-name $i)} { - %shelves-nested-column-#{$i}-base { - @include column-gutter($i); - } - - @include shelves-columns( - $extend: "shelves-nested-column-#{$i}-base", - $context: $i, - $prefixes: $shelves-nested-prefixes, - $suffixes: $shelves-nested-suffixes, - $pushes: $shelves-nested-pushes, - $pulls: $shelves-nested-pulls - ); - } - } - } - } -} - -@if $shelves-center { - .#{class-name($shelves-row-name)} .#{class-name($shelves-center-column-name)} { - @include center-column; - } -} - -// Visibility Helpers -// ---------------------------------------------------------------------------- - -@if $shelves-visibility { - @include shelves-visibility-helpers; -} +@import "./shelves"; + +@include shelves-base; + +// Mobile +// ---------------------------------------------------------------------------- + +@if $shelves-mobile-columns != false { + @include with-mobile-grid { + %shelves-mobile-column-base { + @include column-base; + @include column-gutter; + + .#{class-name($shelves-row-name)} &:first-child { + @extend %shelves-mobile-first-column; + } + } + + %shelves-mobile-first-column { + @include reset-column-gutter; + } + + .#{class-name($shelves-first-mobile-column-name)} { + @extend %shelves-mobile-first-column; + } + + @include shelves-columns( + $extend: "shelves-mobile-column-base", + $prefixes: $shelves-mobile-prefixes, + $suffixes: $shelves-mobile-suffixes, + $pushes: $shelves-mobile-pushes, + $pulls: $shelves-mobile-pulls, + $column-name: $shelves-mobile-column-name, + $prefix-name: $shelves-mobile-prefix-name, + $suffix-name: $shelves-mobile-suffix-name, + $push-name: $shelves-mobile-push-name, + $pull-name: $shelves-mobile-pull-name + ); + } +} + +// Tablet +// ---------------------------------------------------------------------------- + +@if $shelves-tablet-columns != false { + @include on-tablet-up { + %shelves-tablet-column-base { + @include column-base; + @include column-gutter; + + .#{class-name($shelves-row-name)} &:first-child { + @extend %shelves-tablet-first-column; + } + } + + %shelves-tablet-first-column { + @include reset-column-gutter; + } + + .#{class-name($shelves-first-tablet-column-name)} { + @extend %shelves-tablet-first-column; + } + + @include shelves-columns( + $extend: "shelves-tablet-column-base", + $prefixes: $shelves-tablet-prefixes, + $suffixes: $shelves-tablet-suffixes, + $pushes: $shelves-tablet-pushes, + $pulls: $shelves-tablet-pulls, + $column-name: $shelves-tablet-column-name, + $prefix-name: $shelves-tablet-prefix-name, + $suffix-name: $shelves-tablet-suffix-name, + $push-name: $shelves-tablet-push-name, + $pull-name: $shelves-tablet-pull-name + ); + } +} + +// Desktop +// ---------------------------------------------------------------------------- + +@if $shelves-desktop-columns != false { + @include on-desktop { + %shelves-desktop-column-base { + @include column-base; + @include column-gutter; + + .#{class-name($shelves-row-name)} &:first-child { + @extend %shelves-first-desktop-column; + } + } + + %shelves-first-desktop-column { + @include reset-column-gutter; + } + + .#{class-name($shelves-first-desktop-column-name)} { + @extend %shelves-first-desktop-column; + } + + @include shelves-columns( + $extend: "shelves-desktop-column-base", + $prefixes: $shelves-prefixes, + $suffixes: $shelves-suffixes, + $pushes: $shelves-pushes, + $pulls: $shelves-pulls + ); + + // Nested Desktop Columns + + @if $shelves-nested-columns != false { + @for $i from 1 to $shelves-desktop-columns - 1 { + // Loop background through the columns + // to cascade the nested column properties. + $i: $shelves-desktop-columns - $i; + + .#{class-name($shelves-desktop-column-name $i)} { + %shelves-nested-column-#{$i}-base { + @include column-gutter($i); + } + + @include shelves-columns( + $extend: "shelves-nested-column-#{$i}-base", + $context: $i, + $prefixes: $shelves-nested-prefixes, + $suffixes: $shelves-nested-suffixes, + $pushes: $shelves-nested-pushes, + $pulls: $shelves-nested-pulls + ); + } + } + } + } +} + +@if $shelves-center { + .#{class-name($shelves-row-name)} .#{class-name($shelves-center-column-name)} { + @include center-column; + } +} + +// Visibility Helpers +// ---------------------------------------------------------------------------- + +@if $shelves-visibility { + @include shelves-visibility-helpers; +} diff --git a/scss/grid/shelves/mixins/_generators.scss b/scss/grid/shelves/mixins/_generators.scss index 694d351a4..f3516c2bd 100755 --- a/scss/grid/shelves/mixins/_generators.scss +++ b/scss/grid/shelves/mixins/_generators.scss @@ -1,143 +1,143 @@ -// Generates the grid's base classes. -// -// $responsive-base - Include the responsive base styles. -// Defaults to the value of $shelves-responsive-base. -// -@mixin shelves-base($responsive-base: $shelves-responsive-base) { - @if $responsive-base { - @include shelves-responsive-base; - } - - .#{class-name($shelves-row-name)} { - @include row; - - .#{class-name($shelves-row-name)} { - @include reset-row; - } - } -} - -// Adds some non-grid related responsive styles. It fixes IE 10's -// "Snap Mode" and making images fluid. -@mixin shelves-responsive-base { - @include fix-snap-mode; - - img { - @include fluid-media; - } -} - -// Include visibility helpers for showing/hiding content based on -// device size. -@mixin shelves-visibility-helpers { - @include on-mobile { - .#{class-name($shelves-hidden-mobile-name)}, - .#{class-name($shelves-visible-tablet-name)}, - .#{class-name($shelves-visible-desktop-name)} { - @include force-hidden; - } - } - - @include on-tablet { - .#{class-name($shelves-visible-mobile-name)}, - .#{class-name($shelves-hidden-tablet-name)}, - .#{class-name($shelves-visible-desktop-name)} { - @include force-hidden; - } - } - - @include on-desktop { - .#{class-name($shelves-visible-mobile-name)}, - .#{class-name($shelves-visible-tablet-name)}, - .#{class-name($shelves-hidden-desktop-name)} { - @include force-hidden; - } - } -} - -// Generates the classes used for laying out and modifying -// the columns. This can be used in different contexts, varying -// the number of columns if necessary. -// -// $extend - Each column will @extend this placeholder if set. -// Defaults to null. -// $start - Where to start the loop. Defaults to 1. -// $end - Where to end the loop. -// Defaults to the value of $total. -// $context - The context of generated classes. -// Defaults to the value of $total. -// $total - The total number of columns in the grid. -// Defaults to the value of $shelves-columns. -// $gutter - The width of the gutter in the root context (in %). -// Defaults to the value of $shelves-gutter. -// $prefixes - Include prefix classes. Defaults to false. -// $suffixes - Include suffix classes. Defaults to false. -// $pushes - Include push classes. Defaults to false. -// $pulls - Include pull classes. Defaults to false. -// $column-name - The name of the column to generate widths for. -// Defaults to $shelves-desktop-column-name. -// $prefix-name - The class name of the prefix modifier. -// Defaults to $shelves-desktop-prefix-name. -// $suffix-name - The class name of the suffix modifier. -// Defaults to $shelves-desktop-suffix-name. -// $push-name - The class name of the push modifier. -// Defaults to $shelves-desktop-push-name. -// $pull-name - The class name of the pull modifier. -// Defaults to $shelves-desktop-pull-name. -// -@mixin shelves-columns( - $extend: null, - $start: 1, - $end: null, - $context: $shelves-context, - $total: $shelves-columns, - $gutter: $shelves-gutter, - $prefixes: false, - $suffixes: false, - $pushes: false, - $pulls: false, - $column-name: $shelves-desktop-column-name, - $prefix-name: $shelves-desktop-prefix-name, - $suffix-name: $shelves-desktop-suffix-name, - $push-name: $shelves-desktop-push-name, - $pull-name: $shelves-desktop-pull-name) { - $context: $total !default; - $end: $context !default; - - @for $i from $start to $end { - .#{class-name($column-name $i)} { - @if $extend { - @extend %#{$extend}; - } - @include column-width($i, $context, $total, $gutter); - } - } - @if $prefixes { - @for $i from $start to $end { - .#{class-name($prefix-name $i)} { - @include prefix-column($i, $context, $total, $gutter); - } - } - } - @if $suffixes { - @for $i from $start to $end { - .#{class-name($suffix-name $i)} { - @include suffix-column($i, $context, $total, $gutter); - } - } - } - @if $pushes { - @for $i from $start to $end { - .#{class-name($push-name $i)} { - @include push-column($i, $context, $total, $gutter); - } - } - } - @if $pulls { - @for $i from $start to $end { - .#{class-name($pull-name $i)} { - @include pull-column($i, $context, $total, $gutter); - } - } - } -} +// Generates the grid's base classes. +// +// $responsive-base - Include the responsive base styles. +// Defaults to the value of $shelves-responsive-base. +// +@mixin shelves-base($responsive-base: $shelves-responsive-base) { + @if $responsive-base { + @include shelves-responsive-base; + } + + .#{class-name($shelves-row-name)} { + @include row; + + .#{class-name($shelves-row-name)} { + @include reset-row; + } + } +} + +// Adds some non-grid related responsive styles. It fixes IE 10's +// "Snap Mode" and making images fluid. +@mixin shelves-responsive-base { + @include fix-snap-mode; + + img { + @include fluid-media; + } +} + +// Include visibility helpers for showing/hiding content based on +// device size. +@mixin shelves-visibility-helpers { + @include on-mobile { + .#{class-name($shelves-hidden-mobile-name)}, + .#{class-name($shelves-visible-tablet-name)}, + .#{class-name($shelves-visible-desktop-name)} { + @include force-hidden; + } + } + + @include on-tablet { + .#{class-name($shelves-visible-mobile-name)}, + .#{class-name($shelves-hidden-tablet-name)}, + .#{class-name($shelves-visible-desktop-name)} { + @include force-hidden; + } + } + + @include on-desktop { + .#{class-name($shelves-visible-mobile-name)}, + .#{class-name($shelves-visible-tablet-name)}, + .#{class-name($shelves-hidden-desktop-name)} { + @include force-hidden; + } + } +} + +// Generates the classes used for laying out and modifying +// the columns. This can be used in different contexts, varying +// the number of columns if necessary. +// +// $extend - Each column will @extend this placeholder if set. +// Defaults to null. +// $start - Where to start the loop. Defaults to 1. +// $end - Where to end the loop. +// Defaults to the value of $total. +// $context - The context of generated classes. +// Defaults to the value of $total. +// $total - The total number of columns in the grid. +// Defaults to the value of $shelves-columns. +// $gutter - The width of the gutter in the root context (in %). +// Defaults to the value of $shelves-gutter. +// $prefixes - Include prefix classes. Defaults to false. +// $suffixes - Include suffix classes. Defaults to false. +// $pushes - Include push classes. Defaults to false. +// $pulls - Include pull classes. Defaults to false. +// $column-name - The name of the column to generate widths for. +// Defaults to $shelves-desktop-column-name. +// $prefix-name - The class name of the prefix modifier. +// Defaults to $shelves-desktop-prefix-name. +// $suffix-name - The class name of the suffix modifier. +// Defaults to $shelves-desktop-suffix-name. +// $push-name - The class name of the push modifier. +// Defaults to $shelves-desktop-push-name. +// $pull-name - The class name of the pull modifier. +// Defaults to $shelves-desktop-pull-name. +// +@mixin shelves-columns( + $extend: null, + $start: 1, + $end: null, + $context: $shelves-context, + $total: $shelves-columns, + $gutter: $shelves-gutter, + $prefixes: false, + $suffixes: false, + $pushes: false, + $pulls: false, + $column-name: $shelves-desktop-column-name, + $prefix-name: $shelves-desktop-prefix-name, + $suffix-name: $shelves-desktop-suffix-name, + $push-name: $shelves-desktop-push-name, + $pull-name: $shelves-desktop-pull-name) { + $context: $total !default; + $end: $context !default; + + @for $i from $start to $end { + .#{class-name($column-name $i)} { + @if $extend { + @extend %#{$extend}; + } + @include column-width($i, $context, $total, $gutter); + } + } + @if $prefixes { + @for $i from $start to $end { + .#{class-name($prefix-name $i)} { + @include prefix-column($i, $context, $total, $gutter); + } + } + } + @if $suffixes { + @for $i from $start to $end { + .#{class-name($suffix-name $i)} { + @include suffix-column($i, $context, $total, $gutter); + } + } + } + @if $pushes { + @for $i from $start to $end { + .#{class-name($push-name $i)} { + @include push-column($i, $context, $total, $gutter); + } + } + } + @if $pulls { + @for $i from $start to $end { + .#{class-name($pull-name $i)} { + @include pull-column($i, $context, $total, $gutter); + } + } + } +} From f2be17ec00b05780f48e2b685b0cf01a2f987ab1 Mon Sep 17 00:00:00 2001 From: Robin Winslow Date: Mon, 6 Feb 2017 15:57:57 +0000 Subject: [PATCH 06/12] Fix travis for new jenkins location --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6c00d80ea..4c47ca08c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,4 +22,4 @@ before_script: - gem install percy-cli script: - jekyll build - - percy snapshot --widths "375,768,1280" _site/ + - percy snapshot --widths "375,768,1280" _jekyll/_site/ From 1bed63c4e6ab2fe538d80324bafbfdf80b0ca186 Mon Sep 17 00:00:00 2001 From: Barry McGee Date: Tue, 7 Feb 2017 15:33:31 +0000 Subject: [PATCH 07/12] Update Matrix docs (#823) --- docs/patterns/_matrix.md | 170 ++++++++++++++++++++------------------- 1 file changed, 86 insertions(+), 84 deletions(-) diff --git a/docs/patterns/_matrix.md b/docs/patterns/_matrix.md index 944044848..75266672d 100644 --- a/docs/patterns/_matrix.md +++ b/docs/patterns/_matrix.md @@ -3,94 +3,96 @@ collection: patterns title: Matrix --- +Matrix items will display in one column on small screens. At resolutions above `$breakpoint-medium`, the matrix switches to three items per row. +
    -
  • - icon -
    -

    Title

    -

    Short description

    -
    -
    • -
  • - icon -
    -

    Title

    -

    Short description

    -
    -
    • -
  • - icon -
    -

    Title

    -

    Short description

    -
    -
    • -
  • - icon -
    -

    Title

    -

    Short description

    -
    -
    • -
  • - icon -
    -

    Title

    -

    Short description

    -
    -
    • -
  • - icon -
    -

    Title

    -

    Short description

    -
    -
    • +
  • + icon +
    +

    Title

    +

    Short description

    +
    +
    • +
  • + icon +
    +

    Title

    +

    Short description

    +
    +
    • +
  • + icon +
    +

    Title

    +

    Short description

    +
    +
    • +
  • + icon +
    +

    Title

    +

    Short description

    +
    +
    • +
  • + icon +
    +

    Title

    +

    Short description

    +
    +
    • +
  • + icon +
    +

    Title

    +

    Short description

    +
    +
```html
    -
  • - icon -
    -

    Title

    -

    Short description

    -
    -
    • -
  • - icon -
    -

    Title

    -

    Short description

    -
    -
    • -
  • - icon -
    -

    Title

    -

    Short description

    -
    -
    • -
  • - icon -
    -

    Title

    -

    Short description

    -
    -
    • -
  • - icon -
    -

    Title

    -

    Short description

    -
    -
    • -
  • - icon -
    -

    Title

    -

    Short description

    -
    -
    • +
  • + icon +
    +

    Title

    +

    Short description

    +
    +
    • +
  • + icon +
    +

    Title

    +

    Short description

    +
    +
    • +
  • + icon +
    +

    Title

    +

    Short description

    +
    +
    • +
  • + icon +
    +

    Title

    +

    Short description

    +
    +
    • +
  • + icon +
    +

    Title

    +

    Short description

    +
    +
    • +
  • + icon +
    +

    Title

    +

    Short description

    +
    +
``` From 456029fd2b575222f0eaeab036c479e2932720d5 Mon Sep 17 00:00:00 2001 From: Anthony Dillon Date: Tue, 7 Feb 2017 15:52:40 +0000 Subject: [PATCH 08/12] Remove wrapping grid from the example template (#826) --- _jekyll/_layouts/default.html | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/_jekyll/_layouts/default.html b/_jekyll/_layouts/default.html index 8716ce032..e02265a5b 100755 --- a/_jekyll/_layouts/default.html +++ b/_jekyll/_layouts/default.html @@ -12,11 +12,6 @@ -
-
- {{ content }} -
-
- +{{ content }} From 118e3aa1a480aabe8018c58edf6c590bee1f291a Mon Sep 17 00:00:00 2001 From: Barry McGee Date: Tue, 7 Feb 2017 18:16:29 +0000 Subject: [PATCH 09/12] Update .travis.yml to add --baseurl flag --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4c47ca08c..5856ebee7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,4 +22,4 @@ before_script: - gem install percy-cli script: - jekyll build - - percy snapshot --widths "375,768,1280" _jekyll/_site/ + - percy snapshot --baseurl "/vanilla-framework" --widths "375,768,1280" _jekyll/_site/ From c8230ffbd9d0682fab772f19f3878ab912ce3563 Mon Sep 17 00:00:00 2001 From: Barry McGee Date: Tue, 7 Feb 2017 20:02:47 +0000 Subject: [PATCH 10/12] Add CSS build step to .travis.yml --- .travis.yml | 2 ++ gulp/styles.js | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5856ebee7..cffaa1429 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,8 @@ notifications: language: ruby rvm: 2.1.1 before_script: + - npm i + - node_modules/gulp/bin/gulp.js sass:jekyll - gem install jekyll - gem install percy-cli script: diff --git a/gulp/styles.js b/gulp/styles.js index 70adc8582..005df9c2d 100644 --- a/gulp/styles.js +++ b/gulp/styles.js @@ -31,6 +31,14 @@ gulp.task('sass:develop', function() { .pipe(gulp.dest('jekyll/css/')); }); +// Build Sass for visual regression testing +gulp.task('sass:jekyll', function() { + return gulp.src(sassPath) + .pipe(sass({ errLogToConsole: true })) + .pipe(autoprefixer('last 2 version', 'safari 5', 'ie 8', 'ie 9', 'opera 12.1')) + .pipe(gulp.dest('_jekyll/_site/build/css/')); +}); + // Build Sass for production gulp.task('sass:build', function() { return gulp.src(sassPath) From 260662926c94556e85f733003a7799cd9caab187 Mon Sep 17 00:00:00 2001 From: Barry McGee Date: Wed, 8 Feb 2017 14:31:41 +0000 Subject: [PATCH 11/12] Update travis build settings for percy --- .travis.yml | 20 ++++++++------------ gulp/styles.js | 10 +--------- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index cffaa1429..1e21482af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,18 @@ language: node_js node_js: - "6.6.0" +before_install: + - rvm install 2.2.5 +install: + - gem install jekyll + - gem install percy-cli + - npm install before_script: - - npm i - node_modules/gulp/bin/gulp.js build script: + - jekyll build - node_modules/gulp/bin/gulp.js test + - percy snapshot --widths "375,768,1280" _jekyll/_site/ --baseurl "/vanilla-framework" notifications: irc: channels: @@ -14,14 +21,3 @@ notifications: on_success: change on_failure: always on_success: change - -language: ruby -rvm: 2.1.1 -before_script: - - npm i - - node_modules/gulp/bin/gulp.js sass:jekyll - - gem install jekyll - - gem install percy-cli -script: - - jekyll build - - percy snapshot --baseurl "/vanilla-framework" --widths "375,768,1280" _jekyll/_site/ diff --git a/gulp/styles.js b/gulp/styles.js index 005df9c2d..4f03634b0 100644 --- a/gulp/styles.js +++ b/gulp/styles.js @@ -28,15 +28,6 @@ gulp.task('sass:develop', function() { .pipe(autoprefixer('last 2 version', 'safari 5', 'ie 8', 'ie 9', 'opera 12.1')) .pipe(sourcemaps.write('maps/')) .pipe(gulp.dest('build/css/')) - .pipe(gulp.dest('jekyll/css/')); -}); - -// Build Sass for visual regression testing -gulp.task('sass:jekyll', function() { - return gulp.src(sassPath) - .pipe(sass({ errLogToConsole: true })) - .pipe(autoprefixer('last 2 version', 'safari 5', 'ie 8', 'ie 9', 'opera 12.1')) - .pipe(gulp.dest('_jekyll/_site/build/css/')); }); // Build Sass for production @@ -49,6 +40,7 @@ gulp.task('sass:build', function() { onError: throwSassError })) .pipe(autoprefixer('last 2 version', 'safari 5', 'ie 8', 'ie 9', 'opera 12.1')) + .pipe(gulp.dest('build/css/')) .pipe(cssnano()) .pipe(rename({suffix: '.min'})) .pipe(gulp.dest('build/css/')); From 7383ac7db58e26b44f63f8fd170589c5034d906f Mon Sep 17 00:00:00 2001 From: Barry McGee Date: Wed, 8 Feb 2017 15:33:19 +0000 Subject: [PATCH 12/12] Remove vf-p-combined-list as no longer needed This list style is no longer needed here as it was brochure specific and has been moved downstream to the vanilla-brochure-theme. Fixes #812 --- scss/_patterns_lists.scss | 39 --------------------------------------- 1 file changed, 39 deletions(-) diff --git a/scss/_patterns_lists.scss b/scss/_patterns_lists.scss index 3a67b84bc..9cf148bfa 100644 --- a/scss/_patterns_lists.scss +++ b/scss/_patterns_lists.scss @@ -3,7 +3,6 @@ @include vf-p-list; @include vf-p-list-divided; @include vf-p-list-item-state; - @include vf-p-combined-list; @include vf-p-inline-list; @include vf-p-inline-list-middot; @include vf-p-stepped-list; @@ -54,44 +53,6 @@ } } -// Displays split as one on small screens -@mixin vf-p-combined-list { - .combined-list { - ul, - div { - margin-bottom: 0; - } - - .last-item { - border-bottom: 1px dotted $color-mid-light; - padding-bottom: 10px; - } - - .last-col { - margin-bottom: 20px; - - .last-item { - border-bottom: 0; - padding-bottom: 0; - } - } - } - - @media only screen and (min-width: $breakpoint-medium) { - .combined-list { - ul, - div { - margin-bottom: 1.25rem; - } - - .last-item { - border-bottom: 0; - padding-bottom: 0; - } - } - } -} - // Displays a list inline with spacing @mixin vf-p-inline-list { .p-inline-list {