diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 0000000..121531a --- /dev/null +++ b/.eslintignore @@ -0,0 +1 @@ +*.min.js diff --git a/.eslintrc b/.eslintrc deleted file mode 100644 index afad7ef..0000000 --- a/.eslintrc +++ /dev/null @@ -1,87 +0,0 @@ -{ - "extends": "eslint:recommended", - "env": { - "browser": true - }, - "globals": { - "Drupal": true, - "jQuery": true - }, - "rules": { - // Errors. - "array-bracket-spacing": [2, "never"], - "block-scoped-var": 2, - "brace-style": [2, "stroustrup", {"allowSingleLine": true}], - "comma-dangle": [2, "never"], - "comma-spacing": 2, - "comma-style": [2, "last"], - "computed-property-spacing": [2, "never"], - "curly": [2, "all"], - "eol-last": 2, - "eqeqeq": [2, "smart"], - "guard-for-in": 2, - "indent": [2, 2, {"SwitchCase": 1}], - "key-spacing": [2, {"beforeColon": false, "afterColon": true}], - "keyword-spacing": [2, {"before": true, "after": true}], - "linebreak-style": [2, "unix"], - "lines-around-comment": [2, {"beforeBlockComment": true, "afterBlockComment": false}], - "new-parens": 2, - "no-array-constructor": 2, - "no-caller": 2, - "no-catch-shadow": 2, - "no-eval": 2, - "no-extend-native": 2, - "no-extra-bind": 2, - "no-extra-parens": [2, "functions"], - "no-implied-eval": 2, - "no-iterator": 2, - "no-label-var": 2, - "no-labels": 2, - "no-lone-blocks": 2, - "no-loop-func": 2, - "no-multi-spaces": 2, - "no-multi-str": 2, - "no-native-reassign": 2, - "no-nested-ternary": 2, - "no-new-func": 2, - "no-new-object": 2, - "no-new-wrappers": 2, - "no-octal-escape": 2, - "no-process-exit": 2, - "no-proto": 2, - "no-return-assign": 2, - "no-script-url": 2, - "no-sequences": 2, - "no-shadow-restricted-names": 2, - "no-spaced-func": 2, - "no-trailing-spaces": 2, - "no-undef-init": 2, - "no-undefined": 2, - "no-unused-expressions": 2, - "no-unused-vars": [2, {"vars": "all", "args": "none"}], - "no-with": 2, - "object-curly-spacing": [2, "never"], - "one-var": [2, "never"], - "quote-props": [2, "consistent-as-needed"], - "quotes": [2, "single", "avoid-escape"], - "semi": [2, "always"], - "semi-spacing": [2, {"before": false, "after": true}], - "space-before-blocks": [2, "always"], - "space-before-function-paren": [2, {"anonymous": "always", "named": "never"}], - "space-in-parens": [2, "never"], - "space-infix-ops": 2, - "space-unary-ops": [2, { "words": true, "nonwords": false }], - "spaced-comment": [2, "always"], - "strict": 2, - "yoda": [2, "never"], - // Warnings. - "max-nested-callbacks": [1, 3], - "valid-jsdoc": [1, { - "prefer": { - "returns": "return", - "property": "prop" - }, - "requireReturn": false - }] - } -} diff --git a/.eslintrc.yaml b/.eslintrc.yaml new file mode 100644 index 0000000..a88c652 --- /dev/null +++ b/.eslintrc.yaml @@ -0,0 +1,142 @@ +extends: eslint:recommended +env: + browser: true +globals: + jQuery: true +rules: + array-bracket-spacing: + - "error" + - never + block-scoped-var: "error" + brace-style: + - "error" + - stroustrup + - allowSingleLine: true + comma-dangle: + - "error" + - never + comma-spacing: "error" + comma-style: + - "error" + - last + computed-property-spacing: + - "error" + - never + curly: + - "error" + - all + eol-last: "error" + eqeqeq: + - "error" + - smart + guard-for-in: "error" + indent: + - "error" + - 2 + - SwitchCase: 1 + key-spacing: + - "error" + - afterColon: true + beforeColon: false + keyword-spacing: + - "error" + - after: true + before: true + linebreak-style: + - "error" + - unix + lines-around-comment: + - "error" + - afterBlockComment: false + beforeBlockComment: true + max-nested-callbacks: + - "warn" + - 3 + new-parens: "error" + no-array-constructor: "error" + no-caller: "error" + no-catch-shadow: "error" + no-eval: "error" + no-extend-native: "error" + no-extra-bind: "error" + no-extra-parens: + - "error" + - functions + no-implied-eval: "error" + no-iterator: "error" + no-label-var: "error" + no-labels: "error" + no-lone-blocks: "error" + no-loop-func: "error" + no-multi-spaces: "error" + no-multi-str: "error" + no-native-reassign: "error" + no-nested-ternary: "error" + no-new-func: "error" + no-new-object: "error" + no-new-wrappers: "error" + no-octal-escape: "error" + no-process-exit: "error" + no-proto: "error" + no-return-assign: "error" + no-script-url: "error" + no-sequences: "error" + no-shadow-restricted-names: "error" + no-spaced-func: "error" + no-trailing-spaces: "error" + no-undef-init: "error" + no-undefined: "error" + no-unused-expressions: "error" + no-unused-vars: + - "error" + - args: none + vars: all + no-with: "error" + object-curly-spacing: + - "error" + - never + one-var: + - "error" + - never + quote-props: + - "error" + - consistent-as-needed + quotes: + - "error" + - single + - avoid-escape + semi: + - "error" + - always + semi-spacing: + - "error" + - after: true + before: false + space-before-blocks: + - "error" + - always + space-before-function-paren: + - "error" + - anonymous: always + named: never + space-in-parens: + - "error" + - never + space-infix-ops: "error" + space-unary-ops: + - "error" + - nonwords: false + words: true + spaced-comment: + - "error" + - always + strict: "error" + valid-jsdoc: + - "warn" + - prefer: + property: prop + returns: return + requireReturn: false + yoda: + - "error" + - never diff --git a/README.md b/README.md index c728c4f..60f7124 100644 --- a/README.md +++ b/README.md @@ -16,10 +16,10 @@ The [old branch](https://github.com/frjo/hugo-theme-zen/tree/old) has the origin * Automatic linting of css and js * Contact form (PHP) * CSS grid and flex for layout -* Gulp.js +* Gulp.js (only for sass/js lint) * HTML5 +* Hugo Pipes for js and sass * jQuery 3 -* libSass * Micro.blog * Minify css * Meta tags and JSON-LD @@ -37,6 +37,7 @@ The [old branch](https://github.com/frjo/hugo-theme-zen/tree/old) has the origin * [Drejargården](https://www.drejargarden.se/) * [Helmer Grundström](https://www.helmergrundstrom.se/) * [xdeb.org](https://xdeb.org/) +* [xdeb.net](https://xdeb.net/) ## On the large screen @@ -64,22 +65,25 @@ $ git clone https://github.com/frjo/hugo-theme-zen.git zen [Hugo - Installing Hugo](https://gohugo.io/getting-started/installing/) -## Create a zen subtheme +## Customise layouts -Since Hugo 0.42 there is sub them support via [Theme Components](https://gohugo.io/themes/theme-components/). This makes it easy to update the base theme without overwriting customisation. +To customise a layout included in the zen theme, copy it to the root layout directory and edit it there. Make sure to maintain the directory structure inside the layouts directory. -Navigate to the theme folder where you have placed the zen base theme. Run the included "create_sub_theme.sh" script like this. +Add any new layouts to the root layout directory as well. This way they will not be overwritten when updating the theme. + + +## Customise styles and scripts + +Styles and scripts are processed with Hugo pipes that was added in Hugo 0.46. + +To customise a js or sass file, copy it to the root assets directory and edit it there. Make sure to maintain the directory structure inside the assets directory. + +By default the sass files are built for production, compressed with fingerprint. By setting the Hugo enviroment variable to "dev" they will instead be nested with sourcemaps. ``` -$ ./zen/create_sub_theme.sh +§ hugo serve watch --environment=dev ``` -Enter a name for your sub theme when asked for. In the site config file add your sub theme name first and "zen" after it. Hugo will now first look in the sub theme for files and if they are not there look in the zen base theme. - -Edit all css/sass only in the sub theme and add any custom layouts etc. If there is a need to edit e.g. layouts from the zen base theme make sure to copy them over to the sub theme and edit them there. - -This way all customisation are in the sub theme, making it easy to update the base theme. - ## config.yaml example @@ -90,8 +94,6 @@ baseurl: "https://example.org/" title: "SiteTitle" params: - cacheBustCSS: true # Add a cache busting hash on styles.css - cacheBustJS: true # Add a cache busting hash on script.js contact: "info@example.org" copyright: "This site is licensed under a (https://creativecommons.org/licenses/by-sa/4.0/)." @@ -215,18 +217,11 @@ The content that should be wrapped. ``` -## Use Gulp to generate css from sass +## Use Gulp to lint Sass and JavaScript -Your new Zen theme uses Gulp.js as a task runner, so that it can do many -different tasks automatically: - -* Build your CSS from your Sass using libSass and node-sass. -* Add vendor prefixes for the browsers you want to support using Autoprefixer. -* Build a style guide of your components based on the KSS comments in your Sass -source files. * Lint your Sass using sass-lint. * Lint your JavaScript using eslint. -* Minify the css. +* Will lint files in the theme as well as the root assets directory. * Watch all of your files as you develop and re-build everything on the fly. Set up your front-end development build tools: @@ -249,8 +244,7 @@ To install gulp's global wrapper, run: npm install -g gulp-cli -5. The default gulp task will build your production minified CSS, -build your style guide, and lint your Sass and JavaScript. +5. The default gulp task will lint your Sass and JavaScript. To run the default gulp task, type: gulp @@ -259,8 +253,17 @@ To run the default gulp task, type: gulp watch - or just type: - gulp watch:css - - to only watch the css files. +## Create a zen subtheme + +Since Hugo 0.42 there is sub them support via [Theme Components](https://gohugo.io/themes/theme-components/). A nice feature if you want to extend an existing theme, like zen. + +If all you want is customise layouts, styles and scripts for a site it's easier to copy the needed files to the root layout and assets directories and edit them there. See instructions above. + +The included "create_sub_theme.sh" script makes it easy to get started on a sub theme. Navigate to the theme directory where you have placed the zen base theme and run the script like this. + +``` +$ ./zen/create_sub_theme.sh +``` + +Enter a name for your sub theme when asked for. In the site config file add your sub theme name first and "zen" after it. Hugo will now first look in the sub theme for files and if they are not there look in the zen base theme. diff --git a/assets/lib/typey/stylesheets/_typey.scss b/assets/lib/typey/stylesheets/_typey.scss new file mode 100644 index 0000000..72d48f3 --- /dev/null +++ b/assets/lib/typey/stylesheets/_typey.scss @@ -0,0 +1,17 @@ +@import "typey/functions/helpers"; +@import "typey/functions/validators"; +@import "typey/functions/em-calculators"; +@import "typey/functions/outputters"; +@import "typey/functions/sizers"; +@import "typey/functions/extras"; +@import "typey/functions/depreciated"; +@import "typey/font-stacks"; +@import "typey/defaults"; +@import "typey/mixins/debug"; +@import "typey/mixins/define-type-sizing"; +@import "typey/mixins/font-size"; +@import "typey/mixins/line-height"; +@import "typey/mixins/spacing"; +@import "typey/mixins/typeface"; +@import "typey/mixins/typeset"; +@import "typey/mixins/type-layout"; diff --git a/assets/lib/typey/stylesheets/typey/_defaults.scss b/assets/lib/typey/stylesheets/typey/_defaults.scss new file mode 100644 index 0000000..29b9728 --- /dev/null +++ b/assets/lib/typey/stylesheets/typey/_defaults.scss @@ -0,0 +1,181 @@ +// The browser font size default. No need to change this. +// Allowed units: px +$browser-font-size: 16px !default; + +// Allowed units: rem, em or px +$base-unit: rem !default; + +// The base font size will be used for most calculations involving font-size. +// Allowed units: px +$base-font-size: 16px !default; + +// The base line height will be used for most calculations involving height. +// Allowed units: px +$base-line-height: 24px !default; + +// The method to calculate line-height. Allowed values: rhythm or ratio. +// Rhytm uses a vertical rhythm approach where line-height is specified as +// a multiple of the $base-line-height. +// Ratio uses a ratio approach where line-height is specified as a ratio +// of the elements font-size. +$line-height-method: rhythm !default; + +// The default ratio of line-height to font-size. +$base-line-height-ratio: 1.5 !default; + +// By default we will provide fallbacks when rem is the base unit. +$rem-fallback: true !default; + +// By default, when rem or em are the base unit we will output a print suitable +// media query with the define-type-sizing() mixin. This will take care of all +// print media type sizing effortlessly. +$auto-print-sizing: true !default; + +// The pt font-size to be used with the print media query when +// $auto-print-sizing is enabled. +// Allowed units: pt +$print-font-size: 12pt !default; + +// Default font sizes +// Once you redefine the $font-size map it will overwrite all sizes here. +// Allowed units: px +$font-size: ( + xxxl: 60px, + xxl: 46px, + xl: 32px, + l: 24px, + m: 16px, + s: 14px, + xs: 12px +) !default; + +// Default font weights +// This map and accompanying function help provide granular control over +// setting and retrieving static font weights. +$font-weight: ( + bold: 700, + normal: 400, + lighter: 200 +) !default; + +// Declare typefaces +// These can use any key you like, and allow you to set global letter-spacing, +// weight and case for font-families. You can then use the +// font-family mixin to embed your font families anywhere you like. +// +// Each key in the $typefaces map can either be a keyed map of settings +// using any combination of the keys below, or it can be a shorthand list +// of each property value. When using shorthand it doesn't matter what order +// each value is arranged in, but best practice is to do it in the order: +// [font-family] [letter-spacing] [weight] [case] +// +// @setting list font-family +// Any standard CSS font-family. Use typey pre-written stacks or roll your own. +// @setting number letter-spacing +// CSS letter-spacing. Specified as a px value when font-size is the +// $base-font-size. +// @setting string weight +// A key from the $font-weight map. Only specify this if you want a consistant +// font-weight used accross the board with this typeface. +// @setting string case +// A value for CSS text-transform. Only specify this if you want a consistant +// case used accross the board with this typeface. +$typefaces: () !default; + +// Declare typestyles +// These can use any key you like, and allow you to set an easily reusable type +// style. They can be as simple as a font-size and line-height, or can go on +// to encompass a full range of css type properties. +// +// Each key in the $typestyles map can either be a keyed map of settings +// using any combination of the keys below, or it can be a shorthand list +// of each property value. When using shorthand for $typestyles, the first value +// must always be font-size. After that it doesn't matter what order each value +// is arranged in, but best practice is to do it in the order: +// [font-size] [line-height] [weight] [case] +// +// @setting number|string font-size +// A size from the $font-size map or px value to be converted +// @setting number $x line-height +// Multiple of line height, ratio or px value to be converted. +// @setting string weight +// A key from the $font-weight map. +// @setting string case +// A value for CSS text-transform. +$typestyles: () !default; + +// Debug grid +// Shows horizontal lines for each elements line height. +$typey-debug: false !default; + +// Debug grid coloring +$typey-debug-color: #4affff !default; + +// Lets store the allowed values for text-transform and font-style so we can +// make shorthand work a little better. +$text-transform-values: ( + lowercase, + uppercase, + capitalize +) !default; + +$font-style-values: ( + normal, + italic, + oblique +) !default; + +// Warnings for $base-unit. +@if $base-unit != px and $base-unit != rem and $base-unit != em { + @error "$base-unit must be one of the following unit types: rem, em or px"; +} + +// Warnings for $base-font-size and $base-line-height. +@if unit($base-font-size) != px { + @error "$base-font-size must be in px"; +} +@if unit($base-line-height) != px { + @error "$base-line-height must be in px"; +} + +// Warnings for $print-font-size. +@if unit($print-font-size) != pt { + @error "$print-font-size must be in pt"; +} + +// Warnings for $font-size. +@each $key, $size in $font-size { + @if unit($size) != px { + @error "Size '#{$key}' in $font-size map is not specified in px"; + } +} + +// Warnings for $font-weight. +$typey-text-transform-properties: none capitalize uppercase lowercase initial inherit; +@each $property in $typey-text-transform-properties { + @if map-has-key($font-weight, $property) { + @warn "'#{$property}' used in $font-weight map is a potential value of the text-transform property and will conflict when using typey shorthand"; + } +} + +// Warnings for $typefaces. +@each $key, $typeface in $typefaces { + @if type-of($typeface) != "map" and type-of($typeface) != "list" { + @error "Typeface '#{$key}' in $typefaces map must be a keyed map or a shorthand list in the format: [font-family] [letter-spacing] [weight] [case]"; + } +} + +// Warnings for $typestyles. +@each $key, $typestyle in $typestyles { + @if type-of($typestyle) == "list" { + @each $value in $typestyle { + @if index($typestyle, $value) == 1 { + $allowed-types: "font-size", "px"; + $type: typey-check-value($value); + @if index($allowed-types, $type) == null { + @error "Incorrect shorthand format used in '#{$key}' in $typestyles map: [font-size] must appear first"; + } + } + } + } +} diff --git a/assets/lib/typey/stylesheets/typey/_font-stacks.scss b/assets/lib/typey/stylesheets/typey/_font-stacks.scss new file mode 100644 index 0000000..a6a86cd --- /dev/null +++ b/assets/lib/typey/stylesheets/typey/_font-stacks.scss @@ -0,0 +1,4 @@ +// Three standard do-all stacks. +$serif-stack: "Calisto MT", "Book Antiqua", serif !default; +$sans-serif-stack: "Helvetica Neue", Helvetica, sans-serif !default; +$monospace-stack: Consolas, "Lucida Console", monospace, monospace !default; diff --git a/assets/lib/typey/stylesheets/typey/functions/_depreciated.scss b/assets/lib/typey/stylesheets/typey/functions/_depreciated.scss new file mode 100644 index 0000000..45d6abc --- /dev/null +++ b/assets/lib/typey/stylesheets/typey/functions/_depreciated.scss @@ -0,0 +1,55 @@ +// DEPRECIATED FUNCTIONS +// The names of these functions have been refined and namespaced (above) to avoid +// potential confusion with functions from other libraries. + +// (Depreciated) Output a number in the $base-unit.. +// +// @param string $weight +// A weight from the $font-weight map. +// +// @return string +// The selected font-weight. +@function output-unit($number) { + @warn "output-unit() is depreciated. Please use typey-output-in-base-unit() instead"; + @return typey-output-in-base-unit($number); +} + +// (Depreciated) Remove the unit from a number. +// +// @param number $number +// The number (with unit) to convert. Allowed units: any +// +// @return number +// The number without the unit. +@function strip-unit($number) { + @warn "strip-unit() is depreciated. Please use typey-strip-unit() instead"; + @return typey-strip-unit($number); +} + +// (Depreciated) Convert px to the $base-unit. +// +// @param number $number +// The number (with unit) to convert. Allowed units: px +// @param number|string $context +// (optional) Only used if em is the $base-unit. The value of the elements/parents +// font-size if it differs from $base-font-size. Specified as a t-shirt size or +// value in px. +// +// @return number +// The number converted to the base unit. +@function convert-unit($number, $context: $base-font-size) { + @warn "convert-unit() is depreciated. Please use output-from-px() instead"; + @return output-from-px($number, $context); +} + +// (Depreciated) Retrieve a font weight. +// +// @param string $weight +// A weight from the $font-weight map. +// +// @return string +// The selected font-weight. +@function font-weight($weight) { + @warn "font-weight() is depreciated. Please use weight() instead"; + @return weight($weight); +} diff --git a/assets/lib/typey/stylesheets/typey/functions/_em-calculators.scss b/assets/lib/typey/stylesheets/typey/functions/_em-calculators.scss new file mode 100644 index 0000000..f46b026 --- /dev/null +++ b/assets/lib/typey/stylesheets/typey/functions/_em-calculators.scss @@ -0,0 +1,41 @@ +// Calculate relative sizing for em when a px value is used. +// +// @param number $number +// The px value +// @param number|string $context +// The relative value to perform the calculation. +// +// @return number +// The calculated value in the base unit. +@function calculate-em-px($x, $context) { + $allowed-types: "font-size", "px"; + $type: typey-validator($context, $allowed-types); + @if $type == "font-size" { + $context-map-size: map-get($font-size, $context); + @return typey-output-in-unit(($x / $context-map-size), em); + } + @if $type == "px" { + @return typey-output-in-unit(($x / $context), em); + } +} + +// Calculate relative sizing for em when a multiplier is used. +// +// @param number $number +// Multiple of line height to be used. +// @param number|string $context +// The relative value to perform the calculation. +// +// @return number +// The calculated value in the base unit. +@function calculate-em-multiplier($x, $context) { + $allowed-types: "font-size", "px"; + $type: typey-validator($context, $allowed-types); + @if $type == "font-size" { + $context-map-size: map-get($font-size, $context); + @return typey-output-in-unit(($x * $base-line-height) / $context-map-size, em); + } + @if $type == "px" { + @return typey-output-in-unit(($x * $base-line-height) / $context, em); + } +} diff --git a/assets/lib/typey/stylesheets/typey/functions/_extras.scss b/assets/lib/typey/stylesheets/typey/functions/_extras.scss new file mode 100644 index 0000000..1ade7f7 --- /dev/null +++ b/assets/lib/typey/stylesheets/typey/functions/_extras.scss @@ -0,0 +1,34 @@ +// Retrieve a font weight. +// +// @param string $weight +// A weight from the $font-weight map. +// +// @return string +// The selected font-weight. +@function weight($weight) { + @if type-of($weight) == "string" { + @if map-has-key($font-weight, $weight) { + @return map-get($font-weight, $weight); + } + @else { + @error "'#{$weight}' not found in $font-weight map"; + } + } + @else { + @error "Weight specified for weight() is not a string"; + } +} + +// Extend a font by adding a web-safe stack to it. +// +// Example usage: +// $new-font-stack: extend-font-stack("Open sans", $sans-serif-stack); +// +// @param string $font +// The name of the font. Use inverted commas if there are spaces in the font +// name. i.e "Open sans" +// @param list $font-stack +// The font stack variable to extend. +@function extend-font-stack($font, $font-stack) { + @return join($font, $font-stack, $separator: comma); +} diff --git a/assets/lib/typey/stylesheets/typey/functions/_helpers.scss b/assets/lib/typey/stylesheets/typey/functions/_helpers.scss new file mode 100644 index 0000000..7c753ff --- /dev/null +++ b/assets/lib/typey/stylesheets/typey/functions/_helpers.scss @@ -0,0 +1,59 @@ +// Output a number in the $base-unit. +// +// @param number $number +// The number (without unit) to output. +// +// @return number +// The number with the base unit +@function typey-output-in-base-unit($number) { + @if $number == 0 { + @return 0; + } + @if $base-unit == rem { + @return $number * 1rem; + } + @if $base-unit == px { + @return $number * 1px; + } + @if $base-unit == em { + @return $number * 1em; + } +} + +// Output a number in a chosen unit. +// +// @param number $number +// The number (without unit) to output. +// @param string $unit +// (optional) The unit to output, either em, px or rem. +// +// @return number +// The number with the base unit +@function typey-output-in-unit($number, $unit: $base-unit) { + @if $number == 0 { + @return 0; + } + @if $unit == rem { + @return $number * 1rem; + } + @if $unit == px { + @return $number * 1px; + } + @if $unit == em { + @return $number * 1em; + } +} + +// Remove the unit from a number. +// +// @param number $number +// The number (with unit) to convert. Allowed units: any +// +// @return number +// The number without the unit. +@function typey-strip-unit($number) { + @if type-of($number) == "number" and not unitless($number) { + @return $number / ($number * 0 + 1); + } + @return $number; +} diff --git a/assets/lib/typey/stylesheets/typey/functions/_outputters.scss b/assets/lib/typey/stylesheets/typey/functions/_outputters.scss new file mode 100644 index 0000000..aa19e98 --- /dev/null +++ b/assets/lib/typey/stylesheets/typey/functions/_outputters.scss @@ -0,0 +1,83 @@ +// Take a px value and output converted value. +// +// @param number $number +// A px value to convert. +// @param number|string $context +// (optional) Only used if em is the $base-unit. The value of the elements/parents +// font-size if it differs from $base-font-size. Specified as a t-shirt size or +// value in px. +// +// @return number +// The number converted to the base unit. +@function output-from-px($number, $context: $base-font-size) { + @if $base-unit == rem { + @return typey-output-in-base-unit(($number / $base-font-size)); + } + @if $base-unit == px { + @return typey-output-in-base-unit(typey-strip-unit($number)); + } + @if $base-unit == em { + @return calculate-em-px($number, $context); + } +} + +// Take a key from the $font-size map and output converted value. +// +// @param string $size +// A size from the $font-size map. +// @param number|string $context +// (optional) Only used if em is the $base-unit. The value of the parent +// font-size if it differs from $base-font-size. Specified as a t-shirt size or +// value in px. +// +// @return number +// The selected font-size in $base-unit. +@function output-from-font-size-map($size, $context: $base-font-size) { + $map-size: map-get($font-size, $size); + @if $base-unit == rem { + @return typey-output-in-base-unit(($map-size / $base-font-size)); + } + @if $base-unit == px { + @return typey-output-in-base-unit(typey-strip-unit($map-size)); + } + @if $base-unit == em { + @return calculate-em-px($map-size, $context); + } +} + +// Take a line-height multipler and output converted value. +// +// @param number $number +// Multiple of line height to be used. +// @param number|string $context +// (optional) Only used if em is the $base-unit. The value of the elements/parents +// font-size if it differs from $base-font-size. Specified as a t-shirt size or +// value in px. +// +// @return number +// The value of the line-height multiple converted to the base unit. +@function output-from-multiplier($x, $context: $base-font-size) { + @if $base-unit == rem { + @return typey-output-in-base-unit(($x * $base-line-height) / $base-font-size); + } + @if $base-unit == px { + @return typey-output-in-base-unit(typey-strip-unit($x * $base-line-height)); + } + @if $base-unit == em { + @return calculate-em-multiplier($x, $context); + } +} + +// Take a line-height ratio and output as em. +// +// @param number $ratio +// Multiple of the $font-size to be used. +// @param number|string $context +// (optional) used to ensure function outputs the ratio regardless of whether +// it is the same as the $base-line-height-ratio. +// +// @return number +// The ratio in em. +@function output-from-ratio($ratio: $base-line-height-ratio) { + @return $ratio; +} diff --git a/assets/lib/typey/stylesheets/typey/functions/_sizers.scss b/assets/lib/typey/stylesheets/typey/functions/_sizers.scss new file mode 100644 index 0000000..75a84b5 --- /dev/null +++ b/assets/lib/typey/stylesheets/typey/functions/_sizers.scss @@ -0,0 +1,91 @@ +// Takes a sizing from the $font-size map (m, xl, xxl, etc) and convert it to +// the base unit. Alternatively convert a px font-size into the base unit. +// +// @param number|string $size +// A size from the $font-size map or px value to be converted +// @param number|string $context +// (optional) Only used if em is the $base-unit. The value of the parent +// font-size if it differs from $base-font-size. Specified as a t-shirt size or +// value in px. +// +// @return number +// The selected font-size in $base-unit. +@function font-size($size, $context: $base-font-size) { + $allowed-types: "font-size", "px"; + $type: typey-validator($size, $allowed-types); + @if $type == "font-size" { + @return output-from-font-size-map($size, $context); + } + @if $type == "px" { + @return output-from-px($size, $context); + } +} + +// Generate a value to be used as line-height from either: +// a) a multiple of $base-line-height +// b) a static px value +// c) a ratio of the font-size +// +// Example usage with multiple: +// line-height: line-height(2); +// Example usage with static value: +// line-height: line-height(18px); +// Example usage with ratio: +// line-height: line-height(1.5); +// +// @param number $x +// Multiple of $base-line-height to be used, px value to be converted, or ratio of +// font-size. +// @param number|string $context +// (optional) Only used if em is the $base-unit. The value of the +// elements/parents font-size if it differs from $base-font-size. +// Specified as a t-shirt size or value in px. +// @return number +// The calculated height in $base-unit. +@function line-height($x, $context: $base-font-size) { + $allowed-types: "multiplier", "px"; + $type: typey-validator($x, $allowed-types); + @if $type == "multiplier" { + @if ($line-height-method == "ratio") { + @return output-from-ratio($x); + } + @else { + @return output-from-multiplier($x, $context); + } + } + @if $type == "px" { + @return output-from-px($x, $context); + } +} + +// Generate a value to be used as some form of height or spacing from either: +// a) a multiple of $base-line-height +// b) a static px value +// +// Example usage with multiple: +// height: spacing(2); +// Example usage with static value: +// margin-bottom: spacing(18px); +// +// @param number $x +// Multiple of $base-line-height to be used or px value to be converted. +// @param number|string $context +// (optional) Only used if em is the $base-unit. The value of the elements/parents +// font-size if it differs from $base-font-size. Specified as a t-shirt size or +// value in px. +// +// @return number +// The calculated spacing in $base-unit. +@function spacing($x, $context: $base-font-size) { + $allowed-types: "multiplier", "px", "auto"; + $type: typey-validator($x, $allowed-types); + @if $type == "multiplier" { + @return output-from-multiplier($x, $context); + } + @if $type == "px" { + @return output-from-px($x, $context); + } + @if $type == "auto" { + @return auto; + } +} diff --git a/assets/lib/typey/stylesheets/typey/functions/_validators.scss b/assets/lib/typey/stylesheets/typey/functions/_validators.scss new file mode 100644 index 0000000..a7b84cd --- /dev/null +++ b/assets/lib/typey/stylesheets/typey/functions/_validators.scss @@ -0,0 +1,82 @@ +// Takes a value and checks to ensure it's expressed correctly then returns +// the type. +// +// @param number|string|list $x +// A multiple of $base-line-height. +// A px value. +// A size from the $font-size map. +// A space seperated list container multiples and/or px values. +// +// @return string +// multiplier, px, font-size, list +@function typey-check-value($x) { + @if type-of($x) == "number" { + @if unitless($x) { + @return "multiplier"; + } + @if not unitless($x) { + @if unit($x) == px { + @return "px"; + } + @else { + @error "All units must be expressed in px"; + } + } + } + @if type-of($x) == "string" { + @if $x == "auto" { + @return "auto"; + } + @if map-has-key($font-size, $x) { + @return "font-size"; + } + @else { + @error "'#{$x}' not found in $font-size map"; + } + } + @if type-of($x) == "list" { + @if list-separator($x) == space { + @each $value in $x { + @if type-of($value) == "number" or $value == "auto" { + @if type-of($value) == "number" { + @if not unitless($value) and unit($value) != px { + @error "All units must be expressed in px"; + } + } + } + @else { + @error "Values specified inside lists must be a number or 'auto'"; + } + } + @return "list"; + } + @else { + @error "All lists must use a space as their seperator"; + } + } + @else { + @return type-of($x); + } +} + +// Takes a value and validates it against a specified type. +// +// @param number|string|list $x +// A multiple of $base-line-height. +// A px value. +// A size from the $font-size map. +// A space seperated list container multiples and/or px values. +// @param string|list $allowed-types +// Either multiplier, px, font-size, list, or a comibation specified in a list. +// +// @return string +// The values type. +@function typey-validator($x, $allowed-types) { + $type: typey-check-value($x); + @if index($allowed-types, $type) != null { + @return $type; + } + @else { + @error "'#{$type}' is not a valid type for this function (allowed types are: #{$allowed-types})"; + } +} diff --git a/assets/lib/typey/stylesheets/typey/mixins/_debug.scss b/assets/lib/typey/stylesheets/typey/mixins/_debug.scss new file mode 100644 index 0000000..5b4c9ad --- /dev/null +++ b/assets/lib/typey/stylesheets/typey/mixins/_debug.scss @@ -0,0 +1,41 @@ +// Output a horizontal grid to help with debugging typography. +// +// @param number $line-height +// Multiple of line height to be used, line-height ratio or px value to be converted. +// @param number|string $context +// (optional) Only used if em is the $base-unit. The value of the +// elements/parents font-size if it differs from $base-font-size. +// Specified as a t-shirt size or value in px. +// @param string $color +// (optional) Use a custom grid color. +@mixin typey-debug-grid($line-height: $base-line-height, $context: $base-font-size, $color: $typey-debug-color) { + @if $typey-debug == true { + $allowed-types: "multiplier", "px"; + $type: typey-validator($line-height, $allowed-types); + $grid-height: 0; + @if $line-height-method == "rhythm" { + $grid-height: line-height($line-height, $context); + } + @if $line-height-method == "ratio" { + @if $line-height == $base-line-height { + $grid-height: line-height($base-line-height-ratio, $context) * 1em; + } + @else { + $grid-height: line-height($line-height, $context) * 1em; + } + } + + position: relative; + background-image: repeating-linear-gradient(180deg, $color, $color 1px, transparent 1px, transparent $grid-height); + + &:after { + content: ""; + position: absolute; + bottom: -1px; + left: 0; + height: 1px; + width: 100%; + background-color: $color; + } + } +} diff --git a/assets/lib/typey/stylesheets/typey/mixins/_define-type-sizing.scss b/assets/lib/typey/stylesheets/typey/mixins/_define-type-sizing.scss new file mode 100644 index 0000000..d444d03 --- /dev/null +++ b/assets/lib/typey/stylesheets/typey/mixins/_define-type-sizing.scss @@ -0,0 +1,45 @@ +// Define defaults (use this in the HTML element). +// +// @param number $size +// (optional) The font-size. Use to set to anything other than $base-font-size. +// @param number $line-height +// (optional) The line-height. Use to set to anything other than $base-line-height. +// Set to a ratio when $line-height-as-ratio is true. Will default to $base-line-height-ratio. +// Set to false if you do not want to change a ratio of line-height already set. +@mixin define-type-sizing($size: $base-font-size, $line-height: $base-line-height) { + @if $base-unit == rem or $base-unit == em { + font-size: $size / $browser-font-size * 100%; + } + @if $base-unit == px { + font-size: $size; + } + + @if $line-height != false { + @if $line-height-method == "ratio" { + @if $line-height == $base-line-height { + $line-height: $base-line-height-ratio; + } + line-height: $line-height; + } + @else { + @if $base-unit == rem or $base-unit == em { + // In the html element, rem means relative to browser default font size; em means relative to html's font size. + line-height: calculate-em-px($line-height, $size); + } + @if $base-unit == px { + line-height: $line-height; + } + } + } + + @if $auto-print-sizing == true { + @if $base-unit == rem or $base-unit == em { + @media print { + font-size: $print-font-size; + } + } + @else { + @warn "As you are not using a relative base unit (rem or em) automatic print media sizing will not work. Set $auto-print-sizing to false to hide this warning" + } + } +} diff --git a/assets/lib/typey/stylesheets/typey/mixins/_font-size.scss b/assets/lib/typey/stylesheets/typey/mixins/_font-size.scss new file mode 100644 index 0000000..06d0325 --- /dev/null +++ b/assets/lib/typey/stylesheets/typey/mixins/_font-size.scss @@ -0,0 +1,24 @@ +// Define font-size (with fallback) +// +// @param number|string $size +// A size from the $font-size map or px value to be converted +// @param number|string $context +// (optional) Only used if em is the $base-unit. The value of the elements/parents +// font-size if it differs from $base-font-size. Specified as a t-shirt size or +// value in px. +@mixin font-size($size, $context: $base-font-size) { + $allowed-types: "font-size", "px"; + $type: typey-validator($size, $allowed-types); + @if $base-unit == rem { + @if $rem-fallback == true { + @if $type == "font-size" { + $map-size: map-get($font-size, $size); + font-size: $map-size; + } + @if $type == "px" { + font-size: $size; + } + } + } + font-size: font-size($size, $context); +} diff --git a/assets/lib/typey/stylesheets/typey/mixins/_line-height.scss b/assets/lib/typey/stylesheets/typey/mixins/_line-height.scss new file mode 100644 index 0000000..1581ceb --- /dev/null +++ b/assets/lib/typey/stylesheets/typey/mixins/_line-height.scss @@ -0,0 +1,23 @@ +// Define line-height (with fallback). +// +// @param number $x +// Multiple of line height to be used or px value to be converted. +// @param number|string $context +// (optional) Only used if em is the $base-unit. The value of the +// elements/parents font-size if it differs from $base-font-size. +// Specified as a t-shirt size or value in px. +@mixin line-height($x, $context: $base-font-size) { + $allowed-types: "multiplier", "px"; + $type: typey-validator($x, $allowed-types); + @if $base-unit == rem and $line-height-method == "rhythm" { + @if $rem-fallback == true { + @if $type == "multiplier" { + line-height: $x * $base-line-height; + } + @if $type == "px" { + line-height: $x; + } + } + } + line-height: line-height($x, $context); +} diff --git a/assets/lib/typey/stylesheets/typey/mixins/_spacing.scss b/assets/lib/typey/stylesheets/typey/mixins/_spacing.scss new file mode 100644 index 0000000..6feb17e --- /dev/null +++ b/assets/lib/typey/stylesheets/typey/mixins/_spacing.scss @@ -0,0 +1,89 @@ +// Define spacing (with fallbacks). +// +// @param string $type +// The type of spacing: margin, padding, margin-top, etc. +// @param number|list|string $spacing +// Multiple of $base-line-height to be used or px value to be converted. +// Can be a SASS list using the same parameters as the CSS margin property: +// i.e. top right bottom left, 1 0 2 0. +// Can also be the string "auto" when used as margin. +// @param number|string $context +// (optional) Only used if em is the $base-unit. The value of the elements/parents +// font-size if it differs from $base-font-size. Specified as a t-shirt size or +// value in px. +@mixin spacing($property, $spacing, $context: $base-font-size) { + $allowed-types: "multiplier", "px", "list"; + $type: typey-validator($spacing, $allowed-types); + + $px-fallback-list: (); + $converted-list: (); + + @each $x in $spacing { + @if $base-unit == rem { + $allowed-types: "multiplier", "px", "auto"; + $type: typey-validator($x, $allowed-types); + @if $type == "multiplier" { + $spacing: $x * $base-line-height; + $px-fallback-list: join($px-fallback-list, $spacing, $separator: space); + } + @if $type == "px" { + $px-fallback-list: join($px-fallback-list, $x, $separator: space); + } + @if $type == "auto" { + $px-fallback-list: join($px-fallback-list, $x, $separator: space); + } + } + $spacing: spacing($x, $context); + $converted-list: join($converted-list, $spacing, $separator: space); + } + + @if $base-unit == rem { + @if $rem-fallback == true { + #{$property}: $px-fallback-list; + } + } + #{$property}: $converted-list; +} + +// Wrapper mixins for various spacing properties. +// These can be used to provide easily sized spacing in the base unit. +// +// @param number|list|string $x +// Multiple of $base-line-height to be used or px value to be converted. +// Can be a SASS list using the same parameters as the CSS margin property: +// i.e. top right bottom left, 1 0 2 0. +// Can also be the string "auto" when used as margin. +// @param number|string $context +// (optional) Only used if em is the $base-unit. The value of the elements/parents +// font-size if it differs from $base-font-size. Specified as a t-shirt size or +// value in px. +@mixin margin($x, $context: $base-font-size) { + @include spacing(margin, $x, $context); +} +@mixin margin-top($x, $context: $base-font-size) { + @include spacing(margin-top, $x, $context); +} +@mixin margin-bottom($x, $context: $base-font-size) { + @include spacing(margin-bottom, $x, $context); +} +@mixin margin-left($x, $context: $base-font-size) { + @include spacing(margin-left, $x, $context); +} +@mixin margin-right($x, $context: $base-font-size) { + @include spacing(margin-right, $x, $context); +} +@mixin padding($x, $context: $base-font-size) { + @include spacing(padding, $x, $context); +} +@mixin padding-top($x, $context: $base-font-size) { + @include spacing(padding-top, $x, $context); +} +@mixin padding-bottom($x, $context: $base-font-size) { + @include spacing(padding-bottom, $x, $context); +} +@mixin padding-left($x, $context: $base-font-size) { + @include spacing(padding-left, $x, $context); +} +@mixin padding-right($x, $context: $base-font-size) { + @include spacing(padding-right, $x, $context); +} diff --git a/assets/lib/typey/stylesheets/typey/mixins/_type-layout.scss b/assets/lib/typey/stylesheets/typey/mixins/_type-layout.scss new file mode 100644 index 0000000..8098a38 --- /dev/null +++ b/assets/lib/typey/stylesheets/typey/mixins/_type-layout.scss @@ -0,0 +1,15 @@ +// Define a type layout (font-size and line-height). +// +// @param number|string $size +// A size from the $font-size map or a px value. +// @param number $line-height +// Multiple of line height to be used or px value to be converted. +// @param number|string $context +// (optional) Only used if em is the $base-unit. The value of the +// elements/parents font-size if it differs from $base-font-size. +// Specified as a t-shirt size or value in px. +@mixin type-layout($size, $line-height, $context: $base-font-size) { + @include font-size($size, $context); + @include line-height($line-height, $size); + @include typey-debug-grid($line-height, $size); +} diff --git a/assets/lib/typey/stylesheets/typey/mixins/_typeface.scss b/assets/lib/typey/stylesheets/typey/mixins/_typeface.scss new file mode 100644 index 0000000..2ecec08 --- /dev/null +++ b/assets/lib/typey/stylesheets/typey/mixins/_typeface.scss @@ -0,0 +1,90 @@ +// Embed a typeface. +// +// @param string $typeface +// A font family from the $typefaces map. +@mixin typeface($typeface) { + $typeface-name: $typeface; + $typeface: map-get($typefaces, $typeface); + + $font-family: false; + $letter-spacing: false; + $weight: false; + $style: false; + $case: false; + + // Assign values to variables when $typeface is a keyed map. + @if type-of($typeface) == "map" { + @if map-has-key($typeface, font-family) { + $font-family: map-get($typeface, font-family); + } + @if map-has-key($typeface, letter-spacing) { + $letter-spacing: map-get($typeface, letter-spacing); + } + @if map-has-key($typeface, weight) { + $weight: map-get($typeface, weight); + } + @if map-has-key($typeface, style) { + $style: map-get($typeface, style); + } + @if map-has-key($typeface, case) { + $case: map-get($typeface, case); + } + } + + // Assign values to variables when $typeface is shorthand. + @if type-of($typeface) == "list" { + @if (list-separator($typeface) == "comma") { + // This shorthand is just a list of fonts. + $font-family: $typeface; + } + @else { + @each $value in $typeface { + // This is a font-family. + @if type-of($value) == "list" { + $font-family: $value; + } + // This is a letter-spacing value. + @if type-of($value) == "number" { + $letter-spacing: $value; + } + // This is a font-weight value. + @if map-has-key($font-weight, $value) { + $weight: $value; + } + // This is a case value. + @else if type-of($value) == "string" and index($text-transform-values, $value) != null { + $case: $value; + } + // This is a style value. + @else if type-of($value) == "string" and index($font-style-values, $value) != null { + $style: $value; + } + } + } + } + + // Output properties. + @if $font-family { + font-family: $font-family; + } + @else { + @error "Typeface '#{$typeface-name}' does not have a font-family"; + } + @if $letter-spacing { + @if ($letter-spacing == 0) { + letter-spacing: 0; + } + @else { + letter-spacing: calculate-em-px($letter-spacing, $base-font-size); + } + } + @if $weight { + font-weight: weight($weight); + } + @if $style { + font-style: $style; + } + @if $case { + text-transform: $case; + } +} diff --git a/assets/lib/typey/stylesheets/typey/mixins/_typeset.scss b/assets/lib/typey/stylesheets/typey/mixins/_typeset.scss new file mode 100644 index 0000000..caa0d10 --- /dev/null +++ b/assets/lib/typey/stylesheets/typey/mixins/_typeset.scss @@ -0,0 +1,100 @@ +// Typeset your type. +// +// @param string $typestyle +// A type style from the $typestyles map. +// @param number|string $context +// (optional) Only used if em is the $base-unit. The value of the +// elements/parents font-size if it differs from $base-font-size. +// Specified as a t-shirt size or value in px. +@mixin typeset($typestyle, $context: $base-font-size) { + $typestyle: map-get($typestyles, $typestyle); + + $font-size: false; + $line-height: false; + $weight: false; + $style: false; + $case: false; + $letter-spacing: false; + + // Assign values to variables when $typestyle is a keyed map. + @if type-of($typestyle) == "map" { + @if map-has-key($typestyle, font-size) { + $font-size: map-get($typestyle, font-size); + } + @if map-has-key($typestyle, line-height) { + $line-height: map-get($typestyle, line-height); + } + @if map-has-key($typestyle, weight) { + $weight: map-get($typestyle, weight); + } + @if map-has-key($typestyle, style) { + $style: map-get($typestyle, style); + } + @if map-has-key($typestyle, case) { + $case: map-get($typestyle, case); + } + @if map-has-key($typestyle, letter-spacing) { + $letter-spacing: map-get($typestyle, letter-spacing); + } + } + + // Assign values to variables when $typestyle is shorthand. + @if type-of($typestyle) == "list" { + @each $value in $typestyle { + // The first value is always font-size. + @if index($typestyle, $value) == 1 { + $font-size: $value; + } + // This is a line-height value. + @else if type-of($value) == "number" and index($typestyle, $value) == 2 { + $line-height: $value; + } + // This is a font-weight value. + @else if map-has-key($font-weight, $value) { + $weight: $value; + } + // This is a case value. + @else if type-of($value) == "string" and index($text-transform-values, $value) != null { + $case: $value; + } + // This is a style value. + @else if type-of($value) == "string" and index($font-style-values, $value) != null { + $style: $value; + } + // This is a letter-spacing value. + @else if type-of($value) == "number" and index($typestyle, $value) != 2 and index($typestyle, $value) != 1 { + $letter-spacing: $value; + } + } + } + + // $typestyle may also be a solitary font-size. + @if type-of($typestyle) != "map" and type-of($typestyle) != "list" { + $font-size: $typestyle; + } + + // Output properties. + @if $font-size { + @include font-size($font-size, $context); + } + @if $line-height { + @include typey-debug-grid($line-height, $font-size); + @include line-height($line-height, $font-size); + } + @else { + // Using default line-height so set debug grid accordingly. + @include typey-debug-grid($base-line-height, $font-size); + } + @if $weight { + font-weight: weight($weight); + } + @if $style { + font-style: $style; + } + @if $case { + text-transform: $case; + } + @if $letter-spacing { + letter-spacing: calculate-em-px($letter-spacing, $font-size); + } +} diff --git a/create_sub_theme.sh b/create_sub_theme.sh index 97950ae..074d42f 100755 --- a/create_sub_theme.sh +++ b/create_sub_theme.sh @@ -25,7 +25,7 @@ mkdir "$themename" cp -p zen/.eslintrc zen/.gitignore zen/.sass-lint.yml $themename/ cp -p zen/gulpfile.js zen/package-lock.json zen/package.json zen/theme.toml $themename/ -cp -pr zen/sass $themename/ +cp -pr zen/assets $themename/ cp -pr zen/static $themename/ sed -e 's/^\(name = \).*$/\1"'"$human"'"/g' -e 's/^\(description = \).*$/\1"A Zen sub-theme"/g' $themename/theme.toml > $themename/theme.toml.temp diff --git a/exampleSite/config.yaml b/exampleSite/config.yaml index d61a195..b29ac1a 100644 --- a/exampleSite/config.yaml +++ b/exampleSite/config.yaml @@ -20,8 +20,6 @@ outputs: section: ["HTML","RSS", "JSON"] params: - cacheBustCSS: false - cacheBustJS: false contact: "info@example.org" copyright: "This site is licensed under a [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/)." description: "The zen theme for Hugo example site." diff --git a/gulpfile.js b/gulpfile.js index af68ccc..fc53f95 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,7 +1,5 @@ 'use strict'; -var importOnce = require('node-sass-import-once'); - var options = {}; // ############################# @@ -9,38 +7,20 @@ var options = {}; // ############################# // The root paths are used to construct all the other paths in this -// configuration. The "project" root path is where this gulpfile.js is located. -// While Zen distributes this in the theme root folder, you can also put this -// (and the package.json) in your project's root folder and edit the paths -// accordingly. +// configuration. options.rootPath = { - project : __dirname + '/', - theme : __dirname + '/' + projectAssets : '../../assets/', + themeAssets : __dirname + '/assets/' }; -options.theme = { - root : options.rootPath.theme, - sass : options.rootPath.theme + 'assets/sass/', - css : options.rootPath.theme + 'static/css/', - js : options.rootPath.theme + 'assets/js/', - js_dest : options.rootPath.theme + 'static/js/' -}; - -// Define the node-sass configuration. The includePaths is critical! -options.sass = { - importer: importOnce, - includePaths: [ - options.theme.sass, - options.rootPath.project + 'node_modules/typey/stylesheets' +options.path = { + sass : [ + options.rootPath.themeAssets + 'sass/**/*.scss', + options.rootPath.projectAssets + 'sass/**/*.scss' ], - outputStyle: 'expanded' -}; - -// Define the paths to the JS files to lint. -options.eslint = { - files : [ - options.theme.js + '**/*.js', - '!' + options.theme.js + '**/*.min.js' + js : [ + options.rootPath.themeAssets + 'js/**/*.js', + options.rootPath.projectAssets + 'js/**/*.js' ] }; @@ -49,51 +29,20 @@ options.eslint = { options.gulpWatchOptions = {interval: 600}; // options.gulpWatchOptions = {interval: 1000, mode: 'poll'}; - // Load Gulp and tools we will use. -var gulp = require('gulp'), - $ = require('gulp-load-plugins')(), - del = require('del'), - // gulp-load-plugins will report "undefined" error unless you load gulp-sass manually. - sass = require('gulp-sass'), - cleanCSS = require('gulp-clean-css'), - touch = require('gulp-touch-cmd'); - -// The sass files to process. -var sassFiles = [ - options.theme.sass + '**/*.scss', - // Do not open Sass partials as they will be included as needed. - '!' + options.theme.sass + '**/_*.scss' -]; - -// Clean JS files. -gulp.task('clean:js', function clean () { - return del([ - options.theme.js_dest + '**/*.js' - ], {force: true}); -}); - -// Clean CSS files. -gulp.task('clean:css', function clean () { - return del([ - options.theme.css + '**/*.css', - options.theme.css + '**/*.map' - ], {force: true}); -}); - -// Clean all directories. -gulp.task('clean', gulp.series('clean:css')); +var gulp = require('gulp'); +var $ = require('gulp-load-plugins')(); // Lint JavaScript. gulp.task('lint:js', function lint () { - return gulp.src(options.eslint.files) + return gulp.src(options.path.js) .pipe($.eslint()) .pipe($.eslint.format()); }); // Lint JavaScript and throw an error for a CI to catch. gulp.task('lint:js-with-fail', function lint () { - return gulp.src(options.eslint.files) + return gulp.src(options.path.js) .pipe($.eslint()) .pipe($.eslint.format()) .pipe($.eslint.failOnError()); @@ -101,14 +50,14 @@ gulp.task('lint:js-with-fail', function lint () { // Lint Sass. gulp.task('lint:sass', function lint () { - return gulp.src(options.theme.sass + '**/*.scss') + return gulp.src(options.path.sass) .pipe($.sassLint()) .pipe($.sassLint.format()); }); // Lint Sass and throw an error for a CI to catch. gulp.task('lint:sass-with-fail', function lint () { - return gulp.src(options.theme.sass + '**/*.scss') + return gulp.src(options.path.sass) .pipe($.sassLint()) .pipe($.sassLint.format()) .pipe($.sassLint.failOnError()); @@ -117,61 +66,18 @@ gulp.task('lint:sass-with-fail', function lint () { // Lint Sass and JavaScript. gulp.task('lint', gulp.parallel('lint:sass', 'lint:js')); -//Build JS -gulp.task('scripts', gulp.series('clean:js', function js () { - return gulp.src(options.theme.js + '**/*.js') - .pipe(gulp.dest(options.theme.js_dest)) - .pipe(touch()); -})); - -gulp.task('scripts:production', gulp.series('scripts')); - -// Build CSS. -gulp.task('styles', gulp.series('clean:css', function css () { - return gulp.src(sassFiles) - .pipe($.sourcemaps.init()) - .pipe(sass(options.sass).on('error', sass.logError)) - .pipe($.size({showFiles: true})) - .pipe($.sourcemaps.write('./')) - .pipe(gulp.dest(options.theme.css)) - .pipe(touch()); -})); - -gulp.task('styles:production', gulp.series('clean:css', function css () { - return gulp.src(sassFiles) - .pipe(sass(options.sass).on('error', sass.logError)) - .pipe($.size({showFiles: true})) - .pipe(cleanCSS()) - .pipe(gulp.dest(options.theme.css)) - .pipe(touch()); -})); - // Watch for changes and rebuild. -gulp.task('watch:css', gulp.series('styles', function watch () { - return gulp.watch(options.theme.sass + '**/*.scss', options.gulpWatchOptions, gulp.series('styles')); -})); - gulp.task('watch:lint:sass', gulp.series('lint:sass', function watch () { - return gulp.watch(options.theme.sass + '**/*.scss', options.gulpWatchOptions, gulp.series('lint:sass')); -})); - -gulp.task('watch:js', gulp.series('scripts', function watch () { - return gulp.watch(options.eslint.files, options.gulpWatchOptions, gulp.series('scripts')); + return gulp.watch(options.path.sass, options.gulpWatchOptions, gulp.series('lint:sass')); })); gulp.task('watch:lint:js', gulp.series('lint:js', function watch () { - return gulp.watch(options.eslint.files, options.gulpWatchOptions, gulp.series('lint:js')); + return gulp.watch(options.path.js, options.gulpWatchOptions, gulp.series('lint:js')); })); -gulp.task('watch', gulp.parallel('watch:css', 'watch:lint:sass', 'watch:js', 'watch:lint:js')); +gulp.task('watch:lint', gulp.parallel('watch:lint:sass', 'watch:lint:js')); -// Build everything. -gulp.task('build', gulp.parallel('styles:production', 'scripts:production', 'lint')); +gulp.task('watch', gulp.series('watch:lint')); // The default task. -gulp.task('default', gulp.series('build')); - - -// Resources used to create this gulpfile.js: -// - https://github.com/google/web-starter-kit/blob/master/gulpfile.babel.js -// - https://github.com/dlmanning/gulp-sass/blob/master/README.md +gulp.task('default', gulp.series('lint')); diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index d6e2617..c64f8c7 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -6,7 +6,7 @@ {{ block "title" . }}{{ .Title }} – {{ .Site.Title }}{{ end }} {{ block "meta" . }}{{ end }} {{- partial "meta.html" . -}} -{{- partialCached "meta_cache.html" . -}} +{{- partial "styles.html" . -}} {{ block "header" . }}{{ end }} {{ if and .Site.Params.piwikTrackerUrl .Site.Params.piwikSiteID }}{{ partialCached "matomo.html" . }}{{ end -}} @@ -40,6 +40,5 @@ {{ if $.Param "mobilemenu" }}{{ partial "mobilemenu.html" . }}{{ end -}} {{ partial "scripts.html" . -}} -{{ partialCached "scripts_cache.html" . -}} diff --git a/layouts/partials/matomo.html b/layouts/partials/matomo.html index efa3712..8b72ad3 100644 --- a/layouts/partials/matomo.html +++ b/layouts/partials/matomo.html @@ -1,4 +1,3 @@ - - diff --git a/layouts/partials/meta_cache.html b/layouts/partials/meta_cache.html deleted file mode 100644 index ca992fc..0000000 --- a/layouts/partials/meta_cache.html +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html index c3d22a7..2001f5e 100644 --- a/layouts/partials/scripts.html +++ b/layouts/partials/scripts.html @@ -1,2 +1,10 @@ -{{ if $.Param "jquery" }}{{ end }} -{{ if and ($.Param "jquery") ($.Param "contactform") }}{{ end }} +{{ if $.Param "jquery" -}} +{{ $jquery := resources.Get "js/jquery.slim.min.js" | fingerprint -}} + +{{ $script := resources.Get "js/script.js" | minify | fingerprint -}} + +{{ if $.Param "contactform" -}} +{{ $contact := resources.Get "js/contact.js" | minify | fingerprint -}} + +{{ end -}} +{{ end -}} diff --git a/layouts/partials/scripts_cache.html b/layouts/partials/scripts_cache.html deleted file mode 100644 index f5bda3a..0000000 --- a/layouts/partials/scripts_cache.html +++ /dev/null @@ -1 +0,0 @@ -{{ if $.Param "jquery" }}{{ end }} diff --git a/layouts/partials/section_json_ld.html b/layouts/partials/section_json_ld.html index 3d9fa27..9f6e428 100644 --- a/layouts/partials/section_json_ld.html +++ b/layouts/partials/section_json_ld.html @@ -23,6 +23,6 @@ "publisher": { "@type": "Organization", "name": {{ .Site.Title | jsonify }}, - "url": "{{ .Site.BaseURL }}", + "url": "{{ .Site.BaseURL }}" } diff --git a/layouts/partials/single_json_ld.html b/layouts/partials/single_json_ld.html index cca4f10..583e5e7 100644 --- a/layouts/partials/single_json_ld.html +++ b/layouts/partials/single_json_ld.html @@ -26,7 +26,7 @@ "publisher": { "@type": "Organization", "name": {{ .Site.Title | jsonify }}, - "url": "{{ .Site.BaseURL }}", + "url": "{{ .Site.BaseURL }}" } } diff --git a/layouts/partials/styles.html b/layouts/partials/styles.html new file mode 100644 index 0000000..4e448ba --- /dev/null +++ b/layouts/partials/styles.html @@ -0,0 +1,12 @@ +{{ $main_options := (dict "targetPath" "css/styles.css" "outputStyle" "compressed" "includePaths" (slice "assets/lib/typey/stylesheets")) -}} +{{ $print_options := (dict "targetPath" "css/print.css" "outputStyle" "compressed" "includePaths" (slice "assets/lib/typey/stylesheets")) -}} +{{ $main_style := resources.Get "sass/styles.scss" | toCSS $main_options | fingerprint -}} +{{ $print_style := resources.Get "sass/print.scss" | toCSS $print_options | fingerprint -}} +{{ if eq .Hugo.Environment "dev" -}} +{{ $main_options = (dict "targetPath" "css/styles.css" "outputStyle" "nested" "enableSourceMap" true "includePaths" (slice "assets/lib/typey/stylesheets")) -}} +{{ $print_options = (dict "targetPath" "css/print.css" "outputStyle" "nested" "enableSourceMap" true "includePaths" (slice "assets/lib/typey/stylesheets")) -}} +{{ $main_style = resources.Get "sass/styles.scss" | toCSS $main_options -}} +{{ $print_style = resources.Get "sass/print.scss" | toCSS $print_options -}} +{{ end -}} + + diff --git a/package-lock.json b/package-lock.json index 28f1872..33620ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,53 +24,10 @@ "js-tokens": "^4.0.0" } }, - "@gulp-sourcemaps/identity-map": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.2.tgz", - "integrity": "sha512-ciiioYMLdo16ShmfHBXJBOFm3xPC4AuwO4xeRpFeHz7WK9PYsWCmigagG2XyzZpubK4a3qNKoUBDhbzHfa50LQ==", - "dev": true, - "requires": { - "acorn": "^5.0.3", - "css": "^2.2.1", - "normalize-path": "^2.1.1", - "source-map": "^0.6.0", - "through2": "^2.0.3" - }, - "dependencies": { - "acorn": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz", - "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "@gulp-sourcemaps/map-sources": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz", - "integrity": "sha1-iQrnxdjId/bThIYCFazp1+yUW9o=", - "dev": true, - "requires": { - "normalize-path": "^2.0.1", - "through2": "^2.0.3" - } - }, - "abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true - }, "acorn": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.0.tgz", - "integrity": "sha512-MW/FjM+IvU9CgBzjO3UIPCE2pyEwUsoFl+VGdczOPEdxfGFjuKny/gN54mOuX7Qxmb9Rg9MCn2oKiSUeW+pjrw==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz", + "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==", "dev": true }, "acorn-jsx": { @@ -80,9 +37,9 @@ "dev": true }, "ajv": { - "version": "6.9.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz", - "integrity": "sha512-4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg==", + "version": "6.10.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz", + "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==", "dev": true, "requires": { "fast-deep-equal": "^2.0.1", @@ -97,12 +54,6 @@ "integrity": "sha1-MU3QpLM2j609/NxU7eYXG4htrzw=", "dev": true }, - "amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "dev": true - }, "ansi-colors": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", @@ -185,28 +136,12 @@ "buffer-equal": "^1.0.0" } }, - "aproba": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", - "dev": true - }, "archy": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=", "dev": true }, - "are-we-there-yet": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", - "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", - "dev": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, "argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -258,12 +193,6 @@ "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=", "dev": true }, - "array-find-index": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", - "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", - "dev": true - }, "array-initial": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz", @@ -324,42 +253,12 @@ } } }, - "array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", - "dev": true, - "requires": { - "array-uniq": "^1.0.1" - } - }, - "array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", - "dev": true - }, "array-unique": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", "dev": true }, - "asn1": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", - "dev": true, - "requires": { - "safer-buffer": "~2.1.0" - } - }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true - }, "assign-symbols": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", @@ -390,12 +289,6 @@ "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", "dev": true }, - "async-foreach": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz", - "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=", - "dev": true - }, "async-settle": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz", @@ -405,30 +298,12 @@ "async-done": "^1.2.2" } }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "dev": true - }, "atob": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", "dev": true }, - "aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "dev": true - }, - "aws4": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", - "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==", - "dev": true - }, "bach": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz", @@ -507,30 +382,12 @@ } } }, - "bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "dev": true, - "requires": { - "tweetnacl": "^0.14.3" - } - }, "binary-extensions": { "version": "1.13.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.0.tgz", "integrity": "sha512-EgmjVLMn22z7eGGv3kcnHwSnJXmFHjISTY9E/S5lIcTD3Oxw05QTcBLNkJFzcb3cNueUdF/IN4U+d78V0zO8Hw==", "dev": true }, - "block-stream": { - "version": "0.0.9", - "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", - "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", - "dev": true, - "requires": { - "inherits": "~2.0.0" - } - }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -628,30 +485,6 @@ "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", "dev": true }, - "camelcase-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", - "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", - "dev": true, - "requires": { - "camelcase": "^2.0.0", - "map-obj": "^1.0.0" - }, - "dependencies": { - "camelcase": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", - "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", - "dev": true - } - } - }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "dev": true - }, "chalk": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", @@ -726,23 +559,6 @@ } } }, - "clean-css": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz", - "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==", - "dev": true, - "requires": { - "source-map": "~0.6.0" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, "cli-cursor": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", @@ -860,15 +676,6 @@ "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", "dev": true }, - "combined-stream": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz", - "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==", - "dev": true, - "requires": { - "delayed-stream": "~1.0.0" - } - }, "commander": { "version": "2.19.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz", @@ -899,12 +706,6 @@ "typedarray": "^0.0.6" } }, - "console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true - }, "convert-source-map": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz", @@ -949,35 +750,6 @@ "which": "^1.2.9" } }, - "css": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz", - "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "source-map": "^0.6.1", - "source-map-resolve": "^0.5.2", - "urix": "^0.1.0" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "currently-unhandled": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", - "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", - "dev": true, - "requires": { - "array-find-index": "^1.0.1" - } - }, "d": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", @@ -987,15 +759,6 @@ "es5-ext": "^0.10.9" } }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0" - } - }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -1005,34 +768,6 @@ "ms": "2.0.0" } }, - "debug-fabulous": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz", - "integrity": "sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==", - "dev": true, - "requires": { - "debug": "3.X", - "memoizee": "0.4.X", - "object-assign": "4.X" - }, - "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "dev": true - } - } - }, "decamelize": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", @@ -1124,44 +859,12 @@ } } }, - "del": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz", - "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=", - "dev": true, - "requires": { - "globby": "^6.1.0", - "is-path-cwd": "^1.0.0", - "is-path-in-cwd": "^1.0.0", - "p-map": "^1.1.1", - "pify": "^3.0.0", - "rimraf": "^2.2.8" - } - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true - }, - "delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", - "dev": true - }, "detect-file": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=", "dev": true }, - "detect-newline": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz", - "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=", - "dev": true - }, "doctrine": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", @@ -1171,12 +874,6 @@ "esutils": "^2.0.2" } }, - "duplexer": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", - "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=", - "dev": true - }, "duplexify": { "version": "3.7.1", "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", @@ -1199,16 +896,6 @@ "object.defaults": "^1.1.0" } }, - "ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "dev": true, - "requires": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" - } - }, "emoji-regex": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", @@ -1323,9 +1010,9 @@ } }, "eslint": { - "version": "5.14.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.14.1.tgz", - "integrity": "sha512-CyUMbmsjxedx8B0mr79mNOqetvkbij/zrXnFeK2zc3pGRn3/tibjiNAv/3UxFEyfMDjh+ZqTrJrEGBFiGfD5Og==", + "version": "5.15.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.15.1.tgz", + "integrity": "sha512-NTcm6vQ+PTgN3UBsALw5BMhgO6i5EpIjQF/Xb5tIh3sk9QhrFafujUOczGz4J24JBlzWclSB9Vmx8d+9Z6bFCg==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -1334,7 +1021,7 @@ "cross-spawn": "^6.0.5", "debug": "^4.0.1", "doctrine": "^3.0.0", - "eslint-scope": "^4.0.0", + "eslint-scope": "^4.0.2", "eslint-utils": "^1.3.1", "eslint-visitor-keys": "^1.0.0", "espree": "^5.0.1", @@ -1399,9 +1086,9 @@ } }, "eslint-scope": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz", - "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.2.tgz", + "integrity": "sha512-5q1+B/ogmHl8+paxtOKx38Z8LtWkVGuNt3+GQNErqwLl6ViNp/gdJGMCjZNxZ8j/VYjDNZ2Fo+eQc1TAVPIzbg==", "dev": true, "requires": { "esrecurse": "^4.1.0", @@ -1681,12 +1368,6 @@ } } }, - "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "dev": true - }, "fancy-log": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz", @@ -1858,23 +1539,6 @@ "for-in": "^1.0.1" } }, - "forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "dev": true - }, - "form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "dev": true, - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" - } - }, "fragment-cache": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", @@ -2455,18 +2119,6 @@ } } }, - "fstream": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", - "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "inherits": "~2.0.0", - "mkdirp": ">=0.5 0", - "rimraf": "2" - } - }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -2479,31 +2131,6 @@ "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", "dev": true }, - "gauge": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", - "dev": true, - "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - } - }, - "gaze": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz", - "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", - "dev": true, - "requires": { - "globule": "^1.0.0" - } - }, "generate-function": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz", @@ -2528,27 +2155,12 @@ "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", "dev": true }, - "get-stdin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", - "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", - "dev": true - }, "get-value": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", "dev": true }, - "getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0" - } - }, "glob": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", @@ -2682,27 +2294,6 @@ "integrity": "sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw==", "dev": true }, - "globby": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", - "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", - "dev": true, - "requires": { - "array-union": "^1.0.1", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } - } - }, "globule": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz", @@ -2786,30 +2377,6 @@ } } }, - "gulp-clean-css": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-4.0.0.tgz", - "integrity": "sha512-/Hs+dmclQfFBSpwrAKd4wTVsahJvrVIg2ga0J7Eo7DKVTVfJrM7wXlfU1mK9iJ9Y7OmkO/YstZVtmhfAKzZ00g==", - "dev": true, - "requires": { - "clean-css": "4.2.1", - "plugin-error": "1.0.1", - "through2": "3.0.0", - "vinyl-sourcemaps-apply": "0.2.1" - }, - "dependencies": { - "through2": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.0.tgz", - "integrity": "sha512-8B+sevlqP4OiCjonI1Zw03Sf8PuV1eRsYQgLad5eonILOdyeRsY27A/2Ze8IlvlMvq31OH+3fz/styI7Ya62yQ==", - "dev": true, - "requires": { - "readable-stream": "2 || 3", - "xtend": "~4.0.1" - } - } - } - }, "gulp-eslint": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-5.0.0.tgz", @@ -2995,39 +2562,6 @@ } } }, - "gulp-sass": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-4.0.2.tgz", - "integrity": "sha512-q8psj4+aDrblJMMtRxihNBdovfzGrXJp1l4JU0Sz4b/Mhsi2DPrKFYCGDwjIWRENs04ELVHxdOJQ7Vs98OFohg==", - "dev": true, - "requires": { - "chalk": "^2.3.0", - "lodash.clonedeep": "^4.3.2", - "node-sass": "^4.8.3", - "plugin-error": "^1.0.1", - "replace-ext": "^1.0.0", - "strip-ansi": "^4.0.0", - "through2": "^2.0.0", - "vinyl-sourcemaps-apply": "^0.2.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, "gulp-sass-lint": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/gulp-sass-lint/-/gulp-sass-lint-1.4.0.tgz", @@ -3091,116 +2625,6 @@ } } }, - "gulp-size": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/gulp-size/-/gulp-size-3.0.0.tgz", - "integrity": "sha1-yxrI5rqD3t5SQwxH/QOTJPAD/4I=", - "dev": true, - "requires": { - "chalk": "^2.3.0", - "fancy-log": "^1.3.2", - "gzip-size": "^4.1.0", - "plugin-error": "^0.1.2", - "pretty-bytes": "^4.0.2", - "stream-counter": "^1.0.0", - "through2": "^2.0.0" - }, - "dependencies": { - "arr-diff": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz", - "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=", - "dev": true, - "requires": { - "arr-flatten": "^1.0.1", - "array-slice": "^0.2.3" - } - }, - "arr-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz", - "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=", - "dev": true - }, - "array-slice": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz", - "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=", - "dev": true - }, - "extend-shallow": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz", - "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=", - "dev": true, - "requires": { - "kind-of": "^1.1.0" - } - }, - "kind-of": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz", - "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=", - "dev": true - }, - "plugin-error": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz", - "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=", - "dev": true, - "requires": { - "ansi-cyan": "^0.1.1", - "ansi-red": "^0.1.1", - "arr-diff": "^1.0.1", - "arr-union": "^2.0.1", - "extend-shallow": "^1.1.2" - } - } - } - }, - "gulp-sourcemaps": { - "version": "2.6.5", - "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.5.tgz", - "integrity": "sha512-SYLBRzPTew8T5Suh2U8jCSDKY+4NARua4aqjj8HOysBh2tSgT9u4jc1FYirAdPx1akUxxDeK++fqw6Jg0LkQRg==", - "dev": true, - "requires": { - "@gulp-sourcemaps/identity-map": "1.X", - "@gulp-sourcemaps/map-sources": "1.X", - "acorn": "5.X", - "convert-source-map": "1.X", - "css": "2.X", - "debug-fabulous": "1.X", - "detect-newline": "2.X", - "graceful-fs": "4.X", - "source-map": "~0.6.0", - "strip-bom-string": "1.X", - "through2": "2.X" - }, - "dependencies": { - "acorn": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz", - "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "gulp-touch-cmd": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/gulp-touch-cmd/-/gulp-touch-cmd-0.0.1.tgz", - "integrity": "sha1-c669BA9cv79Wegbj/beXbvD7iMw=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "through2": "^2.0.3" - } - }, "gulplog": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", @@ -3210,32 +2634,6 @@ "glogg": "^1.0.0" } }, - "gzip-size": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-4.1.0.tgz", - "integrity": "sha1-iuCWJX6r59acRb4rZ8RIEk/7UXw=", - "dev": true, - "requires": { - "duplexer": "^0.1.1", - "pify": "^3.0.0" - } - }, - "har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "dev": true - }, - "har-validator": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", - "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", - "dev": true, - "requires": { - "ajv": "^6.5.5", - "har-schema": "^2.0.0" - } - }, "has-ansi": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", @@ -3266,12 +2664,6 @@ "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=", "dev": true }, - "has-unicode": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", - "dev": true - }, "has-value": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", @@ -3319,17 +2711,6 @@ "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==", "dev": true }, - "http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - } - }, "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -3361,21 +2742,6 @@ "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", "dev": true }, - "in-publish": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz", - "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=", - "dev": true - }, - "indent-string": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", - "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", - "dev": true, - "requires": { - "repeating": "^2.0.0" - } - }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -3453,18 +2819,18 @@ } }, "strip-ansi": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz", - "integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.1.0.tgz", + "integrity": "sha512-TjxrkPONqO2Z8QDCpeE2j6n0M6EwxzyDgzEeGp+FbdvaJAt//ClYi6W5my+3ROlC/hZX2KACUwDfK49Ka5eDvg==", "dev": true, "requires": { - "ansi-regex": "^4.0.0" + "ansi-regex": "^4.1.0" }, "dependencies": { "ansi-regex": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz", - "integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", "dev": true } } @@ -3600,15 +2966,6 @@ "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", "dev": true }, - "is-finite": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, "is-fullwidth-code-point": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", @@ -3672,30 +3029,6 @@ } } }, - "is-path-cwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", - "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", - "dev": true - }, - "is-path-in-cwd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz", - "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", - "dev": true, - "requires": { - "is-path-inside": "^1.0.0" - } - }, - "is-path-inside": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", - "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", - "dev": true, - "requires": { - "path-is-inside": "^1.0.1" - } - }, "is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", @@ -3744,12 +3077,6 @@ "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", "dev": true }, - "is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "dev": true - }, "is-unc-path": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", @@ -3795,18 +3122,6 @@ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", "dev": true }, - "isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "dev": true - }, - "js-base64": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz", - "integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==", - "dev": true - }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -3814,27 +3129,15 @@ "dev": true }, "js-yaml": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz", - "integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==", + "version": "3.12.2", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.2.tgz", + "integrity": "sha512-QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q==", "dev": true, "requires": { "argparse": "^1.0.7", "esprima": "^4.0.0" } }, - "jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true - }, - "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", - "dev": true - }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -3856,12 +3159,6 @@ "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", "dev": true }, - "json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "dev": true - }, "jsonfile": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz", @@ -3883,18 +3180,6 @@ "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=", "dev": true }, - "jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "dev": true, - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" - } - }, "just-debounce": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz", @@ -3987,14 +3272,6 @@ "pify": "^2.0.0", "pinkie-promise": "^2.0.0", "strip-bom": "^2.0.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } } }, "lodash": { @@ -4003,65 +3280,18 @@ "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", "dev": true }, - "lodash.assign": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", - "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=", - "dev": true - }, "lodash.capitalize": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz", "integrity": "sha1-+CbJtOKoUR2E46yinbBeGk87cqk=", "dev": true }, - "lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", - "dev": true - }, "lodash.kebabcase": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz", "integrity": "sha1-hImxyw0p/4gZXM7KRI/21swpXDY=", "dev": true }, - "lodash.mergewith": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz", - "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==", - "dev": true - }, - "loud-rejection": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", - "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", - "dev": true, - "requires": { - "currently-unhandled": "^0.4.1", - "signal-exit": "^3.0.0" - } - }, - "lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", - "dev": true, - "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "lru-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz", - "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=", - "dev": true, - "requires": { - "es5-ext": "~0.10.2" - } - }, "make-iterator": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz", @@ -4077,12 +3307,6 @@ "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", "dev": true }, - "map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", - "dev": true - }, "map-visit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", @@ -4110,48 +3334,6 @@ "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==", "dev": true }, - "memoizee": { - "version": "0.4.14", - "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz", - "integrity": "sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==", - "dev": true, - "requires": { - "d": "1", - "es5-ext": "^0.10.45", - "es6-weak-map": "^2.0.2", - "event-emitter": "^0.3.5", - "is-promise": "^2.1", - "lru-queue": "0.1", - "next-tick": "1", - "timers-ext": "^0.1.5" - } - }, - "meow": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", - "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", - "dev": true, - "requires": { - "camelcase-keys": "^2.0.0", - "decamelize": "^1.1.2", - "loud-rejection": "^1.0.0", - "map-obj": "^1.0.1", - "minimist": "^1.1.3", - "normalize-package-data": "^2.3.4", - "object-assign": "^4.0.1", - "read-pkg-up": "^1.0.1", - "redent": "^1.0.0", - "trim-newlines": "^1.0.0" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } - } - }, "merge": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz", @@ -4179,21 +3361,6 @@ "to-regex": "^3.0.2" } }, - "mime-db": { - "version": "1.38.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz", - "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==", - "dev": true - }, - "mime-types": { - "version": "2.1.22", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz", - "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==", - "dev": true, - "requires": { - "mime-db": "~1.38.0" - } - }, "mimic-fn": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", @@ -4267,7 +3434,8 @@ "version": "2.12.1", "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz", "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==", - "dev": true + "dev": true, + "optional": true }, "nanomatch": { "version": "1.2.13", @@ -4306,116 +3474,6 @@ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", "dev": true }, - "node-gyp": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", - "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", - "dev": true, - "requires": { - "fstream": "^1.0.0", - "glob": "^7.0.3", - "graceful-fs": "^4.1.2", - "mkdirp": "^0.5.0", - "nopt": "2 || 3", - "npmlog": "0 || 1 || 2 || 3 || 4", - "osenv": "0", - "request": "^2.87.0", - "rimraf": "2", - "semver": "~5.3.0", - "tar": "^2.0.0", - "which": "1" - }, - "dependencies": { - "semver": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", - "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", - "dev": true - } - } - }, - "node-sass": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.11.0.tgz", - "integrity": "sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==", - "dev": true, - "requires": { - "async-foreach": "^0.1.3", - "chalk": "^1.1.1", - "cross-spawn": "^3.0.0", - "gaze": "^1.0.0", - "get-stdin": "^4.0.1", - "glob": "^7.0.3", - "in-publish": "^2.0.0", - "lodash.assign": "^4.2.0", - "lodash.clonedeep": "^4.3.2", - "lodash.mergewith": "^4.6.0", - "meow": "^3.7.0", - "mkdirp": "^0.5.1", - "nan": "^2.10.0", - "node-gyp": "^3.8.0", - "npmlog": "^4.0.0", - "request": "^2.88.0", - "sass-graph": "^2.2.4", - "stdout-stream": "^1.4.0", - "true-case-path": "^1.0.2" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "cross-spawn": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", - "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", - "dev": true, - "requires": { - "lru-cache": "^4.0.1", - "which": "^1.2.9" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "node-sass-import-once": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/node-sass-import-once/-/node-sass-import-once-1.2.0.tgz", - "integrity": "sha1-TlI6oF1o2bN8frrPPxVoTmNbLy4=", - "dev": true, - "requires": { - "js-yaml": "^3.2.7" - } - }, - "nopt": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", - "dev": true, - "requires": { - "abbrev": "1" - } - }, "normalize-package-data": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", @@ -4446,30 +3504,12 @@ "once": "^1.3.2" } }, - "npmlog": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", - "dev": true, - "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, "number-is-nan": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "dev": true }, - "oauth-sign": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", - "dev": true - }, "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -4658,22 +3698,6 @@ "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true }, - "osenv": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", - "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", - "dev": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, - "p-map": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz", - "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==", - "dev": true - }, "parent-module": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.0.tgz", @@ -4813,26 +3837,12 @@ "graceful-fs": "^4.1.2", "pify": "^2.0.0", "pinkie-promise": "^2.0.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } } }, - "performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "dev": true - }, "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true }, "pinkie": { @@ -4886,12 +3896,6 @@ "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", "dev": true }, - "pretty-bytes": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-4.0.2.tgz", - "integrity": "sha1-sr+C5zUNZcbDOqlaqlpPYyf2HNk=", - "dev": true - }, "pretty-hrtime": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", @@ -4910,18 +3914,6 @@ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", "dev": true }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", - "dev": true - }, - "psl": { - "version": "1.1.31", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz", - "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==", - "dev": true - }, "pump": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", @@ -4949,12 +3941,6 @@ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", "dev": true }, - "qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", - "dev": true - }, "randomatic": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz", @@ -5057,16 +4043,6 @@ "resolve": "^1.1.6" } }, - "redent": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", - "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", - "dev": true, - "requires": { - "indent-string": "^2.1.0", - "strip-indent": "^1.0.1" - } - }, "regex-cache": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", @@ -5131,15 +4107,6 @@ "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", "dev": true }, - "repeating": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "dev": true, - "requires": { - "is-finite": "^1.0.0" - } - }, "replace-ext": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", @@ -5157,34 +4124,6 @@ "remove-trailing-separator": "^1.1.0" } }, - "request": { - "version": "2.88.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", - "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", - "dev": true, - "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.0", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.4.3", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - } - }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -5325,18 +4264,6 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true }, - "sass-graph": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz", - "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", - "dev": true, - "requires": { - "glob": "^7.0.0", - "lodash": "^4.0.0", - "scss-tokenizer": "^0.2.3", - "yargs": "^7.0.0" - } - }, "sass-lint": { "version": "1.12.1", "resolved": "https://registry.npmjs.org/sass-lint/-/sass-lint-1.12.1.tgz", @@ -5659,27 +4586,6 @@ } } }, - "scss-tokenizer": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz", - "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", - "dev": true, - "requires": { - "js-base64": "^2.1.8", - "source-map": "^0.4.2" - }, - "dependencies": { - "source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "dev": true, - "requires": { - "amdefine": ">=0.0.4" - } - } - } - }, "semver": { "version": "5.6.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", @@ -5955,23 +4861,6 @@ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, - "sshpk": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", - "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "dev": true, - "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - } - }, "stack-trace": { "version": "0.0.10", "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", @@ -5999,21 +4888,6 @@ } } }, - "stdout-stream": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz", - "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==", - "dev": true, - "requires": { - "readable-stream": "^2.0.1" - } - }, - "stream-counter": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/stream-counter/-/stream-counter-1.0.0.tgz", - "integrity": "sha1-kc8lac5NxQYf6816yyY5SloRR1E=", - "dev": true - }, "stream-exhaust": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz", @@ -6064,21 +4938,6 @@ "is-utf8": "^0.2.0" } }, - "strip-bom-string": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz", - "integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=", - "dev": true - }, - "strip-indent": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", - "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", - "dev": true, - "requires": { - "get-stdin": "^4.0.1" - } - }, "strip-json-comments": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", @@ -6117,9 +4976,9 @@ }, "dependencies": { "ansi-regex": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz", - "integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", "dev": true }, "is-fullwidth-code-point": { @@ -6129,38 +4988,27 @@ "dev": true }, "string-width": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.0.0.tgz", - "integrity": "sha512-rr8CUxBbvOZDUvc5lNIJ+OC1nPVpz+Siw9VBtUjB9b6jZehZLFt0JMCZzShFHIsI8cbhm0EsNIfWJMFV3cu3Ew==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "dev": true, "requires": { "emoji-regex": "^7.0.1", "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.0.0" + "strip-ansi": "^5.1.0" } }, "strip-ansi": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz", - "integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.1.0.tgz", + "integrity": "sha512-TjxrkPONqO2Z8QDCpeE2j6n0M6EwxzyDgzEeGp+FbdvaJAt//ClYi6W5my+3ROlC/hZX2KACUwDfK49Ka5eDvg==", "dev": true, "requires": { - "ansi-regex": "^4.0.0" + "ansi-regex": "^4.1.0" } } } }, - "tar": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", - "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", - "dev": true, - "requires": { - "block-stream": "*", - "fstream": "^1.0.2", - "inherits": "2" - } - }, "text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", @@ -6199,16 +5047,6 @@ "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=", "dev": true }, - "timers-ext": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz", - "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==", - "dev": true, - "requires": { - "es5-ext": "~0.10.46", - "next-tick": "1" - } - }, "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", @@ -6279,60 +5117,12 @@ "through2": "^2.0.3" } }, - "tough-cookie": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", - "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", - "dev": true, - "requires": { - "psl": "^1.1.24", - "punycode": "^1.4.1" - }, - "dependencies": { - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true - } - } - }, - "trim-newlines": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", - "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", - "dev": true - }, - "true-case-path": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz", - "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", - "dev": true, - "requires": { - "glob": "^7.1.2" - } - }, "tslib": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==", "dev": true }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "dev": true, - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "dev": true - }, "type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", @@ -6348,12 +5138,6 @@ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", "dev": true }, - "typey": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/typey/-/typey-1.1.2.tgz", - "integrity": "sha1-mMP6G1kDekXSQ3TbZyCWY1XAbiU=", - "dev": true - }, "unc-path-regex": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", @@ -6475,9 +5259,9 @@ } }, "upath": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz", - "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.1.tgz", + "integrity": "sha512-D0yetkpIOKiZQquxjM2Syvy48Y1DbZ0SWxgsZiwd9GCWRpc75vN8ytzem14WDSg+oiX6+Qt31FpiS/ExODCrLg==", "dev": true }, "uri-js": { @@ -6525,12 +5309,6 @@ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true }, - "uuid": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", - "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", - "dev": true - }, "v8flags": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.2.tgz", @@ -6556,17 +5334,6 @@ "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=", "dev": true }, - "verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, "vinyl": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz", @@ -6621,15 +5388,6 @@ "vinyl": "^2.0.0" } }, - "vinyl-sourcemaps-apply": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz", - "integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=", - "dev": true, - "requires": { - "source-map": "^0.5.1" - } - }, "which": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", @@ -6645,15 +5403,6 @@ "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", "dev": true }, - "wide-align": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", - "dev": true, - "requires": { - "string-width": "^1.0.2 || 2" - } - }, "wordwrap": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", @@ -6697,12 +5446,6 @@ "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", "dev": true }, - "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", - "dev": true - }, "yargs": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz", diff --git a/package.json b/package.json index 40c54ea..408e906 100644 --- a/package.json +++ b/package.json @@ -13,21 +13,13 @@ "author": "Fredrik Jonsson", "license": "GPL-2.0", "devDependencies": { - "del": "^3.0.0", "gulp": "^4.0.0", - "gulp-clean-css": "^4.0.0", "gulp-eslint": "^5.0.0", "gulp-load-plugins": "^1.5.0", - "gulp-sass": "^4.0.2", - "gulp-sass-lint": "^1.4.0", - "gulp-size": "^3.0.0", - "gulp-sourcemaps": "^2.6.4", - "gulp-touch-cmd": "0.0.1", - "node-sass-import-once": "^1.2.0", - "typey": "^1.1.2" + "gulp-sass-lint": "^1.4.0" }, "engines": { - "node": ">=9.0.0" + "node": ">=10.0.0" }, "private": true } diff --git a/static/css/print.css b/static/css/print.css deleted file mode 100644 index d254d5e..0000000 --- a/static/css/print.css +++ /dev/null @@ -1 +0,0 @@ -@media print{.pager,.print-none,aside,footer,nav{display:none}}@media print{html{font-size:12pt}.page,body{background-color:#fff}[role=main]{width:100%}:link,:visited{text-decoration:underline}abbr[title]::after{content:" (" attr(title) ")"}} \ No newline at end of file diff --git a/static/css/styles.css b/static/css/styles.css deleted file mode 100644 index ec9320b..0000000 --- a/static/css/styles.css +++ /dev/null @@ -1 +0,0 @@ -html{box-sizing:border-box}*,::after,::before{box-sizing:inherit}html{font-family:"Garamond Premier Pro",Charter,"Times New Roman",serif;font-size:137.5%;line-height:1.40909em;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;min-height:100%}@media (min-width:1111px){html{font-size:112.5%;line-height:1.38889em}}body{margin:0;padding:0}article,aside,footer,header,nav,section{display:block}.header__site-name,h1{font-size:1.27273rem;line-height:2.11364rem;margin-top:1.40909rem;margin-bottom:1.40909rem}h2{font-size:1.18182rem;line-height:2.11364rem;margin-top:1.40909rem;margin-bottom:1.40909rem}h3{font-size:1.09091rem;line-height:2.11364rem;margin-top:1.40909rem;margin-bottom:1.40909rem}h4{font-size:1rem;line-height:1.40909rem;margin-top:1.40909rem;margin-bottom:1.40909rem}h5{font-size:.81818rem;line-height:1.40909rem;margin-top:1.40909rem;margin-bottom:1.40909rem}h6{font-size:.72727rem;line-height:1.40909rem;margin-top:1.40909rem;margin-bottom:1.40909rem}@media (min-width:666px){.header__site-name,h1{font-size:1.88889rem;line-height:2.81818rem;margin-top:1.40909rem;margin-bottom:1.40909rem}h2{font-size:1.55556rem;line-height:2.11364rem;margin-top:1.40909rem;margin-bottom:1.40909rem}h3{font-size:1.22222rem;line-height:2.11364rem;margin-top:1.40909rem;margin-bottom:1.40909rem}h4{font-size:1rem;line-height:1.40909rem;margin-top:1.40909rem;margin-bottom:1.40909rem}h5{font-size:.88889rem;line-height:1.40909rem;margin-top:1.40909rem;margin-bottom:1.40909rem}h6{font-size:.77778rem;line-height:1.40909rem;margin-top:1.40909rem;margin-bottom:1.40909rem}}.divider,hr{margin:1.40909rem 0;border:0;border-top:1px solid #ccc}.divider>:first-child,hr>:first-child{margin-top:1.40909rem}blockquote{margin:1.40909rem 2rem}dl,ol,ul{margin:1.40909rem 0}dd{margin:0 0 0 44px}ol,ul{padding:0 0 0 44px}ol ol,ol ul,ul ol,ul ul{margin:0}figure{margin:1.40909rem 0;display:block}figcaption{display:block}hr{box-sizing:content-box;height:0;overflow:visible}main{display:block}p,pre{margin:1.40909rem 0}code,kbd,pre,samp{font-family:Menlo,"Ubuntu Mono","DejaVu Sans Mono","Courier New",Courier,monospace,sans-serif;font-size:1em}a{color:#000;-webkit-text-decoration-skip:objects}:visited{color:#000}a:focus,a:hover{color:#333}a:active{color:#c00}a:active:not(.button){background-color:transparent}abbr[title]{border-bottom:0;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:inherit}b,strong{font-weight:bolder}dfn{font-style:italic}mark{background-color:#fd0;color:#000}small{font-size:.81818rem}sub,sup{font-size:.72727rem;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}audio{display:inline-block}audio:not([controls]){display:none;height:0}img{border-style:none}img,svg{max-width:100%;height:auto}svg:not(:root){overflow:hidden}video{display:inline-block}button,input,optgroup,select,textarea{font-family:"Garamond Premier Pro",Charter,"Times New Roman",serif;line-height:1.40909rem;font-size:100%;box-sizing:border-box;max-width:100%;margin:0}button{overflow:visible}button,select{text-transform:none}input{overflow:visible}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}.button,[type=reset],[type=submit],button,html [type=button]{-moz-appearance:button;-webkit-appearance:button}.button,[type=button],[type=reset],[type=submit],button{font-family:Futura,"Century Gothic",AppleGothic,sans-serif;margin-right:1.05682rem;margin-bottom:1.05682rem;display:inline-block;padding:2px 10px;line-height:inherit;text-decoration:none;cursor:pointer;color:#333;text-align:center;background-image:linear-gradient(#f6f6f6,#e2e2e2);border:1px solid #e4e4e4;border-left-color:#d2d2d2;border-right-color:#d2d2d2;border-bottom-color:#b4b4b4;border-radius:2px}.button::-moz-focus-inner,[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}.button:-moz-focusring,[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:1px dotted ButtonText}.button:active,.button:focus,.button:hover,[type=button]:active,[type=button]:focus,[type=button]:hover,[type=reset]:active,[type=reset]:focus,[type=reset]:hover,[type=submit]:active,[type=submit]:focus,[type=submit]:hover,button:active,button:focus,button:hover{text-decoration:none;color:#333}.button:active,[type=button]:active,[type=reset]:active,[type=submit]:active,button:active{border-color:#555;text-shadow:#333 0 -1px 0;background:#666;color:#fff}.button[disabled],[disabled][type=button],[disabled][type=reset],[disabled][type=submit],button[disabled]{cursor:default;color:#999;background-color:#eee;border-color:#eee;background-image:none;text-shadow:none}.button[disabled]:active,.button[disabled]:focus,.button[disabled]:hover,[disabled]:active[type=button],[disabled]:active[type=reset],[disabled]:active[type=submit],[disabled]:focus[type=button],[disabled]:focus[type=reset],[disabled]:focus[type=submit],[disabled]:hover[type=button],[disabled]:hover[type=reset],[disabled]:hover[type=submit],button[disabled]:active,button[disabled]:focus,button[disabled]:hover{color:#999}[type=checkbox],[type=radio]{box-sizing:border-box;padding:0}fieldset{padding:.49318rem .70455rem .91591rem;border:1px solid #ccc}legend{box-sizing:border-box;display:table;max-width:100%;margin-left:-5px;padding:0 5px;color:inherit;white-space:normal}label{display:block;font-weight:700}progress{display:inline-block;vertical-align:baseline}textarea{overflow:auto}table{margin:1.40909rem 0;border-collapse:collapse;border-spacing:0;width:100%}td,th{padding:0}details{display:block}summary{display:list-item}menu{margin:1.40909rem 0;display:block;padding:0 0 0 44px}menu menu,ol menu,ul menu{margin:0}canvas{display:inline-block}template{display:none}[hidden]{display:none}.layout__page{max-width:960px}@media (min-width:666px){.layout__page{margin:0 auto;min-height:100vh}}.layout__first-sidebar,.layout__footer,.layout__header,.layout__main,.layout__navigation,.layout__page-bottom,.layout__page-top,.layout__second-sidebar{padding:0 10px;min-width:0}@media (min-width:666px){.layout__first-sidebar,.layout__footer,.layout__header,.layout__main,.layout__navigation,.layout__page-bottom,.layout__page-top,.layout__second-sidebar{padding:0 20px}}.layout__grid-notice{margin:10px;padding:10px;border:2px dashed #c00}@supports (display:grid){.layout__page{display:grid;grid-template-areas:'head' 'nav' 'top' 'main' 'side1' 'side2' 'bottom' 'foot';grid-template-rows:auto auto auto 1fr auto auto auto auto;grid-template-columns:1fr}@media (min-width:999px){.layout__page{grid-template-rows:auto auto auto 1fr auto auto}.layout__sidebar-first{grid-template-areas:'head head' 'nav nav' 'side1 top' 'side1 main' 'side1 bottom' 'foot foot';grid-template-columns:1fr 2fr}.layout__sidebar-second{grid-template-areas:'head head' 'nav nav' 'top side2' 'main side2' 'bottom side2' 'foot foot';grid-template-columns:2fr 1fr}.layout__sidebar-two{grid-template-areas:'head head head' 'nav nav nav' 'side1 top side2' 'side1 main side2' 'side1 bottom side2' 'foot foot foot';grid-template-columns:1fr 2fr 1fr}}.layout__header{grid-area:head}.layout__navigation{grid-area:nav}.layout__page-top{grid-area:top}.layout__main{grid-area:main}.layout__first-sidebar{grid-area:side1}.layout__second-sidebar{grid-area:side2}.layout__page-bottom{grid-area:bottom}.layout__footer{grid-area:foot}}.box{margin-bottom:1.40909rem;border:5px solid #ccc;padding:1em}.box__title{margin:0}.box--is-focus,.box.is-focus,.box:focus,.box:hover{border-color:#000}.box--highlight{border-color:#000}.clearfix::before{content:'';display:table}.clearfix::after{content:'';display:table;clear:both}@media (min-width:666px){.header{display:flex}}.header__logo{margin:0 20px 0 0}.header__logo-image{vertical-align:bottom}.header__site-name{margin:0;display:inline-block}.header__site-link:link,.header__site-link:visited{color:#000;text-decoration:none}.header__site-link:focus,.header__site-link:hover{text-decoration:underline}@media (min-width:666px){.header__region{margin-left:auto}}.hidden,html.js .js-hidden,html.nojs .nojs-hidden{display:none}.highlight-mark{color:#c00;background-color:transparent}.inline-links{padding:0}.inline-links__item{display:inline;list-style-type:none;padding:0 1em 0 0}.inline-sibling{display:inline;margin-right:10px}.inline-sibling *,.inline-sibling__child{display:inline}.inline-sibling+*,.inline-sibling+*>:first-child,.inline-sibling+*>:first-child>:first-child,.inline-sibling__adjacent{display:inline}article>.content ul,aside ul{display:table;list-style:none;padding:0}article>.content ul>li,aside ul>li{display:table-row}article>.content ul>li::before,aside ul>li::before{font-size:.81818rem;padding-right:.70455rem;display:table-cell;content:'\2022'}@media (min-width:1111px){article>.content ul>li::before,aside ul>li::before{font-size:.88889rem}}article>.content ol,aside ol{display:table;list-style:none;padding:0}article>.content ol>li,aside ol>li{display:table-row;counter-increment:table-ol}article>.content ol>li::before,aside ol>li::before{font-size:.81818rem;padding-right:.70455rem;display:table-cell;content:counter(table-ol) ".";text-align:right}@media (min-width:1111px){article>.content ol>li::before,aside ol>li::before{font-size:.88889rem}}.responsive-video{position:relative;padding-bottom:56.25%;padding-top:25px;height:0}.responsive-video iframe,.responsive-video__embed{position:absolute;top:0;left:0;width:100%;height:100%}.responsive-video--4-3{padding-bottom:75%}.visually-hidden{position:absolute!important;height:1px;width:1px;overflow:hidden;clip:rect(1px,1px,1px,1px);word-wrap:normal}.visually-hidden--focusable:active,.visually-hidden--focusable:focus,.visually-hidden--off{position:static!important;clip:auto;height:auto;width:auto;overflow:visible}.watermark{font-family:Impact,"Arial Narrow",Helvetica,sans-serif;font-weight:700;text-transform:uppercase;display:block;height:0;overflow:visible;background-color:transparent;color:#eee;font-size:75px;line-height:1;text-align:center;text-shadow:0 0 1px rgba(0,0,0,.1);word-wrap:break-word}.more-link{text-align:right}.more-link__help-icon{padding:1px 0 1px 20px;background-image:url(navigation/more-link/more-link__help-icon.svg);background-position:0 50%;background-repeat:no-repeat}.navbar{display:flex;flex-wrap:wrap;margin:0;padding:0;text-align:left}.navbar li,.navbar__item{padding:0 10px 0 0;list-style-type:none;list-style-image:none}.mobile-nav-wrapper{font-family:Futura,"Century Gothic",AppleGothic,sans-serif;position:absolute;right:0;top:0;width:100vw;height:100vh;overflow:hidden;z-index:20;pointer-events:none}.js-nav-open .mobile-nav-wrapper{position:fixed}.mobile-nav-cover{position:absolute;width:100vw;height:100vh;background-color:rgba(0,0,0,.2);opacity:0}.js-nav-open .mobile-nav-cover{opacity:1;pointer-events:auto}.mobile-nav-toggle{display:block;position:absolute;top:10px;right:10px;padding:6px 29px 4px 4px;z-index:22;text-decoration:none;font-weight:700;line-height:1;border:1px solid #ccc;border-radius:3px;color:#000;pointer-events:auto}.js-nav-open .mobile-nav-toggle{color:#fff}.mobile-nav-toggle::after{position:absolute;content:'';margin-left:5px;width:20px;height:20px;border-top:12px double #000;border-bottom:4px solid #000}.js-nav-open .mobile-nav-toggle::after{border-color:#fff}.mobile-nav-sheet{background-color:#333;width:90vw;height:100vh;padding:2rem;transform:translateX(100vw);z-index:21}.mobile-nav-sheet a{color:#fff;text-decoration:none}.js-nav-open .mobile-nav-sheet{pointer-events:auto;box-shadow:-10px 0 10px -10px #333;transform:translateX(10vw)}.mobile-nav-sheet .js-navbar{display:flex;flex-direction:column;padding:0;margin:0}.mobile-nav-sheet .js-navbar li{list-style-type:none;margin:.4rem 0}.mobile-nav-cover,.mobile-nav-sheet,.mobile-nav-toggle,.mobile-nav-toggle::after{transition:all 130ms ease-in}.js-nav-open .mobile-nav-cover,.js-nav-open .mobile-nav-sheet,.js-nav-open .mobile-nav-toggle,.js-nav-open .mobile-nav-toggle::after{transition:all 330ms ease-out}.pager{margin-top:.70455rem;margin-bottom:.70455rem;clear:both;padding:0;text-align:center}.pager-current,.pager-ellipsis,.pager-first,.pager-item,.pager-last,.pager-next,.pager-previous,.pager__current-item,.pager__item{display:inline;padding:0 .5em;list-style-type:none;background-image:none}.pager-current,.pager__current-item{font-weight:700}p,pre{margin:1.05682rem 0}body{background-color:#eee}.page{background-color:#fff}.header{padding-top:10px}@media (min-width:666px){.header{padding-top:20px}}.footer{margin-top:2.11364rem;padding:.70455rem 0;text-align:center;border-top:2px solid #333}.footer p{margin:0}figcaption,label,legend,th{font-size:.81818rem;line-height:1.40909rem}@media (min-width:1111px){figcaption,label,legend,th{font-size:.88889rem;line-height:1.40909rem}}.content-dates,.footer,.language-selector,article>header{font-size:.72727rem;line-height:1.40909rem}@media (min-width:1111px){.content-dates,.footer,.language-selector,article>header{font-size:.77778rem;line-height:1.40909rem}}.content-dates,.footer,.header,article>header,h1,h2,h3,label,legend,nav,th{font-family:Futura,"Century Gothic",AppleGothic,sans-serif;color:#333;font-weight:400}article>header{color:#666}article>header p{margin:.28182rem 0}@media (min-width:888px){article .submitted,article .tags{display:inline-block;padding-right:1rem}}article .tags ul{margin:0;padding:0}article .tags li,article .tags ul{display:inline}article .tags li{list-style-type:none}article .tags a{padding-right:.28182rem}article code{font-size:.72727rem;line-height:1.40909rem;word-wrap:break-word}@media (min-width:1111px){article code{font-size:.77778rem;line-height:1.40909rem}}article pre{color:#333;border-radius:3px;padding:5px;border:1px solid #ccc;background-color:#fff;overflow:auto;max-height:250px;max-width:90vw}@media (min-width:666px){article pre{max-width:600px}}article pre>code{display:inline-block;white-space:pre}article .content-dates{color:#666;text-align:right}.title-submitted{margin-bottom:0}@media (min-width:666px){figure{display:table}figure img{display:block}figure.left{padding:0 .70455rem .70455rem 0;margin:0;float:left;clear:both}figure.left figcaption{padding:0 .70455rem .70455rem 0}figure.right{padding:0 0 .70455rem .70455rem;margin:0;float:right;clear:both}figure.right figcaption{padding:0 0 .70455rem .70455rem}}@media (min-width:666px){figcaption{display:table-caption;caption-side:bottom}}figcaption h4,figcaption p{margin:0}.main-menu{margin-top:.70455rem;outline:0}.main-menu li{margin-right:.70455rem;margin-bottom:.70455rem;padding:0}.main-menu a{display:block;background-color:#333;color:#fff;padding:2px 8px;text-decoration:none}.main-menu a:focus,.main-menu a:hover{background-color:#666}.main-menu a.active,.main-menu a:active{background-color:#333;text-decoration:underline}.menu a.active{text-decoration:none}.message{padding:10px;border-width:1px;border-style:solid;width:95%}.message.status{background-color:#f4feee;color:#43a808;border-color:#43a808}.message.warning{background-color:#fffce6;color:#000;border-color:#000}.message.error{background-color:#fff0f0;color:#c00;border-color:#c00}.search-form{padding:.70455rem 0}.search-text{font-size:1.09091rem;line-height:1.40909rem}.language-selector .navbar::before{content:'';background-image:url(../images/language-icon.png);background-size:24px;background-repeat:no-repeat;height:24px;width:24px;margin-right:8px}.content input,.content textarea{margin-bottom:1.05682rem;width:92%}.content input:required+span::after,.content textarea:required+span::after{content:' *';color:#c00;vertical-align:top}.content input:not(:placeholder-shown):valid,.content textarea:not(:placeholder-shown):valid{background-color:#f4feee}.content input:not(:placeholder-shown):invalid,.content textarea:not(:placeholder-shown):invalid{background-color:#fff0f0}.content button{display:block}.js-submitted input:valid,.js-submitted textarea:valid{background-color:#f4feee}.js-submitted input:invalid,.js-submitted textarea:invalid{background-color:#fff0f0} \ No newline at end of file diff --git a/static/js/contact.js b/static/js/contact.js deleted file mode 100644 index bfaced7..0000000 --- a/static/js/contact.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * @file - * A JavaScript file for the contact form. - */ - -(function ($) { - - 'use strict'; - - // Contact form. - $('.contact-form').each(function () { - var $contact_form = $(this); - var $contact_button = $contact_form.find('.form-submit'); - var contact_action = '/php/contact.php'; - - // Display the hidden form. - $contact_form.removeClass('hidden'); - // Remove the "no javascript" messages - $('.contact-no-js').detach(); - - // Wait for a mouse to move, indicating they are human. - $('body').mousemove(function () { - // Unlock the form. - $contact_form.attr('action', contact_action); - $contact_button.attr('disabled', false); - }); - - // Wait for a touch move event, indicating that they are human. - $('body').on('touchmove', function () { - // Unlock the form. - $contact_form.attr('action', contact_action); - $contact_button.attr('disabled', false); - }); - - // A tab or enter key pressed can also indicate they are human. - $('body').keydown(function (e) { - if ((e.keyCode === 9) || (e.keyCode === 13)) { - // Unlock the form. - $contact_form.attr('action', contact_action); - $contact_button.attr('disabled', false); - } - }); - - // Mark the form as submitted. - $contact_button.click(function () { - $contact_form.addClass('js-submitted'); - }); - - // Display messages. - if (location.search.substring(1) !== '') { - switch (location.search.substring(1)) { - case 'submitted': - $('.contact-submitted').removeClass('hidden'); - break; - - case 'error': - $('.contact-error').removeClass('hidden'); - break; - } - } - }); - -})(jQuery); diff --git a/static/js/jquery.min.js b/static/js/jquery.min.js deleted file mode 100644 index 4d9b3a2..0000000 --- a/static/js/jquery.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! jQuery v3.3.1 | (c) JS Foundation and other contributors | jquery.org/license */ -!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){"use strict";var n=[],r=e.document,i=Object.getPrototypeOf,o=n.slice,a=n.concat,s=n.push,u=n.indexOf,l={},c=l.toString,f=l.hasOwnProperty,p=f.toString,d=p.call(Object),h={},g=function e(t){return"function"==typeof t&&"number"!=typeof t.nodeType},y=function e(t){return null!=t&&t===t.window},v={type:!0,src:!0,noModule:!0};function m(e,t,n){var i,o=(t=t||r).createElement("script");if(o.text=e,n)for(i in v)n[i]&&(o[i]=n[i]);t.head.appendChild(o).parentNode.removeChild(o)}function x(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[c.call(e)]||"object":typeof e}var b="3.3.1",w=function(e,t){return new w.fn.init(e,t)},T=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;w.fn=w.prototype={jquery:"3.3.1",constructor:w,length:0,toArray:function(){return o.call(this)},get:function(e){return null==e?o.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=w.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return w.each(this,e)},map:function(e){return this.pushStack(w.map(this,function(t,n){return e.call(t,n,t)}))},slice:function(){return this.pushStack(o.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n0&&t-1 in e)}var E=function(e){var t,n,r,i,o,a,s,u,l,c,f,p,d,h,g,y,v,m,x,b="sizzle"+1*new Date,w=e.document,T=0,C=0,E=ae(),k=ae(),S=ae(),D=function(e,t){return e===t&&(f=!0),0},N={}.hasOwnProperty,A=[],j=A.pop,q=A.push,L=A.push,H=A.slice,O=function(e,t){for(var n=0,r=e.length;n+~]|"+M+")"+M+"*"),z=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),X=new RegExp(W),U=new RegExp("^"+R+"$"),V={ID:new RegExp("^#("+R+")"),CLASS:new RegExp("^\\.("+R+")"),TAG:new RegExp("^("+R+"|[*])"),ATTR:new RegExp("^"+I),PSEUDO:new RegExp("^"+W),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+P+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},G=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Q=/^[^{]+\{\s*\[native \w/,J=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,K=/[+~]/,Z=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ee=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},te=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ne=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},re=function(){p()},ie=me(function(e){return!0===e.disabled&&("form"in e||"label"in e)},{dir:"parentNode",next:"legend"});try{L.apply(A=H.call(w.childNodes),w.childNodes),A[w.childNodes.length].nodeType}catch(e){L={apply:A.length?function(e,t){q.apply(e,H.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function oe(e,t,r,i){var o,s,l,c,f,h,v,m=t&&t.ownerDocument,T=t?t.nodeType:9;if(r=r||[],"string"!=typeof e||!e||1!==T&&9!==T&&11!==T)return r;if(!i&&((t?t.ownerDocument||t:w)!==d&&p(t),t=t||d,g)){if(11!==T&&(f=J.exec(e)))if(o=f[1]){if(9===T){if(!(l=t.getElementById(o)))return r;if(l.id===o)return r.push(l),r}else if(m&&(l=m.getElementById(o))&&x(t,l)&&l.id===o)return r.push(l),r}else{if(f[2])return L.apply(r,t.getElementsByTagName(e)),r;if((o=f[3])&&n.getElementsByClassName&&t.getElementsByClassName)return L.apply(r,t.getElementsByClassName(o)),r}if(n.qsa&&!S[e+" "]&&(!y||!y.test(e))){if(1!==T)m=t,v=e;else if("object"!==t.nodeName.toLowerCase()){(c=t.getAttribute("id"))?c=c.replace(te,ne):t.setAttribute("id",c=b),s=(h=a(e)).length;while(s--)h[s]="#"+c+" "+ve(h[s]);v=h.join(","),m=K.test(e)&&ge(t.parentNode)||t}if(v)try{return L.apply(r,m.querySelectorAll(v)),r}catch(e){}finally{c===b&&t.removeAttribute("id")}}}return u(e.replace(B,"$1"),t,r,i)}function ae(){var e=[];function t(n,i){return e.push(n+" ")>r.cacheLength&&delete t[e.shift()],t[n+" "]=i}return t}function se(e){return e[b]=!0,e}function ue(e){var t=d.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function le(e,t){var n=e.split("|"),i=n.length;while(i--)r.attrHandle[n[i]]=t}function ce(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function fe(e){return function(t){return"input"===t.nodeName.toLowerCase()&&t.type===e}}function pe(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function de(e){return function(t){return"form"in t?t.parentNode&&!1===t.disabled?"label"in t?"label"in t.parentNode?t.parentNode.disabled===e:t.disabled===e:t.isDisabled===e||t.isDisabled!==!e&&ie(t)===e:t.disabled===e:"label"in t&&t.disabled===e}}function he(e){return se(function(t){return t=+t,se(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function ge(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}n=oe.support={},o=oe.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},p=oe.setDocument=function(e){var t,i,a=e?e.ownerDocument||e:w;return a!==d&&9===a.nodeType&&a.documentElement?(d=a,h=d.documentElement,g=!o(d),w!==d&&(i=d.defaultView)&&i.top!==i&&(i.addEventListener?i.addEventListener("unload",re,!1):i.attachEvent&&i.attachEvent("onunload",re)),n.attributes=ue(function(e){return e.className="i",!e.getAttribute("className")}),n.getElementsByTagName=ue(function(e){return e.appendChild(d.createComment("")),!e.getElementsByTagName("*").length}),n.getElementsByClassName=Q.test(d.getElementsByClassName),n.getById=ue(function(e){return h.appendChild(e).id=b,!d.getElementsByName||!d.getElementsByName(b).length}),n.getById?(r.filter.ID=function(e){var t=e.replace(Z,ee);return function(e){return e.getAttribute("id")===t}},r.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&g){var n=t.getElementById(e);return n?[n]:[]}}):(r.filter.ID=function(e){var t=e.replace(Z,ee);return function(e){var n="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return n&&n.value===t}},r.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&g){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),r.find.TAG=n.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):n.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},r.find.CLASS=n.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&g)return t.getElementsByClassName(e)},v=[],y=[],(n.qsa=Q.test(d.querySelectorAll))&&(ue(function(e){h.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&y.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||y.push("\\["+M+"*(?:value|"+P+")"),e.querySelectorAll("[id~="+b+"-]").length||y.push("~="),e.querySelectorAll(":checked").length||y.push(":checked"),e.querySelectorAll("a#"+b+"+*").length||y.push(".#.+[+~]")}),ue(function(e){e.innerHTML="";var t=d.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&y.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&y.push(":enabled",":disabled"),h.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&y.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),y.push(",.*:")})),(n.matchesSelector=Q.test(m=h.matches||h.webkitMatchesSelector||h.mozMatchesSelector||h.oMatchesSelector||h.msMatchesSelector))&&ue(function(e){n.disconnectedMatch=m.call(e,"*"),m.call(e,"[s!='']:x"),v.push("!=",W)}),y=y.length&&new RegExp(y.join("|")),v=v.length&&new RegExp(v.join("|")),t=Q.test(h.compareDocumentPosition),x=t||Q.test(h.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return f=!0,0;var r=!e.compareDocumentPosition-!t.compareDocumentPosition;return r||(1&(r=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!n.sortDetached&&t.compareDocumentPosition(e)===r?e===d||e.ownerDocument===w&&x(w,e)?-1:t===d||t.ownerDocument===w&&x(w,t)?1:c?O(c,e)-O(c,t):0:4&r?-1:1)}:function(e,t){if(e===t)return f=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===d?-1:t===d?1:i?-1:o?1:c?O(c,e)-O(c,t):0;if(i===o)return ce(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?ce(a[r],s[r]):a[r]===w?-1:s[r]===w?1:0},d):d},oe.matches=function(e,t){return oe(e,null,null,t)},oe.matchesSelector=function(e,t){if((e.ownerDocument||e)!==d&&p(e),t=t.replace(z,"='$1']"),n.matchesSelector&&g&&!S[t+" "]&&(!v||!v.test(t))&&(!y||!y.test(t)))try{var r=m.call(e,t);if(r||n.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(e){}return oe(t,d,null,[e]).length>0},oe.contains=function(e,t){return(e.ownerDocument||e)!==d&&p(e),x(e,t)},oe.attr=function(e,t){(e.ownerDocument||e)!==d&&p(e);var i=r.attrHandle[t.toLowerCase()],o=i&&N.call(r.attrHandle,t.toLowerCase())?i(e,t,!g):void 0;return void 0!==o?o:n.attributes||!g?e.getAttribute(t):(o=e.getAttributeNode(t))&&o.specified?o.value:null},oe.escape=function(e){return(e+"").replace(te,ne)},oe.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},oe.uniqueSort=function(e){var t,r=[],i=0,o=0;if(f=!n.detectDuplicates,c=!n.sortStable&&e.slice(0),e.sort(D),f){while(t=e[o++])t===e[o]&&(i=r.push(o));while(i--)e.splice(r[i],1)}return c=null,e},i=oe.getText=function(e){var t,n="",r=0,o=e.nodeType;if(o){if(1===o||9===o||11===o){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=i(e)}else if(3===o||4===o)return e.nodeValue}else while(t=e[r++])n+=i(t);return n},(r=oe.selectors={cacheLength:50,createPseudo:se,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(Z,ee),e[3]=(e[3]||e[4]||e[5]||"").replace(Z,ee),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||oe.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&oe.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return V.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=a(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(Z,ee).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=E[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&E(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=oe.attr(r,e);return null==i?"!="===t:!t||(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i.replace($," ")+" ").indexOf(n)>-1:"|="===t&&(i===n||i.slice(0,n.length+1)===n+"-"))}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,f,p,d,h,g=o!==a?"nextSibling":"previousSibling",y=t.parentNode,v=s&&t.nodeName.toLowerCase(),m=!u&&!s,x=!1;if(y){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===v:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?y.firstChild:y.lastChild],a&&m){x=(d=(l=(c=(f=(p=y)[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]||[])[0]===T&&l[1])&&l[2],p=d&&y.childNodes[d];while(p=++d&&p&&p[g]||(x=d=0)||h.pop())if(1===p.nodeType&&++x&&p===t){c[e]=[T,d,x];break}}else if(m&&(x=d=(l=(c=(f=(p=t)[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]||[])[0]===T&&l[1]),!1===x)while(p=++d&&p&&p[g]||(x=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===v:1===p.nodeType)&&++x&&(m&&((c=(f=p[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]=[T,x]),p===t))break;return(x-=i)===r||x%r==0&&x/r>=0}}},PSEUDO:function(e,t){var n,i=r.pseudos[e]||r.setFilters[e.toLowerCase()]||oe.error("unsupported pseudo: "+e);return i[b]?i(t):i.length>1?(n=[e,e,"",t],r.setFilters.hasOwnProperty(e.toLowerCase())?se(function(e,n){var r,o=i(e,t),a=o.length;while(a--)e[r=O(e,o[a])]=!(n[r]=o[a])}):function(e){return i(e,0,n)}):i}},pseudos:{not:se(function(e){var t=[],n=[],r=s(e.replace(B,"$1"));return r[b]?se(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),t[0]=null,!n.pop()}}),has:se(function(e){return function(t){return oe(e,t).length>0}}),contains:se(function(e){return e=e.replace(Z,ee),function(t){return(t.textContent||t.innerText||i(t)).indexOf(e)>-1}}),lang:se(function(e){return U.test(e||"")||oe.error("unsupported lang: "+e),e=e.replace(Z,ee).toLowerCase(),function(t){var n;do{if(n=g?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return(n=n.toLowerCase())===e||0===n.indexOf(e+"-")}while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===h},focus:function(e){return e===d.activeElement&&(!d.hasFocus||d.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:de(!1),disabled:de(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!r.pseudos.empty(e)},header:function(e){return Y.test(e.nodeName)},input:function(e){return G.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:he(function(){return[0]}),last:he(function(e,t){return[t-1]}),eq:he(function(e,t,n){return[n<0?n+t:n]}),even:he(function(e,t){for(var n=0;n=0;)e.push(r);return e}),gt:he(function(e,t,n){for(var r=n<0?n+t:n;++r1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function be(e,t,n){for(var r=0,i=t.length;r-1&&(o[l]=!(a[l]=f))}}else v=we(v===a?v.splice(h,v.length):v),i?i(null,a,v,u):L.apply(a,v)})}function Ce(e){for(var t,n,i,o=e.length,a=r.relative[e[0].type],s=a||r.relative[" "],u=a?1:0,c=me(function(e){return e===t},s,!0),f=me(function(e){return O(t,e)>-1},s,!0),p=[function(e,n,r){var i=!a&&(r||n!==l)||((t=n).nodeType?c(e,n,r):f(e,n,r));return t=null,i}];u1&&xe(p),u>1&&ve(e.slice(0,u-1).concat({value:" "===e[u-2].type?"*":""})).replace(B,"$1"),n,u0,i=e.length>0,o=function(o,a,s,u,c){var f,h,y,v=0,m="0",x=o&&[],b=[],w=l,C=o||i&&r.find.TAG("*",c),E=T+=null==w?1:Math.random()||.1,k=C.length;for(c&&(l=a===d||a||c);m!==k&&null!=(f=C[m]);m++){if(i&&f){h=0,a||f.ownerDocument===d||(p(f),s=!g);while(y=e[h++])if(y(f,a||d,s)){u.push(f);break}c&&(T=E)}n&&((f=!y&&f)&&v--,o&&x.push(f))}if(v+=m,n&&m!==v){h=0;while(y=t[h++])y(x,b,a,s);if(o){if(v>0)while(m--)x[m]||b[m]||(b[m]=j.call(u));b=we(b)}L.apply(u,b),c&&!o&&b.length>0&&v+t.length>1&&oe.uniqueSort(u)}return c&&(T=E,l=w),x};return n?se(o):o}return s=oe.compile=function(e,t){var n,r=[],i=[],o=S[e+" "];if(!o){t||(t=a(e)),n=t.length;while(n--)(o=Ce(t[n]))[b]?r.push(o):i.push(o);(o=S(e,Ee(i,r))).selector=e}return o},u=oe.select=function(e,t,n,i){var o,u,l,c,f,p="function"==typeof e&&e,d=!i&&a(e=p.selector||e);if(n=n||[],1===d.length){if((u=d[0]=d[0].slice(0)).length>2&&"ID"===(l=u[0]).type&&9===t.nodeType&&g&&r.relative[u[1].type]){if(!(t=(r.find.ID(l.matches[0].replace(Z,ee),t)||[])[0]))return n;p&&(t=t.parentNode),e=e.slice(u.shift().value.length)}o=V.needsContext.test(e)?0:u.length;while(o--){if(l=u[o],r.relative[c=l.type])break;if((f=r.find[c])&&(i=f(l.matches[0].replace(Z,ee),K.test(u[0].type)&&ge(t.parentNode)||t))){if(u.splice(o,1),!(e=i.length&&ve(u)))return L.apply(n,i),n;break}}}return(p||s(e,d))(i,t,!g,n,!t||K.test(e)&&ge(t.parentNode)||t),n},n.sortStable=b.split("").sort(D).join("")===b,n.detectDuplicates=!!f,p(),n.sortDetached=ue(function(e){return 1&e.compareDocumentPosition(d.createElement("fieldset"))}),ue(function(e){return e.innerHTML="","#"===e.firstChild.getAttribute("href")})||le("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),n.attributes&&ue(function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||le("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ue(function(e){return null==e.getAttribute("disabled")})||le(P,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),oe}(e);w.find=E,w.expr=E.selectors,w.expr[":"]=w.expr.pseudos,w.uniqueSort=w.unique=E.uniqueSort,w.text=E.getText,w.isXMLDoc=E.isXML,w.contains=E.contains,w.escapeSelector=E.escape;var k=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&w(e).is(n))break;r.push(e)}return r},S=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},D=w.expr.match.needsContext;function N(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var A=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,t,n){return g(t)?w.grep(e,function(e,r){return!!t.call(e,r,e)!==n}):t.nodeType?w.grep(e,function(e){return e===t!==n}):"string"!=typeof t?w.grep(e,function(e){return u.call(t,e)>-1!==n}):w.filter(t,e,n)}w.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?w.find.matchesSelector(r,e)?[r]:[]:w.find.matches(e,w.grep(t,function(e){return 1===e.nodeType}))},w.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(w(e).filter(function(){for(t=0;t1?w.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&D.test(e)?w(e):e||[],!1).length}});var q,L=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(w.fn.init=function(e,t,n){var i,o;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(i="<"===e[0]&&">"===e[e.length-1]&&e.length>=3?[null,e,null]:L.exec(e))||!i[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(i[1]){if(t=t instanceof w?t[0]:t,w.merge(this,w.parseHTML(i[1],t&&t.nodeType?t.ownerDocument||t:r,!0)),A.test(i[1])&&w.isPlainObject(t))for(i in t)g(this[i])?this[i](t[i]):this.attr(i,t[i]);return this}return(o=r.getElementById(i[2]))&&(this[0]=o,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):g(e)?void 0!==n.ready?n.ready(e):e(w):w.makeArray(e,this)}).prototype=w.fn,q=w(r);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};w.fn.extend({has:function(e){var t=w(e,this),n=t.length;return this.filter(function(){for(var e=0;e-1:1===n.nodeType&&w.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?w.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?u.call(w(e),this[0]):u.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(w.uniqueSort(w.merge(this.get(),w(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}w.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return k(e,"parentNode")},parentsUntil:function(e,t,n){return k(e,"parentNode",n)},next:function(e){return P(e,"nextSibling")},prev:function(e){return P(e,"previousSibling")},nextAll:function(e){return k(e,"nextSibling")},prevAll:function(e){return k(e,"previousSibling")},nextUntil:function(e,t,n){return k(e,"nextSibling",n)},prevUntil:function(e,t,n){return k(e,"previousSibling",n)},siblings:function(e){return S((e.parentNode||{}).firstChild,e)},children:function(e){return S(e.firstChild)},contents:function(e){return N(e,"iframe")?e.contentDocument:(N(e,"template")&&(e=e.content||e),w.merge([],e.childNodes))}},function(e,t){w.fn[e]=function(n,r){var i=w.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=w.filter(r,i)),this.length>1&&(O[e]||w.uniqueSort(i),H.test(e)&&i.reverse()),this.pushStack(i)}});var M=/[^\x20\t\r\n\f]+/g;function R(e){var t={};return w.each(e.match(M)||[],function(e,n){t[n]=!0}),t}w.Callbacks=function(e){e="string"==typeof e?R(e):w.extend({},e);var t,n,r,i,o=[],a=[],s=-1,u=function(){for(i=i||e.once,r=t=!0;a.length;s=-1){n=a.shift();while(++s-1)o.splice(n,1),n<=s&&s--}),this},has:function(e){return e?w.inArray(e,o)>-1:o.length>0},empty:function(){return o&&(o=[]),this},disable:function(){return i=a=[],o=n="",this},disabled:function(){return!o},lock:function(){return i=a=[],n||t||(o=n=""),this},locked:function(){return!!i},fireWith:function(e,n){return i||(n=[e,(n=n||[]).slice?n.slice():n],a.push(n),t||u()),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!r}};return l};function I(e){return e}function W(e){throw e}function $(e,t,n,r){var i;try{e&&g(i=e.promise)?i.call(e).done(t).fail(n):e&&g(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}w.extend({Deferred:function(t){var n=[["notify","progress",w.Callbacks("memory"),w.Callbacks("memory"),2],["resolve","done",w.Callbacks("once memory"),w.Callbacks("once memory"),0,"resolved"],["reject","fail",w.Callbacks("once memory"),w.Callbacks("once memory"),1,"rejected"]],r="pending",i={state:function(){return r},always:function(){return o.done(arguments).fail(arguments),this},"catch":function(e){return i.then(null,e)},pipe:function(){var e=arguments;return w.Deferred(function(t){w.each(n,function(n,r){var i=g(e[r[4]])&&e[r[4]];o[r[1]](function(){var e=i&&i.apply(this,arguments);e&&g(e.promise)?e.promise().progress(t.notify).done(t.resolve).fail(t.reject):t[r[0]+"With"](this,i?[e]:arguments)})}),e=null}).promise()},then:function(t,r,i){var o=0;function a(t,n,r,i){return function(){var s=this,u=arguments,l=function(){var e,l;if(!(t=o&&(r!==W&&(s=void 0,u=[e]),n.rejectWith(s,u))}};t?c():(w.Deferred.getStackHook&&(c.stackTrace=w.Deferred.getStackHook()),e.setTimeout(c))}}return w.Deferred(function(e){n[0][3].add(a(0,e,g(i)?i:I,e.notifyWith)),n[1][3].add(a(0,e,g(t)?t:I)),n[2][3].add(a(0,e,g(r)?r:W))}).promise()},promise:function(e){return null!=e?w.extend(e,i):i}},o={};return w.each(n,function(e,t){var a=t[2],s=t[5];i[t[1]]=a.add,s&&a.add(function(){r=s},n[3-e][2].disable,n[3-e][3].disable,n[0][2].lock,n[0][3].lock),a.add(t[3].fire),o[t[0]]=function(){return o[t[0]+"With"](this===o?void 0:this,arguments),this},o[t[0]+"With"]=a.fireWith}),i.promise(o),t&&t.call(o,o),o},when:function(e){var t=arguments.length,n=t,r=Array(n),i=o.call(arguments),a=w.Deferred(),s=function(e){return function(n){r[e]=this,i[e]=arguments.length>1?o.call(arguments):n,--t||a.resolveWith(r,i)}};if(t<=1&&($(e,a.done(s(n)).resolve,a.reject,!t),"pending"===a.state()||g(i[n]&&i[n].then)))return a.then();while(n--)$(i[n],s(n),a.reject);return a.promise()}});var B=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;w.Deferred.exceptionHook=function(t,n){e.console&&e.console.warn&&t&&B.test(t.name)&&e.console.warn("jQuery.Deferred exception: "+t.message,t.stack,n)},w.readyException=function(t){e.setTimeout(function(){throw t})};var F=w.Deferred();w.fn.ready=function(e){return F.then(e)["catch"](function(e){w.readyException(e)}),this},w.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--w.readyWait:w.isReady)||(w.isReady=!0,!0!==e&&--w.readyWait>0||F.resolveWith(r,[w]))}}),w.ready.then=F.then;function _(){r.removeEventListener("DOMContentLoaded",_),e.removeEventListener("load",_),w.ready()}"complete"===r.readyState||"loading"!==r.readyState&&!r.documentElement.doScroll?e.setTimeout(w.ready):(r.addEventListener("DOMContentLoaded",_),e.addEventListener("load",_));var z=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===x(n)){i=!0;for(s in n)z(e,t,s,n[s],!0,o,a)}else if(void 0!==r&&(i=!0,g(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(w(e),n)})),t))for(;s1,null,!0)},removeData:function(e){return this.each(function(){K.remove(this,e)})}}),w.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=J.get(e,t),n&&(!r||Array.isArray(n)?r=J.access(e,t,w.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=w.queue(e,t),r=n.length,i=n.shift(),o=w._queueHooks(e,t),a=function(){w.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return J.get(e,n)||J.access(e,n,{empty:w.Callbacks("once memory").add(function(){J.remove(e,[t+"queue",n])})})}}),w.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.length\x20\t\r\n\f]+)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,""],thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};ge.optgroup=ge.option,ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td;function ye(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&N(e,t)?w.merge([e],n):n}function ve(e,t){for(var n=0,r=e.length;n-1)i&&i.push(o);else if(l=w.contains(o.ownerDocument,o),a=ye(f.appendChild(o),"script"),l&&ve(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}!function(){var e=r.createDocumentFragment().appendChild(r.createElement("div")),t=r.createElement("input");t.setAttribute("type","radio"),t.setAttribute("checked","checked"),t.setAttribute("name","t"),e.appendChild(t),h.checkClone=e.cloneNode(!0).cloneNode(!0).lastChild.checked,e.innerHTML="",h.noCloneChecked=!!e.cloneNode(!0).lastChild.defaultValue}();var be=r.documentElement,we=/^key/,Te=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ce=/^([^.]*)(?:\.(.+)|)/;function Ee(){return!0}function ke(){return!1}function Se(){try{return r.activeElement}catch(e){}}function De(e,t,n,r,i,o){var a,s;if("object"==typeof t){"string"!=typeof n&&(r=r||n,n=void 0);for(s in t)De(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=ke;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return w().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=w.guid++)),e.each(function(){w.event.add(this,t,i,r,n)})}w.event={global:{},add:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,y=J.get(e);if(y){n.handler&&(n=(o=n).handler,i=o.selector),i&&w.find.matchesSelector(be,i),n.guid||(n.guid=w.guid++),(u=y.events)||(u=y.events={}),(a=y.handle)||(a=y.handle=function(t){return"undefined"!=typeof w&&w.event.triggered!==t.type?w.event.dispatch.apply(e,arguments):void 0}),l=(t=(t||"").match(M)||[""]).length;while(l--)d=g=(s=Ce.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=w.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=w.event.special[d]||{},c=w.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&w.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(e,r,h,a)||e.addEventListener&&e.addEventListener(d,a)),f.add&&(f.add.call(e,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),w.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,y=J.hasData(e)&&J.get(e);if(y&&(u=y.events)){l=(t=(t||"").match(M)||[""]).length;while(l--)if(s=Ce.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){f=w.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,y.handle)||w.removeEvent(e,d,y.handle),delete u[d])}else for(d in u)w.event.remove(e,d+t[l],n,r,!0);w.isEmptyObject(u)&&J.remove(e,"handle events")}},dispatch:function(e){var t=w.event.fix(e),n,r,i,o,a,s,u=new Array(arguments.length),l=(J.get(this,"events")||{})[t.type]||[],c=w.event.special[t.type]||{};for(u[0]=t,n=1;n=1))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n-1:w.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u\x20\t\r\n\f]*)[^>]*)\/>/gi,Ae=/\s*$/g;function Le(e,t){return N(e,"table")&&N(11!==t.nodeType?t:t.firstChild,"tr")?w(e).children("tbody")[0]||e:e}function He(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Oe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Pe(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(J.hasData(e)&&(o=J.access(e),a=J.set(t,o),l=o.events)){delete a.handle,a.events={};for(i in l)for(n=0,r=l[i].length;n1&&"string"==typeof y&&!h.checkClone&&je.test(y))return e.each(function(i){var o=e.eq(i);v&&(t[0]=y.call(this,i,o.html())),Re(o,t,n,r)});if(p&&(i=xe(t,e[0].ownerDocument,!1,e,r),o=i.firstChild,1===i.childNodes.length&&(i=o),o||r)){for(u=(s=w.map(ye(i,"script"),He)).length;f")},clone:function(e,t,n){var r,i,o,a,s=e.cloneNode(!0),u=w.contains(e.ownerDocument,e);if(!(h.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||w.isXMLDoc(e)))for(a=ye(s),r=0,i=(o=ye(e)).length;r0&&ve(a,!u&&ye(e,"script")),s},cleanData:function(e){for(var t,n,r,i=w.event.special,o=0;void 0!==(n=e[o]);o++)if(Y(n)){if(t=n[J.expando]){if(t.events)for(r in t.events)i[r]?w.event.remove(n,r):w.removeEvent(n,r,t.handle);n[J.expando]=void 0}n[K.expando]&&(n[K.expando]=void 0)}}}),w.fn.extend({detach:function(e){return Ie(this,e,!0)},remove:function(e){return Ie(this,e)},text:function(e){return z(this,function(e){return void 0===e?w.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Re(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Le(this,e).appendChild(e)})},prepend:function(){return Re(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Le(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Re(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Re(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(w.cleanData(ye(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return w.clone(this,e,t)})},html:function(e){return z(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Ae.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=w.htmlPrefilter(e);try{for(;n=0&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))),u}function et(e,t,n){var r=$e(e),i=Fe(e,t,r),o="border-box"===w.css(e,"boxSizing",!1,r),a=o;if(We.test(i)){if(!n)return i;i="auto"}return a=a&&(h.boxSizingReliable()||i===e.style[t]),("auto"===i||!parseFloat(i)&&"inline"===w.css(e,"display",!1,r))&&(i=e["offset"+t[0].toUpperCase()+t.slice(1)],a=!0),(i=parseFloat(i)||0)+Ze(e,t,n||(o?"border":"content"),a,r,i)+"px"}w.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Fe(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=G(t),u=Xe.test(t),l=e.style;if(u||(t=Je(s)),a=w.cssHooks[t]||w.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"==(o=typeof n)&&(i=ie.exec(n))&&i[1]&&(n=ue(e,t,i),o="number"),null!=n&&n===n&&("number"===o&&(n+=i&&i[3]||(w.cssNumber[s]?"":"px")),h.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=G(t);return Xe.test(t)||(t=Je(s)),(a=w.cssHooks[t]||w.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Fe(e,t,r)),"normal"===i&&t in Ve&&(i=Ve[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),w.each(["height","width"],function(e,t){w.cssHooks[t]={get:function(e,n,r){if(n)return!ze.test(w.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?et(e,t,r):se(e,Ue,function(){return et(e,t,r)})},set:function(e,n,r){var i,o=$e(e),a="border-box"===w.css(e,"boxSizing",!1,o),s=r&&Ze(e,t,r,a,o);return a&&h.scrollboxSize()===o.position&&(s-=Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-parseFloat(o[t])-Ze(e,t,"border",!1,o)-.5)),s&&(i=ie.exec(n))&&"px"!==(i[3]||"px")&&(e.style[t]=n,n=w.css(e,t)),Ke(e,n,s)}}}),w.cssHooks.marginLeft=_e(h.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Fe(e,"marginLeft"))||e.getBoundingClientRect().left-se(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),w.each({margin:"",padding:"",border:"Width"},function(e,t){w.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[e+oe[r]+t]=o[r]||o[r-2]||o[0];return i}},"margin"!==e&&(w.cssHooks[e+t].set=Ke)}),w.fn.extend({css:function(e,t){return z(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=$e(e),i=t.length;a1)}});function tt(e,t,n,r,i){return new tt.prototype.init(e,t,n,r,i)}w.Tween=tt,tt.prototype={constructor:tt,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||w.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(w.cssNumber[n]?"":"px")},cur:function(){var e=tt.propHooks[this.prop];return e&&e.get?e.get(this):tt.propHooks._default.get(this)},run:function(e){var t,n=tt.propHooks[this.prop];return this.options.duration?this.pos=t=w.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):tt.propHooks._default.set(this),this}},tt.prototype.init.prototype=tt.prototype,tt.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=w.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){w.fx.step[e.prop]?w.fx.step[e.prop](e):1!==e.elem.nodeType||null==e.elem.style[w.cssProps[e.prop]]&&!w.cssHooks[e.prop]?e.elem[e.prop]=e.now:w.style(e.elem,e.prop,e.now+e.unit)}}},tt.propHooks.scrollTop=tt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},w.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},w.fx=tt.prototype.init,w.fx.step={};var nt,rt,it=/^(?:toggle|show|hide)$/,ot=/queueHooks$/;function at(){rt&&(!1===r.hidden&&e.requestAnimationFrame?e.requestAnimationFrame(at):e.setTimeout(at,w.fx.interval),w.fx.tick())}function st(){return e.setTimeout(function(){nt=void 0}),nt=Date.now()}function ut(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=oe[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function lt(e,t,n){for(var r,i=(pt.tweeners[t]||[]).concat(pt.tweeners["*"]),o=0,a=i.length;o1)},removeAttr:function(e){return this.each(function(){w.removeAttr(this,e)})}}),w.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?w.prop(e,t,n):(1===o&&w.isXMLDoc(e)||(i=w.attrHooks[t.toLowerCase()]||(w.expr.match.bool.test(t)?dt:void 0)),void 0!==n?null===n?void w.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=w.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!h.radioValue&&"radio"===t&&N(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(M);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),dt={set:function(e,t,n){return!1===t?w.removeAttr(e,n):e.setAttribute(n,n),n}},w.each(w.expr.match.bool.source.match(/\w+/g),function(e,t){var n=ht[t]||w.find.attr;ht[t]=function(e,t,r){var i,o,a=t.toLowerCase();return r||(o=ht[a],ht[a]=i,i=null!=n(e,t,r)?a:null,ht[a]=o),i}});var gt=/^(?:input|select|textarea|button)$/i,yt=/^(?:a|area)$/i;w.fn.extend({prop:function(e,t){return z(this,w.prop,e,t,arguments.length>1)},removeProp:function(e){return this.each(function(){delete this[w.propFix[e]||e]})}}),w.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&w.isXMLDoc(e)||(t=w.propFix[t]||t,i=w.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=w.find.attr(e,"tabindex");return t?parseInt(t,10):gt.test(e.nodeName)||yt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),h.optSelected||(w.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),w.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){w.propFix[this.toLowerCase()]=this});function vt(e){return(e.match(M)||[]).join(" ")}function mt(e){return e.getAttribute&&e.getAttribute("class")||""}function xt(e){return Array.isArray(e)?e:"string"==typeof e?e.match(M)||[]:[]}w.fn.extend({addClass:function(e){var t,n,r,i,o,a,s,u=0;if(g(e))return this.each(function(t){w(this).addClass(e.call(this,t,mt(this)))});if((t=xt(e)).length)while(n=this[u++])if(i=mt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=t[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},removeClass:function(e){var t,n,r,i,o,a,s,u=0;if(g(e))return this.each(function(t){w(this).removeClass(e.call(this,t,mt(this)))});if(!arguments.length)return this.attr("class","");if((t=xt(e)).length)while(n=this[u++])if(i=mt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=t[a++])while(r.indexOf(" "+o+" ")>-1)r=r.replace(" "+o+" "," ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(e,t){var n=typeof e,r="string"===n||Array.isArray(e);return"boolean"==typeof t&&r?t?this.addClass(e):this.removeClass(e):g(e)?this.each(function(n){w(this).toggleClass(e.call(this,n,mt(this),t),t)}):this.each(function(){var t,i,o,a;if(r){i=0,o=w(this),a=xt(e);while(t=a[i++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else void 0!==e&&"boolean"!==n||((t=mt(this))&&J.set(this,"__className__",t),this.setAttribute&&this.setAttribute("class",t||!1===e?"":J.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&(" "+vt(mt(n))+" ").indexOf(t)>-1)return!0;return!1}});var bt=/\r/g;w.fn.extend({val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=g(e),this.each(function(n){var i;1===this.nodeType&&(null==(i=r?e.call(this,n,w(this).val()):e)?i="":"number"==typeof i?i+="":Array.isArray(i)&&(i=w.map(i,function(e){return null==e?"":e+""})),(t=w.valHooks[this.type]||w.valHooks[this.nodeName.toLowerCase()])&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))});if(i)return(t=w.valHooks[i.type]||w.valHooks[i.nodeName.toLowerCase()])&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:"string"==typeof(n=i.value)?n.replace(bt,""):null==n?"":n}}}),w.extend({valHooks:{option:{get:function(e){var t=w.find.attr(e,"value");return null!=t?t:vt(w.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r-1)&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),w.each(["radio","checkbox"],function(){w.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=w.inArray(w(e).val(),t)>-1}},h.checkOn||(w.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),h.focusin="onfocusin"in e;var wt=/^(?:focusinfocus|focusoutblur)$/,Tt=function(e){e.stopPropagation()};w.extend(w.event,{trigger:function(t,n,i,o){var a,s,u,l,c,p,d,h,v=[i||r],m=f.call(t,"type")?t.type:t,x=f.call(t,"namespace")?t.namespace.split("."):[];if(s=h=u=i=i||r,3!==i.nodeType&&8!==i.nodeType&&!wt.test(m+w.event.triggered)&&(m.indexOf(".")>-1&&(m=(x=m.split(".")).shift(),x.sort()),c=m.indexOf(":")<0&&"on"+m,t=t[w.expando]?t:new w.Event(m,"object"==typeof t&&t),t.isTrigger=o?2:3,t.namespace=x.join("."),t.rnamespace=t.namespace?new RegExp("(^|\\.)"+x.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=void 0,t.target||(t.target=i),n=null==n?[t]:w.makeArray(n,[t]),d=w.event.special[m]||{},o||!d.trigger||!1!==d.trigger.apply(i,n))){if(!o&&!d.noBubble&&!y(i)){for(l=d.delegateType||m,wt.test(l+m)||(s=s.parentNode);s;s=s.parentNode)v.push(s),u=s;u===(i.ownerDocument||r)&&v.push(u.defaultView||u.parentWindow||e)}a=0;while((s=v[a++])&&!t.isPropagationStopped())h=s,t.type=a>1?l:d.bindType||m,(p=(J.get(s,"events")||{})[t.type]&&J.get(s,"handle"))&&p.apply(s,n),(p=c&&s[c])&&p.apply&&Y(s)&&(t.result=p.apply(s,n),!1===t.result&&t.preventDefault());return t.type=m,o||t.isDefaultPrevented()||d._default&&!1!==d._default.apply(v.pop(),n)||!Y(i)||c&&g(i[m])&&!y(i)&&((u=i[c])&&(i[c]=null),w.event.triggered=m,t.isPropagationStopped()&&h.addEventListener(m,Tt),i[m](),t.isPropagationStopped()&&h.removeEventListener(m,Tt),w.event.triggered=void 0,u&&(i[c]=u)),t.result}},simulate:function(e,t,n){var r=w.extend(new w.Event,n,{type:e,isSimulated:!0});w.event.trigger(r,null,t)}}),w.fn.extend({trigger:function(e,t){return this.each(function(){w.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return w.event.trigger(e,t,n,!0)}}),h.focusin||w.each({focus:"focusin",blur:"focusout"},function(e,t){var n=function(e){w.event.simulate(t,e.target,w.event.fix(e))};w.event.special[t]={setup:function(){var r=this.ownerDocument||this,i=J.access(r,t);i||r.addEventListener(e,n,!0),J.access(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=J.access(r,t)-1;i?J.access(r,t,i):(r.removeEventListener(e,n,!0),J.remove(r,t))}}});var Ct=e.location,Et=Date.now(),kt=/\?/;w.parseXML=function(t){var n;if(!t||"string"!=typeof t)return null;try{n=(new e.DOMParser).parseFromString(t,"text/xml")}catch(e){n=void 0}return n&&!n.getElementsByTagName("parsererror").length||w.error("Invalid XML: "+t),n};var St=/\[\]$/,Dt=/\r?\n/g,Nt=/^(?:submit|button|image|reset|file)$/i,At=/^(?:input|select|textarea|keygen)/i;function jt(e,t,n,r){var i;if(Array.isArray(t))w.each(t,function(t,i){n||St.test(e)?r(e,i):jt(e+"["+("object"==typeof i&&null!=i?t:"")+"]",i,n,r)});else if(n||"object"!==x(t))r(e,t);else for(i in t)jt(e+"["+i+"]",t[i],n,r)}w.param=function(e,t){var n,r=[],i=function(e,t){var n=g(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(Array.isArray(e)||e.jquery&&!w.isPlainObject(e))w.each(e,function(){i(this.name,this.value)});else for(n in e)jt(n,e[n],t,i);return r.join("&")},w.fn.extend({serialize:function(){return w.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=w.prop(this,"elements");return e?w.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!w(this).is(":disabled")&&At.test(this.nodeName)&&!Nt.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=w(this).val();return null==n?null:Array.isArray(n)?w.map(n,function(e){return{name:t.name,value:e.replace(Dt,"\r\n")}}):{name:t.name,value:n.replace(Dt,"\r\n")}}).get()}});var qt=/%20/g,Lt=/#.*$/,Ht=/([?&])_=[^&]*/,Ot=/^(.*?):[ \t]*([^\r\n]*)$/gm,Pt=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Mt=/^(?:GET|HEAD)$/,Rt=/^\/\//,It={},Wt={},$t="*/".concat("*"),Bt=r.createElement("a");Bt.href=Ct.href;function Ft(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(M)||[];if(g(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function _t(e,t,n,r){var i={},o=e===Wt;function a(s){var u;return i[s]=!0,w.each(e[s]||[],function(e,s){var l=s(t,n,r);return"string"!=typeof l||o||i[l]?o?!(u=l):void 0:(t.dataTypes.unshift(l),a(l),!1)}),u}return a(t.dataTypes[0])||!i["*"]&&a("*")}function zt(e,t){var n,r,i=w.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&w.extend(!0,e,r),e}function Xt(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}function Ut(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}w.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ct.href,type:"GET",isLocal:Pt.test(Ct.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":$t,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":w.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?zt(zt(e,w.ajaxSettings),t):zt(w.ajaxSettings,e)},ajaxPrefilter:Ft(It),ajaxTransport:Ft(Wt),ajax:function(t,n){"object"==typeof t&&(n=t,t=void 0),n=n||{};var i,o,a,s,u,l,c,f,p,d,h=w.ajaxSetup({},n),g=h.context||h,y=h.context&&(g.nodeType||g.jquery)?w(g):w.event,v=w.Deferred(),m=w.Callbacks("once memory"),x=h.statusCode||{},b={},T={},C="canceled",E={readyState:0,getResponseHeader:function(e){var t;if(c){if(!s){s={};while(t=Ot.exec(a))s[t[1].toLowerCase()]=t[2]}t=s[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return c?a:null},setRequestHeader:function(e,t){return null==c&&(e=T[e.toLowerCase()]=T[e.toLowerCase()]||e,b[e]=t),this},overrideMimeType:function(e){return null==c&&(h.mimeType=e),this},statusCode:function(e){var t;if(e)if(c)E.always(e[E.status]);else for(t in e)x[t]=[x[t],e[t]];return this},abort:function(e){var t=e||C;return i&&i.abort(t),k(0,t),this}};if(v.promise(E),h.url=((t||h.url||Ct.href)+"").replace(Rt,Ct.protocol+"//"),h.type=n.method||n.type||h.method||h.type,h.dataTypes=(h.dataType||"*").toLowerCase().match(M)||[""],null==h.crossDomain){l=r.createElement("a");try{l.href=h.url,l.href=l.href,h.crossDomain=Bt.protocol+"//"+Bt.host!=l.protocol+"//"+l.host}catch(e){h.crossDomain=!0}}if(h.data&&h.processData&&"string"!=typeof h.data&&(h.data=w.param(h.data,h.traditional)),_t(It,h,n,E),c)return E;(f=w.event&&h.global)&&0==w.active++&&w.event.trigger("ajaxStart"),h.type=h.type.toUpperCase(),h.hasContent=!Mt.test(h.type),o=h.url.replace(Lt,""),h.hasContent?h.data&&h.processData&&0===(h.contentType||"").indexOf("application/x-www-form-urlencoded")&&(h.data=h.data.replace(qt,"+")):(d=h.url.slice(o.length),h.data&&(h.processData||"string"==typeof h.data)&&(o+=(kt.test(o)?"&":"?")+h.data,delete h.data),!1===h.cache&&(o=o.replace(Ht,"$1"),d=(kt.test(o)?"&":"?")+"_="+Et+++d),h.url=o+d),h.ifModified&&(w.lastModified[o]&&E.setRequestHeader("If-Modified-Since",w.lastModified[o]),w.etag[o]&&E.setRequestHeader("If-None-Match",w.etag[o])),(h.data&&h.hasContent&&!1!==h.contentType||n.contentType)&&E.setRequestHeader("Content-Type",h.contentType),E.setRequestHeader("Accept",h.dataTypes[0]&&h.accepts[h.dataTypes[0]]?h.accepts[h.dataTypes[0]]+("*"!==h.dataTypes[0]?", "+$t+"; q=0.01":""):h.accepts["*"]);for(p in h.headers)E.setRequestHeader(p,h.headers[p]);if(h.beforeSend&&(!1===h.beforeSend.call(g,E,h)||c))return E.abort();if(C="abort",m.add(h.complete),E.done(h.success),E.fail(h.error),i=_t(Wt,h,n,E)){if(E.readyState=1,f&&y.trigger("ajaxSend",[E,h]),c)return E;h.async&&h.timeout>0&&(u=e.setTimeout(function(){E.abort("timeout")},h.timeout));try{c=!1,i.send(b,k)}catch(e){if(c)throw e;k(-1,e)}}else k(-1,"No Transport");function k(t,n,r,s){var l,p,d,b,T,C=n;c||(c=!0,u&&e.clearTimeout(u),i=void 0,a=s||"",E.readyState=t>0?4:0,l=t>=200&&t<300||304===t,r&&(b=Xt(h,E,r)),b=Ut(h,b,E,l),l?(h.ifModified&&((T=E.getResponseHeader("Last-Modified"))&&(w.lastModified[o]=T),(T=E.getResponseHeader("etag"))&&(w.etag[o]=T)),204===t||"HEAD"===h.type?C="nocontent":304===t?C="notmodified":(C=b.state,p=b.data,l=!(d=b.error))):(d=C,!t&&C||(C="error",t<0&&(t=0))),E.status=t,E.statusText=(n||C)+"",l?v.resolveWith(g,[p,C,E]):v.rejectWith(g,[E,C,d]),E.statusCode(x),x=void 0,f&&y.trigger(l?"ajaxSuccess":"ajaxError",[E,h,l?p:d]),m.fireWith(g,[E,C]),f&&(y.trigger("ajaxComplete",[E,h]),--w.active||w.event.trigger("ajaxStop")))}return E},getJSON:function(e,t,n){return w.get(e,t,n,"json")},getScript:function(e,t){return w.get(e,void 0,t,"script")}}),w.each(["get","post"],function(e,t){w[t]=function(e,n,r,i){return g(n)&&(i=i||r,r=n,n=void 0),w.ajax(w.extend({url:e,type:t,dataType:i,data:n,success:r},w.isPlainObject(e)&&e))}}),w._evalUrl=function(e){return w.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},w.fn.extend({wrapAll:function(e){var t;return this[0]&&(g(e)&&(e=e.call(this[0])),t=w(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(e){return g(e)?this.each(function(t){w(this).wrapInner(e.call(this,t))}):this.each(function(){var t=w(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=g(e);return this.each(function(n){w(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(e){return this.parent(e).not("body").each(function(){w(this).replaceWith(this.childNodes)}),this}}),w.expr.pseudos.hidden=function(e){return!w.expr.pseudos.visible(e)},w.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},w.ajaxSettings.xhr=function(){try{return new e.XMLHttpRequest}catch(e){}};var Vt={0:200,1223:204},Gt=w.ajaxSettings.xhr();h.cors=!!Gt&&"withCredentials"in Gt,h.ajax=Gt=!!Gt,w.ajaxTransport(function(t){var n,r;if(h.cors||Gt&&!t.crossDomain)return{send:function(i,o){var a,s=t.xhr();if(s.open(t.type,t.url,t.async,t.username,t.password),t.xhrFields)for(a in t.xhrFields)s[a]=t.xhrFields[a];t.mimeType&&s.overrideMimeType&&s.overrideMimeType(t.mimeType),t.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");for(a in i)s.setRequestHeader(a,i[a]);n=function(e){return function(){n&&(n=r=s.onload=s.onerror=s.onabort=s.ontimeout=s.onreadystatechange=null,"abort"===e?s.abort():"error"===e?"number"!=typeof s.status?o(0,"error"):o(s.status,s.statusText):o(Vt[s.status]||s.status,s.statusText,"text"!==(s.responseType||"text")||"string"!=typeof s.responseText?{binary:s.response}:{text:s.responseText},s.getAllResponseHeaders()))}},s.onload=n(),r=s.onerror=s.ontimeout=n("error"),void 0!==s.onabort?s.onabort=r:s.onreadystatechange=function(){4===s.readyState&&e.setTimeout(function(){n&&r()})},n=n("abort");try{s.send(t.hasContent&&t.data||null)}catch(e){if(n)throw e}},abort:function(){n&&n()}}}),w.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),w.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return w.globalEval(e),e}}}),w.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),w.ajaxTransport("script",function(e){if(e.crossDomain){var t,n;return{send:function(i,o){t=w("