diff --git a/.gitignore b/.gitignore index 349e3a9..1352b9d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ _site/ STYLEGUIDE_TEMPLATE/output_dev/ STYLEGUIDE_TEMPLATE/output_prod/ node_modules/ -.idea/ \ No newline at end of file +.idea/ +vendor/ diff --git a/STYLEGUIDE_TEMPLATE/source/code/_views/component.html b/STYLEGUIDE_TEMPLATE/source/code/_views/component.html index 9e27a6b..9269bc7 100644 --- a/STYLEGUIDE_TEMPLATE/source/code/_views/component.html +++ b/STYLEGUIDE_TEMPLATE/source/code/_views/component.html @@ -1,29 +1,29 @@ {% extends "styleguide" %} {% block content_wrapper %} -
-
-
Living Styleguide
-

{{ site.title }} Styleguide

-
-
-
-
-
-

{{ page.title }}

-

{{ page.description }}

-
-
+
+
+
Living Styleguide
+

{{ site.title }} Styleguide

+
+
+
+
+
+

{{ page.title }}

+

{{ page.description }}

+
-
- {% if page.type == "rail" %} -
-
- {% else %} -
-
+
+
+{% if page.type == "rail" %} +
+
+ {% else %} +
+
{% endif %} - {% block content %}{% endblock %} -
+ {% block content %}{% endblock %}
+
{% endblock %} diff --git a/STYLEGUIDE_TEMPLATE/source/code/_views/default.html b/STYLEGUIDE_TEMPLATE/source/code/_views/default.html index b2316c5..103b8d3 100644 --- a/STYLEGUIDE_TEMPLATE/source/code/_views/default.html +++ b/STYLEGUIDE_TEMPLATE/source/code/_views/default.html @@ -5,12 +5,12 @@ {% block title %}{{ page.title }}{% endblock %} | {{ site.title }} - + - + - {% block content_wrapper %}{% block content %}{% endblock %}{% endblock %} + {% block content_wrapper %}{% block content %}{% endblock %}{% endblock %} diff --git a/STYLEGUIDE_TEMPLATE/source/code/_views/element.html b/STYLEGUIDE_TEMPLATE/source/code/_views/element.html index b28149c..9bbb8cf 100644 --- a/STYLEGUIDE_TEMPLATE/source/code/_views/element.html +++ b/STYLEGUIDE_TEMPLATE/source/code/_views/element.html @@ -1,18 +1,18 @@ {% extends "styleguide" %} {% block content_wrapper %} -
-
-
Living Styleguide
-

{{ site.title }} Styleguide

-
-
-
-
-
-

{{ page.title }}

-

{{ page.description }}

-
-
+
+
+
Living Styleguide
+

{{ site.title }} Styleguide

+
+
+
+
+
+

{{ page.title }}

+

{{ page.description }}

+
- {% block content %}{% endblock %} +
+{% block content %}{% endblock %} {% endblock %} diff --git a/STYLEGUIDE_TEMPLATE/source/code/_views/styleguide.html b/STYLEGUIDE_TEMPLATE/source/code/_views/styleguide.html index 2280d59..8f128a3 100644 --- a/STYLEGUIDE_TEMPLATE/source/code/_views/styleguide.html +++ b/STYLEGUIDE_TEMPLATE/source/code/_views/styleguide.html @@ -5,17 +5,17 @@ {% block title %}{{ page.title }}{% endblock %} | {{ site.title }} - + - {% block content_wrapper %}{% block content %}{% endblock %}{% endblock %} -
-
-

Copyright (c) 2016 Palantir.net

-
-
+ {% block content_wrapper %}{% block content %}{% endblock %}{% endblock %} +
+
+

Copyright (c) 2016 Palantir.net

+
+
diff --git a/STYLEGUIDE_TEMPLATE/source/code/css/styles.css b/STYLEGUIDE_TEMPLATE/source/code/css/styles.css index 74e2e62..619d760 100644 --- a/STYLEGUIDE_TEMPLATE/source/code/css/styles.css +++ b/STYLEGUIDE_TEMPLATE/source/code/css/styles.css @@ -1 +1,2 @@ -h1,h2,h3{letter-spacing:-.0125em}h5,h6{letter-spacing:.1em}h1,h2,h3{font-weight:700}h5,h6{text-transform:uppercase}.element-focusable,.element-invisible{position:absolute!important;height:1px;width:1px;overflow:hidden;clip:rect(1px,1px,1px,1px)}.element-focusable:active,.element-focusable:focus{position:static!important;clip:auto;height:auto;width:auto;overflow:auto}article,aside,details,figcaption,figure,footer,header,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-family:Helvetica,Arial,Nimbus Sans L,sans-serif;font-weight:400;font-size:93.75%;text-rendering:optimizeLegibility;color:#444;background:#fff}@media (min-width:600px){html{font-size:105%}}@media (min-width:900px){html{font-size:116.25%}}@media (min-width:1100px){html{font-size:127.5%}}body{margin:0;padding:0}a:link,a:visited{color:#888;text-decoration:none}a:active,a:focus,a:hover{color:#f0f0f0;text-decoration:underline}a:focus{outline:thin dotted}a:active,a:hover{outline:0}blockquote{margin:rhythm(1);color:#888}h6{font-weight:400}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}hr{height:0;border:1px solid #ddd;padding-bottom:-1px;margin:rhythm(2) 0}mark{background:#ff0;color:#000}code,kbd,pre,samp,tt,var{font-family:Courier New,DejaVu Sans Mono,monospace}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}dl,menu,ol,ol ol,ol ul,ul,ul ol,ul ul{margin:0 0 rhythm(1)}dd{margin:0 0 0 rhythm(1)}menu,ol,ul{padding:0 0 0 rhythm(1)}img{border:0;vertical-align:bottom;max-width:100%;width:auto}figcaption{color:#888;font-style:italic;margin-top:rhythm(.5,12px)}.video-wrapper{position:relative;padding-bottom:56.25%;height:0}.video-wrapper iframe{position:absolute;top:0;left:0;width:100%;height:100%}svg:not(:root){overflow:hidden}figure{margin:rhythm(1.5,15px) 0}fieldset{margin:0 2px;border-color:silver}legend{border:0;padding:0}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0;max-width:100%}button,input{line-height:normal}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{cursor:pointer}button[disabled],html input[disabled]{cursor:default}textarea{overflow:auto;vertical-align:top}label{display:block}input[type=color],input[type=date],input[type=datetime-local],input[type=datetime],input[type=email],input[type=month],input[type=number],input[type=password],input[type=search],input[type=tel],input[type=text],input[type=time],input[type=url],input[type=week],select,textarea{color:#888;background:#fff;width:100%;text-indent:.5em;border:1px solid #f0f0f0;outline:none}input[type=color]:active,input[type=color]:focus,input[type=color]:hover,input[type=date]:active,input[type=date]:focus,input[type=date]:hover,input[type=datetime-local]:active,input[type=datetime-local]:focus,input[type=datetime-local]:hover,input[type=datetime]:active,input[type=datetime]:focus,input[type=datetime]:hover,input[type=email]:active,input[type=email]:focus,input[type=email]:hover,input[type=month]:active,input[type=month]:focus,input[type=month]:hover,input[type=number]:active,input[type=number]:focus,input[type=number]:hover,input[type=password]:active,input[type=password]:focus,input[type=password]:hover,input[type=search]:active,input[type=search]:focus,input[type=search]:hover,input[type=tel]:active,input[type=tel]:focus,input[type=tel]:hover,input[type=text]:active,input[type=text]:focus,input[type=text]:hover,input[type=time]:active,input[type=time]:focus,input[type=time]:hover,input[type=url]:active,input[type=url]:focus,input[type=url]:hover,input[type=week]:active,input[type=week]:focus,input[type=week]:hover,select:active,select:focus,select:hover,textarea:active,textarea:focus,textarea:hover{border:1px solid #444;outline:none}input[type=color],input[type=date],input[type=datetime-local],input[type=datetime],input[type=email],input[type=month],input[type=number],input[type=password],input[type=search],input[type=tel],input[type=text],input[type=time],input[type=url],input[type=week],select{height:2.5em}input:not([type]){color:#888;background:#f0f0f0;width:100%;text-indent:.5em;border:1px solid #888;outline:none}input:not([type]):active,input:not([type]):focus,input:not([type]):hover{border:1px solid #444;outline:none}input[type=color]{padding:.2em .5em}input[type=checkbox]:focus,input[type=file]:focus,input[type=radio]:focus{outline:1px dotted #444}input:not([type])[disabled],input[type=color][disabled],input[type=date][disabled],input[type=datetime-local][disabled],input[type=datetime][disabled],input[type=email][disabled],input[type=month][disabled],input[type=number][disabled],input[type=password][disabled],input[type=search][disabled],input[type=tel][disabled],input[type=text][disabled],input[type=time][disabled],input[type=url][disabled],input[type=week][disabled],select[disabled],textarea[disabled]{cursor:not-allowed;background-color:#f0f0f0;color:#888}input[readonly],select[readonly],textarea[readonly]{background:#f0f0f0;color:#888;border-color:#888}input:focus:invalid,select:focus:invalid,textarea:focus:invalid{color:#b94a48;border-color:#ee5f5b}input:focus:invalid:focus,select:focus:invalid:focus,textarea:focus:invalid:focus{border-color:#e9322d}input[type=checkbox]:focus:invalid:focus,input[type=file]:focus:invalid:focus,input[type=radio]:focus:invalid:focus{outline-color:#e9322d}input[type=checkbox],input[type=radio]{position:relative;top:7px;margin-right:.5em;float:left}select{width:100%;border-radius:0;height:2em;text-indent:.5em;background-color:#fff;background-repeat:no-repeat;background-position:97% 50%;border:1px solid #f0f0f0;outline:none}select:active,select:focus,select:hover{outline:0;border:1px solid #888}select[multiple]{height:auto}fieldset{margin:0;padding:rhythm(.25,15px) 0 rhythm(.75,15px);border:0}legend{display:block;width:100%;padding:rhythm(.5,15px) 0}input+input,input+select,select+input,select+select{margin-top:.5em}button{background:#888;border:1px solid transparent;color:#fff;margin:rhythm(1,15px) 0;padding:rhythm(1,15px)}button:hover{background:#444;color:#fff}button:focus{outline-style:dotted;outline-color:#444;outline-width:1px}button[type=reset]{color:#888;font-size:14px;text-decoration:underline;background:transparent;border:none;padding:rhythm(1,15px)}button[type=reset]:hover{color:#444}table{border-collapse:collapse;border-spacing:0}.container{margin-left:auto;margin-right:auto;min-width:260px}@media (min-width:600px){.container{width:90%}}@media (min-width:900px){.container{max-width:1400px}}.container,.grid-item{padding-left:12px;padding-right:12px;box-sizing:border-box}.container:after,.container:before{content:"";display:table}.container:after{clear:both}.container{padding-left:0;padding-right:0}.l-1up,.l-66-33--1{clear:left;float:left;width:100%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}@media (min-width:600px){.l-66-33--1{float:left;width:66.66667%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}}.l-66-33--2{clear:left;float:left;width:100%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}@media (min-width:600px){.l-66-33--2{clear:none;float:left;width:33.33333%;margin-left:66.66667%;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}}.l-33-66--1{clear:left;float:left;width:100%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}@media (min-width:600px){.l-33-66--1{float:left;width:33.33333%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}}.l-33-66--2{clear:left;float:left;width:100%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}@media (min-width:600px){.l-33-66--2{clear:none;float:left;width:66.66667%;margin-left:33.33333%;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}}.l-2up{float:left;padding-left:12px;padding-right:12px;box-sizing:border-box;width:100%;padding-left:0;padding-right:0;margin-right:0}@media (min-width:900px){.l-2up{margin-right:12px}}@media (min-width:900px){.l-2up,.l-2up:nth-of-type(2n){box-sizing:border-box;width:50%;padding-left:0;padding-right:12px}.l-2up:nth-of-type(2n){margin-right:-12px}}@media (min-width:900px){.l-2up:nth-of-type(2n+1){clear:left}}.l-2up--1{clear:left;float:left;width:100%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}@media (min-width:600px){.l-2up--1{float:left;width:50%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}}.l-2up--2{clear:left;float:left;width:100%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}@media (min-width:600px){.l-2up--2{clear:none;float:left;width:50%;margin-left:50%;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}}.l-3up{float:left;padding-left:12px;padding-right:12px;box-sizing:border-box}@media (min-width:1100px){.l-3up:nth-of-type(3n+1){clear:left}}.l-3up--1{clear:left;float:left;width:100%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}@media (min-width:600px){.l-3up--1{clear:left;float:left;width:33.33333%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}}.l-3up--2{clear:left;float:left;width:100%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}@media (min-width:600px){.l-3up--2{clear:none;float:left;width:33.33333%;margin-left:33.33333%;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}}.l-3up--3{clear:left;float:left;width:100%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}@media (min-width:600px){.l-3up--3{clear:none;float:left;width:33.33333%;margin-left:66.66667%;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}}.l-4up{float:left;padding-left:12px;padding-right:12px;box-sizing:border-box;width:100%;padding-left:0;padding-right:0;margin-right:0}@media (min-width:600px){.l-4up{box-sizing:border-box;width:50%;padding-left:0;padding-right:12px;margin-right:12px}}@media (min-width:1100px){.l-4up{box-sizing:border-box;width:25%;padding-left:0;padding-right:18px;margin-right:6px}}@media (min-width:600px){.l-4up:nth-of-type(2n){box-sizing:border-box;width:50%;padding-left:0;padding-right:12px;margin-right:-12px}}@media (min-width:1100px){.l-4up:nth-of-type(2n){margin-right:6px}}@media (min-width:1100px){.l-4up:nth-of-type(2n),.l-4up:nth-of-type(4n){box-sizing:border-box;width:25%;padding-left:0;padding-right:18px}.l-4up:nth-of-type(4n){margin-right:-18px}}@media (min-width:1100px){.l-4up:nth-of-type(4n+1){clear:left}}.l-4up--1{clear:left;float:left;width:100%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}@media (min-width:600px){.l-4up--1{float:left;width:25%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}}.l-4up--2{clear:left;float:left;width:100%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}@media (min-width:600px){.l-4up--2{clear:none;float:left;width:25%;margin-left:25%;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}}.l-4up--3{clear:left;float:left;width:100%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}@media (min-width:600px){.l-4up--3{clear:none;float:left;width:25%;margin-left:50%;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}}.l-4up--4{clear:left;float:left;width:100%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}@media (min-width:600px){.l-4up--4{clear:none;float:left;width:25%;margin-left:75%;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}}.l-6up--1{clear:left;float:left;width:100%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}@media (min-width:600px){.l-6up--1{float:left;width:16.66667%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}}.l-6up--2{clear:left;float:left;width:100%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}@media (min-width:600px){.l-6up--2{clear:none;float:left;width:16.66667%;margin-left:16.66667%;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}}.l-6up--3{clear:left;float:left;width:100%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}@media (min-width:600px){.l-6up--3{clear:none;float:left;width:16.66667%;margin-left:33.33333%;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}}.l-6up--4{clear:left;float:left;width:100%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}@media (min-width:600px){.l-6up--4{clear:none;float:left;width:16.66667%;margin-left:50%;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}}.l-6up--5{clear:left;float:left;width:100%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}@media (min-width:600px){.l-6up--5{clear:none;float:left;width:16.66667%;margin-left:66.66667%;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}}.l-6up--6{clear:left;float:left;width:100%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}@media (min-width:600px){.l-6up--6{clear:none;float:left;width:16.66667%;margin-left:83.33333%;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}}.l-styleguide-column{clear:left;float:left;width:100%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}@media (min-width:600px){.l-styleguide-column{float:left;width:66.66667%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}}@media (min-width:900px){.l-styleguide-column{float:left;width:58.33333%;margin-left:8.33333%;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}}.l-styleguide-rail{clear:left;float:left;width:100%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}@media (min-width:600px){.l-styleguide-rail{clear:none;float:left;width:33.33333%;margin-left:0;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}}@media (min-width:900px){.l-styleguide-rail{float:left;width:25%;margin-left:8.33333%;margin-right:-100%;padding-left:12px;padding-right:12px;box-sizing:border-box}}.styleguide-copyright{color:#888;padding:rhythm(6,15px) 0;margin-top:rhythm(10,15px);border-top:1px solid #f0f0f0}.styleguide-label{color:#444}.styleguide-section{margin-top:rhythm(6,15px);border-top:1px solid #f0f0f0;padding-top:rhythm(3,15px)}.styleguide-list{padding:0 0 0 rhythm(2,15px)}.styleguide-list h4{font-weight:400}.styleguide-component{background-color:#fff;padding:rhythm(2,15px) 0}.component-header{background-color:#f0f0f0;margin:rhythm(4,15px) 0;padding:rhythm(4,15px) 0}.color-title{border-bottom:1px solid #f0f0f0;padding-bottom:rhythm(1,15px);margin:rhythm(2,15px) 0}.color-block{width:100%;height:50px;margin-top:rhythm(1,15px)}.color-label{color:#888}.styleguide-swatch{width:50%;padding:25px} \ No newline at end of file +h1,h2,h3{letter-spacing:-.0125em}h5,h6{letter-spacing:.1em}h1,h2,h3{font-weight:700}h5,h6{text-transform:uppercase}.clearfix:after,.container:after,.nest-wrap:after{content:"";display:table;clear:both}.element-focusable,.element-invisible{position:absolute!important;height:1px;width:1px;overflow:hidden;clip:rect(1px 1px 1px 1px);clip:rect(1px,1px,1px,1px)}.element-focusable:active,.element-focusable:focus{position:static!important;clip:auto;height:auto;width:auto;overflow:auto} +/*! normalize-scss | MIT/GPLv2 License | bit.ly/normalize-scss */*,:after,:before{box-sizing:border-box}html{background:#fff;color:#444;font-size:100%;line-height:1.5em;font-family:Helvetica,Arial,Nimbus Sans L,sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}@media (min-width:900px){html{font-size:112%}}@media (min-width:1100px){html{font-size:124%}}body{margin:0}article,aside,details,figcaption,figure,footer,header,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block}audio:not([controls]){display:none;height:0}progress{vertical-align:baseline}[hidden],template{display:none}a{-webkit-transition:all .3s ease;transition:all .3s ease;background-color:transparent;-webkit-text-decoration-skip:objects;color:#888;text-decoration:none}a:active,a:hover{outline-width:0;color:#444;text-decoration:underline}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:inherit;font-weight:bolder}code,kbd,pre,samp{font-family:monospace;font-size:1em}dfn{font-style:italic}h1{font-size:1.95em;line-height:1.53846em;margin-top:.96154em;margin-bottom:.38462em}h2{font-size:1.56em;line-height:1.44231em;margin-top:1.20192em;margin-bottom:.48077em}h3{font-size:1.25em;line-height:1.5em;margin-top:1.2em;margin-bottom:.6em}h4{font-size:1em;line-height:1.875em;margin-top:1.5em;margin-bottom:.75em}h5,h6{font-size:.8em;line-height:1.875em;margin-top:1.40625em;margin-bottom:.46875em}h6{font-weight:400}mark{background-color:#ff0;color:#222}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}img{border-style:none}svg:not(:root){overflow:hidden}blockquote{margin:1.5em}dl,menu,ol,ul{margin:1.5em 0}ol ol,ol ul,ul ol,ul ul{margin:0}dd{margin:0 0 0 1em}menu,ol,ul{padding:0 0 0 1em}figure{margin:1.5em}hr{box-sizing:content-box;height:0;overflow:visible}p,pre{margin:0 0 1.5em}button,input,optgroup,select,textarea{font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:1px dotted ButtonText}input{overflow:visible}[type=checkbox],[type=radio]{box-sizing:border-box;padding:0}[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-input-placeholder{color:inherit;opacity:.54}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}fieldset{border:1px solid hsla(0,0%,100%,.6);margin:0 2px;padding:.35em .625em .75em}legend{box-sizing:border-box;display:table;max-width:100%;white-space:normal;color:inherit;padding:0}optgroup{font-weight:700}textarea{overflow:auto}.container{width:100%;min-width:260px;padding:0 1.5em;margin:0 auto}@media (min-width:900px){.container{width:90%;padding:0}}@media (min-width:1100px){.container{max-width:1400px}}.l-1up,.l-66-33--1{-sgs-span-settings:("span":12,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:100%;float:right;margin-left:0;margin-right:0;clear:both}@media (min-width:600px){.l-66-33--1{-sgs-span-settings:("span":8,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":false,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:65.71429%;float:left;margin-right:-100%;margin-left:0;clear:both}}.l-66-33--2{-sgs-span-settings:("span":12,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:100%;float:right;margin-left:0;margin-right:0;clear:both}@media (min-width:600px){.l-66-33--2{-sgs-span-settings:("span":4,"location":9,"grid":12,"gutter":.5,"style":"opposite","start row":false,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":none));width:31.42857%;float:right;margin-left:0;margin-right:0;clear:none}}.l-33-66--1{-sgs-span-settings:("span":12,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:100%;float:right;margin-left:0;margin-right:0;clear:both}@media (min-width:600px){.l-33-66--1{-sgs-span-settings:("span":4,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":false,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:31.42857%;float:left;margin-right:-100%;margin-left:0;clear:both}}.l-33-66--2{-sgs-span-settings:("span":12,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:100%;float:right;margin-left:0;margin-right:0;clear:both}@media (min-width:600px){.l-33-66--2{-sgs-span-settings:("span":8,"location":5,"grid":12,"gutter":.5,"style":"opposite","start row":false,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":none));width:65.71429%;float:right;margin-left:0;margin-right:0;clear:none}}.l-2up{-sgs-span-settings:("span":12,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:100%;float:right;margin-left:0;margin-right:0;clear:both}@media (min-width:600px){.l-2up{clear:right}}@media (min-width:600px){.l-2up,.l-2up:nth-of-type(2n+1){-sgs-span-settings:("span":6,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":false,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":(null:null));width:48.57143%;float:left;margin-left:0;margin-right:2.85714%}.l-2up:nth-of-type(2n+1){clear:right;clear:both}}@media (min-width:600px){.l-2up:nth-of-type(2n){-sgs-span-settings:("span":6,"location":7,"grid":12,"gutter":.5,"style":"opposite","start row":false,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":(null:null));width:48.57143%;clear:right;float:right;margin-right:0}}.l-2up--1{-sgs-span-settings:("span":12,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:100%;float:right;margin-left:0;margin-right:0;clear:both}@media (min-width:600px){.l-2up--1{-sgs-span-settings:("span":6,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":false,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:48.57143%;float:left;margin-right:-100%;margin-left:0;clear:both}}.l-2up--2{-sgs-span-settings:("span":12,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:100%;float:right;margin-left:0;margin-right:0;clear:both}@media (min-width:600px){.l-2up--2{-sgs-span-settings:("span":6,"location":7,"grid":12,"gutter":.5,"style":"opposite","start row":false,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":none));width:48.57143%;float:right;margin-left:0;margin-right:0;clear:none}}.l-3up{-sgs-span-settings:("span":12,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:100%;float:right;margin-left:0;margin-right:0;clear:both}@media (min-width:600px){.l-3up{clear:right}}@media (min-width:600px){.l-3up,.l-3up:nth-of-type(3n+1){-sgs-span-settings:("span":4,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":false,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":(null:null));width:31.42857%;float:left;margin-left:0;margin-right:2.85714%}.l-3up:nth-of-type(3n+1){clear:right;clear:both}}@media (min-width:600px){.l-3up:nth-of-type(3n){-sgs-span-settings:("span":4,"location":9,"grid":12,"gutter":.5,"style":"opposite","start row":false,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":(null:null));width:31.42857%;clear:right;float:right;margin-right:0}}.l-3up--1{-sgs-span-settings:("span":12,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:100%;float:right;margin-left:0;margin-right:0;clear:both}@media (min-width:600px){.l-3up--1{-sgs-span-settings:("span":4,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":false,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:31.42857%;float:left;margin-right:-100%;margin-left:0;clear:both}}.l-3up--2{-sgs-span-settings:("span":12,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:100%;float:right;margin-left:0;margin-right:0;clear:both}@media (min-width:600px){.l-3up--2{-sgs-span-settings:("span":4,"location":5,"grid":12,"gutter":.5,"style":"opposite","start row":false,"end row":false,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":none));width:31.42857%;float:left;margin-right:-100%;margin-left:34.28571%;clear:none}}.l-3up--3{-sgs-span-settings:("span":12,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:100%;float:right;margin-left:0;margin-right:0;clear:both}@media (min-width:600px){.l-3up--3{-sgs-span-settings:("span":4,"location":9,"grid":12,"gutter":.5,"style":"opposite","start row":false,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":none));width:31.42857%;float:right;margin-left:0;margin-right:0;clear:none}}.l-4up{-sgs-span-settings:("span":12,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:100%;float:right;margin-left:0;margin-right:0;clear:both}@media (min-width:600px){.l-4up{clear:right}}@media (min-width:600px){.l-4up,.l-4up:nth-of-type(4n+1){-sgs-span-settings:("span":3,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":false,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":(null:null));width:22.85714%;float:left;margin-left:0;margin-right:2.85714%}.l-4up:nth-of-type(4n+1){clear:right;clear:both}}@media (min-width:600px){.l-4up:nth-of-type(4n){-sgs-span-settings:("span":3,"location":10,"grid":12,"gutter":.5,"style":"opposite","start row":false,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":(null:null));width:22.85714%;clear:right;float:right;margin-right:0}}.l-4up--1{-sgs-span-settings:("span":12,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:100%;float:right;margin-left:0;margin-right:0;clear:both}@media (min-width:600px){.l-4up--1{-sgs-span-settings:("span":3,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":false,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:22.85714%;float:left;margin-right:-100%;margin-left:0;clear:both}}.l-4up--2{-sgs-span-settings:("span":12,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:100%;float:right;margin-left:0;margin-right:0;clear:both}@media (min-width:600px){.l-4up--2{-sgs-span-settings:("span":3,"location":4,"grid":12,"gutter":.5,"style":"opposite","start row":false,"end row":false,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":none));width:22.85714%;float:left;margin-right:-100%;margin-left:25.71429%;clear:none}}.l-4up--3{-sgs-span-settings:("span":12,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:100%;float:right;margin-left:0;margin-right:0;clear:both}@media (min-width:600px){.l-4up--3{-sgs-span-settings:("span":3,"location":7,"grid":12,"gutter":.5,"style":"opposite","start row":false,"end row":false,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":none));width:22.85714%;float:left;margin-right:-100%;margin-left:51.42857%;clear:none}}.l-4up--4{-sgs-span-settings:("span":12,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:100%;float:right;margin-left:0;margin-right:0;clear:both}@media (min-width:600px){.l-4up--4{-sgs-span-settings:("span":3,"location":10,"grid":12,"gutter":.5,"style":"opposite","start row":false,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":none));width:22.85714%;float:right;margin-left:0;margin-right:0;clear:none}}.l-6up{-sgs-span-settings:("span":12,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:100%;float:right;margin-left:0;margin-right:0;clear:both}@media (min-width:600px){.l-6up{clear:right}}@media (min-width:600px){.l-6up,.l-6up:nth-of-type(6n+1){-sgs-span-settings:("span":2,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":false,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":(null:null));width:14.28571%;float:left;margin-left:0;margin-right:2.85714%}.l-6up:nth-of-type(6n+1){clear:right;clear:both}}@media (min-width:600px){.l-6up:nth-of-type(6n){-sgs-span-settings:("span":2,"location":11,"grid":12,"gutter":.5,"style":"opposite","start row":false,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":(null:null));width:14.28571%;clear:right;float:right;margin-right:0}}.l-6up--1{-sgs-span-settings:("span":12,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:100%;float:right;margin-left:0;margin-right:0;clear:both}@media (min-width:600px){.l-6up--1{-sgs-span-settings:("span":2,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":false,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:14.28571%;float:left;margin-right:-100%;margin-left:0;clear:both}}.l-6up--2{-sgs-span-settings:("span":12,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:100%;float:right;margin-left:0;margin-right:0;clear:both}@media (min-width:600px){.l-6up--2{-sgs-span-settings:("span":2,"location":3,"grid":12,"gutter":.5,"style":"opposite","start row":false,"end row":false,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":none));width:14.28571%;float:left;margin-right:-100%;margin-left:17.14286%;clear:none}}.l-6up--3{-sgs-span-settings:("span":12,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:100%;float:right;margin-left:0;margin-right:0;clear:both}@media (min-width:600px){.l-6up--3{-sgs-span-settings:("span":2,"location":5,"grid":12,"gutter":.5,"style":"opposite","start row":false,"end row":false,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":none));width:14.28571%;float:left;margin-right:-100%;margin-left:34.28571%;clear:none}}.l-6up--4{-sgs-span-settings:("span":12,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:100%;float:right;margin-left:0;margin-right:0;clear:both}@media (min-width:600px){.l-6up--4{-sgs-span-settings:("span":2,"location":7,"grid":12,"gutter":.5,"style":"opposite","start row":false,"end row":false,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":none));width:14.28571%;float:left;margin-right:-100%;margin-left:51.42857%;clear:none}}.l-6up--5{-sgs-span-settings:("span":12,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:100%;float:right;margin-left:0;margin-right:0;clear:both}@media (min-width:600px){.l-6up--5{-sgs-span-settings:("span":2,"location":9,"grid":12,"gutter":.5,"style":"opposite","start row":false,"end row":false,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":none));width:14.28571%;float:left;margin-right:-100%;margin-left:68.57143%;clear:none}}.l-6up--6{-sgs-span-settings:("span":12,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:100%;float:right;margin-left:0;margin-right:0;clear:both}@media (min-width:600px){.l-6up--6{-sgs-span-settings:("span":2,"location":11,"grid":12,"gutter":.5,"style":"opposite","start row":false,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":none));width:14.28571%;float:right;margin-left:0;margin-right:0;clear:none}}.l-styleguide-column{-sgs-span-settings:("span":12,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:100%;float:right;margin-left:0;margin-right:0;clear:both}@media (min-width:600px){.l-styleguide-column{-sgs-span-settings:("span":8,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":false,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":none));width:65.71429%;float:left;margin-right:-100%;margin-left:0;clear:none}}@media (min-width:900px){.l-styleguide-column{-sgs-span-settings:("span":7,"location":2,"grid":12,"gutter":.5,"style":"opposite","start row":false,"end row":false,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":none));width:57.14286%;float:left;margin-right:-100%;margin-left:8.57143%;clear:none}}.l-styleguide-rail{-sgs-span-settings:("span":12,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:100%;float:right;margin-left:0;margin-right:0;clear:both}@media (min-width:600px){.l-styleguide-rail{-sgs-span-settings:("span":4,"location":1,"grid":12,"gutter":.5,"style":"opposite","start row":true,"end row":false,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":none));width:31.42857%;float:left;margin-right:-100%;margin-left:0;clear:none}}@media (min-width:900px){.l-styleguide-rail{-sgs-span-settings:("span":3,"location":2,"grid":12,"gutter":.5,"style":"opposite","start row":false,"end row":false,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":none));width:22.85714%;float:left;margin-right:-100%;margin-left:8.57143%;clear:none}}.styleguide-copyright{font-size:.8em;line-height:2.8125em;color:#888;padding:3em 0;margin-top:3em;border-top:1px solid #f0f0f0}.styleguide-label{color:#444}.styleguide-section{margin-top:4.5em;border-top:1px solid #f0f0f0;padding-top:3em}.styleguide-list h4{margin-top:0;margin-bottom:.375em;font-weight:400}.styleguide-component{background-color:#fff;padding:3em 0}.component-header{background-color:#f0f0f0;margin:1.5em 0;padding:1.5em 0}.color-title{border-bottom:1px solid #f0f0f0;padding-bottom:1.5em;margin:3em 0}.color-block{width:100%;height:50px;margin-top:1.5em}.color-label{color:#888}.styleguide-swatch{width:50%;padding:25px}.styleguide-body{margin-bottom:3em}.demo{padding:1.5em}.demo,.nest-wrap{background-color:#f0f0f0}.nest-wrap{padding:0}.nest-item{-sgs-span-settings:("span":8,"location":1,"grid":8,"gutter":.5,"style":"opposite","start row":true,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":("clear":both));width:100%;float:right;margin-left:0;margin-right:0;clear:both;background-color:#e6e6e6;padding:1.5em}@media (min-width:600px){.nest-item{-sgs-span-settings:("span":2,"location":1,"grid":8,"gutter":.5,"style":"opposite","start row":true,"end row":false,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":(null:null));width:21.73913%;clear:right;float:left;margin-left:0;margin-right:4.34783%;margin-bottom:0}.nest-item:last-child{-sgs-span-settings:("span":4,"location":5,"grid":8,"gutter":.5,"style":"opposite","start row":false,"end row":true,"fixed gutter":false,"split gutter":null,"gutter property":"margin","options":(null:null));width:47.82609%;clear:right;float:right;margin-right:0}}.Best-Class-Ever{background:red} \ No newline at end of file diff --git a/STYLEGUIDE_TEMPLATE/source/code/sass/_init.scss b/STYLEGUIDE_TEMPLATE/source/code/sass/_init.scss index 60156b7..066936d 100644 --- a/STYLEGUIDE_TEMPLATE/source/code/sass/_init.scss +++ b/STYLEGUIDE_TEMPLATE/source/code/sass/_init.scss @@ -16,28 +16,11 @@ // Variables // ============================================================================= -// -// Legacy IE support -// -// These variables are used by many mixins to add additional CSS to support -// specific versions of IE or specific vendor prefixes. -// -// IE6-7 don't support box-sizing: border-box. We can fix this in 1 of 3 ways: -// - Drop support for IE 6/7. :-) Set $legacy-support-for-ie6 -// and $legacy-support-for-ie7 to false. -// - (Preferred) Install the box-sizing polyfill and set the variable below to -// the absolute path URL to the boxsizing.htc file. -// @see https://github.com/Schepp/box-sizing-polyfill -// $box-sizing-polyfill-path: "/path/to/boxsizing.htc"; -// - Use the same CSS unit for grid and gutter width in resonsive-sidebars.scss -// (use px for both or use % for both) and set the box-sizing variable to content-box. -// -// Zen does not require special handling for IE8 or later. But Compass uses that -// variable for a couple edge cases. We include it for completeness sake. See -// the documentation at http://compass-style.org/reference/compass/support/ -$legacy-support-for-ie6: false; -$legacy-support-for-ie7: false; -$legacy-support-for-ie8: true; +// Support the same browsers as normalize.css v3. +$support-for: ( + ie: 9, + '*': -4, +); // @@ -49,8 +32,8 @@ $legacy-support-for-ie8: true; // use in the normalize.scss file. // @see http://compass-style.org/reference/compass/typography/vertical_rhythm/ -$base-font-size: 15px; // The font size set on the root html element. -$base-line-height: 18px; // This line-height determines the basic unit of vertical rhythm. +$base-font-size: 16px; // The font size set on the root html element. +$base-line-height: 24px; // This line-height determines the basic unit of vertical rhythm. // Modular Scale // Major Third: 16px @ 1:1.25 @@ -106,6 +89,7 @@ $off-white: #fbfbfb; $white: #ffffff; $white-60: rgba($white, .6); $white-30: rgba($white, .3); +$yellow: #ff0; // Use above sass variables to define defaults in normalize.scss /* body */ @@ -162,24 +146,15 @@ $bp3: 1100px; $slug: rhythm(8); // The amount lists, blockquotes and comments are indented. -$indent-amount: rhythm(1); - -// Hover state effects -$timing: .5s; -$easing: ease-out; - - +$indent-amount: 1em; // ============================================================================= // Partials to be shared with all .scss files. // ============================================================================= -// Add the Zen Grids responsive layout mixins. -@import "../../../../node_modules/butler/node_modules/zen-grids/sass/zen-grids"; -@import "../../../../node_modules/butler/node_modules/zen-grids/sass/zen-grids/functions"; -@import "../../../../node_modules/butler/node_modules/zen-grids/sass/zen-grids/background"; -@import "../../../../node_modules/butler/node_modules/zen-grids/sass/zen-grids/flow"; +// Add the Singularity Grids responsive layout mixins. +@import "../../../../node_modules/butler/node_modules/singularitygs/stylesheets/singularitygs"; // Add the Breakpoint mixin. @import "../../../../node_modules/butler/node_modules/breakpoint-sass/stylesheets/breakpoint"; diff --git a/STYLEGUIDE_TEMPLATE/source/code/sass/_mixins.scss b/STYLEGUIDE_TEMPLATE/source/code/sass/_mixins.scss index 07cdbd9..41cf067 100644 --- a/STYLEGUIDE_TEMPLATE/source/code/sass/_mixins.scss +++ b/STYLEGUIDE_TEMPLATE/source/code/sass/_mixins.scss @@ -48,6 +48,7 @@ * can otherwise occur with extends. */ +.clearfix, %clearfix { &:after { content: ""; @@ -72,7 +73,7 @@ height: 1px; width: 1px; overflow: hidden; - @if $legacy-support-for-ie6 or $legacy-support-for-ie7 { + @if support-legacy-browser(ie, '7') { clip: rect(1px 1px 1px 1px); // IE6 and IE7 use the wrong syntax. } clip: rect(1px, 1px, 1px, 1px); @@ -98,44 +99,9 @@ } /* ============================================================== - Custom Vertical Rhythm Mixin - - This mixin uses the new font size to determine font size and - line height based on the ratio determined from the base font - size. The line height mixin is optional, but available to allow - for minor adjustments. - - 1.12 and 1.24 is based on the percentages applied to the base html - in the normalize file. - ============================================================== */ - -@mixin adjust-font-size-to($to-size, $line-height:1) { - font-size: $to-size; - line-height: (($to-size * $base-line-height)/$base-font-size) * $line-height; - - @include breakpoint($bp2) { - font-size: $to-size * 1.12; - line-height: ((($to-size * $base-line-height)/$base-font-size) * $line-height) * 1.12; - } - - @include breakpoint($bp3) { - font-size: $to-size * 1.24; - line-height: ((($to-size * $base-line-height)/$base-font-size) * $line-height) * 1.24; - } -} - -/* ============================================================== - Vertical Rhythm Mixin - - This mixin adds margin to the top or bottom of an element based - on the base font size (or an included font size adjustment), and - the base line height. + CSS3 transition mixin ============================================================== */ -@mixin leader($leader, $font-size:$base-font-size) { - margin-top: (($font-size)/$base-font-size) * ($leader * $base-line-height); -} - -@mixin trailer($trailer, $font-size:$base-font-size) { - margin-bottom: (($font-size)/$base-font-size) * ($trailer * $base-line-height); +@mixin trans($property: all, $timing: .3s, $easing: ease) { + transition: $property $timing $easing; } diff --git a/STYLEGUIDE_TEMPLATE/source/code/sass/_normalize.scss b/STYLEGUIDE_TEMPLATE/source/code/sass/_normalize.scss index 3447122..d2b5112 100644 --- a/STYLEGUIDE_TEMPLATE/source/code/sass/_normalize.scss +++ b/STYLEGUIDE_TEMPLATE/source/code/sass/_normalize.scss @@ -1,23 +1,58 @@ +/*! normalize-scss | MIT/GPLv2 License | bit.ly/normalize-scss */ + +/** + * 1. Change the default font family in all browsers (opinionated). + * 2. Prevent adjustments of font size after orientation changes in IE and iOS. + */ + + *, + *:before, + *:after { + box-sizing: border-box; + } + +html { + // Correct text resizing oddly in IE 6/7 when body `font-size` is set using + // `em` units. + background: $background-color; + color: $text-color; + font-size: ($base-font-size / 16px) * 100%; + line-height: ($base-line-height / $base-font-size) * 1em; + font-family: $base-font-family; /* 1 */ + -ms-text-size-adjust: 100%; /* 2 */ + -webkit-text-size-adjust: 100%; /* 2 */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + + // Adjust font-size globally per breakpoint. + // As you adjust the percentage growth of font-size, translate + // to the value to the mixin adjust-font-size-to in the mixins + // file as a point value to maintain font-size across breakpoints. + @include breakpoint($bp2) { + font-size: ($base-font-size / 16px) * 112%; + } + @include breakpoint($bp3) { + font-size: ($base-font-size / 16px) * 124%; + } +} + /** - * @file - * Normalize.css is intended to be used as an alternative to CSS resets. - * - * This file is a slight fork of these original sources: - * - normalize.css v2.1.2 | MIT License | git.io/normalize - * - normalize.scss v2.1.2 | MIT/GPLv2 License | bit.ly/normalize-with-compass - * - * It's suggested that you read the normalize.scss file and customise it to meet - * your needs, rather then including the file in your project and overriding the - * defaults later in your CSS. - * @see http://nicolasgallagher.com/about-normalize-css/ - * - * Also: @see http://meiert.com/en/blog/20080419/reset-style-sheets-are-bad/ - * @see http://snook.ca/archives/html_and_css/no_css_reset/ - */ - -// HTML5 display definitions - -// Correct `block` display not defined in IE 8/9. + * Remove the margin in all browsers (opinionated). + */ + +body { + margin: 0; +} + +/* HTML5 display definitions + ========================================================================== */ + +/** + * Add the correct display in IE <10. + * Add the correct display in Edge, IE, and Firefox for `details` or `summary`. + * Add the correct display in IE for `main`. + */ + article, aside, details, @@ -26,175 +61,148 @@ figure, footer, header, main, +menu, nav, section, summary { display: block; } -// Correct `inline-block` display not defined in IE 8/9. +/** + * Add the correct display in IE <10. + */ + audio, canvas, +progress, video { display: inline-block; - - @if $legacy-support-for-ie6 or $legacy-support-for-ie7 { + @if support-for(ie, 7) { *display: inline; *zoom: 1; } } -// Prevent modern browsers from displaying `audio` without controls. -// Remove excess height in iOS 5 devices. +/** + * Add the correct display and remove excess height in iOS 4-7. + */ + audio:not([controls]) { display: none; height: 0; } -// Address styling not present in IE 8/9. -[hidden] { - display: none; -} - -// Base -// -// Instead of relying on the fonts that are available on a user's computer, you -// can use web fonts which, like images, are resources downloaded to the user's -// browser. Because of the bandwidth and rendering resources required, web fonts -// should be used with care. -// -// Numerous resources for web fonts can be found on Google. Here are a few -// websites where you can find Open Source fonts to download: -// - http://www.fontsquirrel.com/fontface -// - http://www.theleagueofmoveabletype.com -// -// In order to use these fonts, you will need to convert them into formats -// suitable for web fonts. We recommend the free-to-use Font Squirrel's -// Font-Face Generator: -// http://www.fontsquirrel.com/fontface/generator -// -// The following is an example @font-face declaration. This font can then be -// used in any ruleset using a property like this: font-family: Example, serif; -// -// Since we're using Sass, you'll need to declare your font faces here, then you -// can add them to the font variables in the _base.scss partial. - - -// 1. Set default font family to sans-serif. -// 2. Prevent iOS text size adjust after orientation change, without disabling -// user zoom. -// 3. Correct text resizing oddly in IE 6/7 when body `font-size` is set using -// `em` units. -// 4. Makes it pretty — banishes chunky type. - -/* stylelint-disable */ -html { - // Establish a vertical rhythm unit using $base-line-height. - background: $background-color; - color: $text-color; - text-rendering: optimizeLegibility; - font-family: $base-font-family; - font-size: 100% * ($base-font-size / 16px); - font-weight: 400; - line-height: ($base-line-height * 1.8); - -webkit-font-smoothing: antialiased; - -ms-text-size-adjust: 100%; - -webkit-text-size-adjust: 100%; - // prevent the drawer navigation from appearing and being able to be scrolled over to - overflow-x: hidden; +/** + * Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ - // Adjust font-size globally per breakpoint. - // As you adjust the percentage growth of font-size, translate - // to the value to the mixin adjust-font-size-to in the mixins - // file as a point value to maintain font-size across breakpoints. - @include breakpoint($bp2) { - font-size: ($base-font-size / 16px) * 112%; - line-height: ($base-line-height * 1.2); - } - @include breakpoint($bp3) { - font-size: ($base-font-size / 16px) * 124%; - line-height: ($base-line-height * 1.4); - } +progress { + vertical-align: baseline; } -@if $legacy-support-for-ie6 or $legacy-support-for-ie7 { - // Address `font-family` inconsistency between `textarea` and other form elements. - button, - input, - select, - textarea { - font-family: $base-font-family; - } -} +/** + * Add the correct display in IE <11, Safari <8, and Firefox <22. + * 1. Add the correct display in IE. + */ -// Remove default margin. -body { - margin: 0; - padding: 0; - // prevent the drawer navigation from appearing and being able to be scrolled over to. - overflow-x: hidden; +template, /* 1 */ +[hidden] { + display: none; } +/* Links + ========================================================================== */ -// Links - -// The order of link states are based on Eric Meyer's article: -// http://meyerweb.com/eric/thoughts/2007/06/11/who-ordered-the-link-states +/** + * 1. Remove the gray background on active links in IE 10. + * 2. Remove gaps in links underline in iOS 8+ and Safari 8+. + */ -a:link, -a:visited { +a { + @include trans(); + background-color: transparent; /* 1 */ + -webkit-text-decoration-skip: objects; /* 2 */ color: $link-color; text-decoration: none; } -a:hover, -a:focus, -a:active { +/** + * Remove the outline on focused links when they are also active or hovered + * in all browsers (opinionated). + */ + +a:active, +a:hover { + outline-width: 0; color: $link-hover; text-decoration: underline; } -// Address `outline` inconsistency between Chrome and other browsers. -a:focus { - outline: thin dotted; -} +/* Text-level semantics + ========================================================================== */ -// Improve readability when focused and also mouse hovered in all browsers. -a:active, -a:hover { - outline: 0; -} +/** + * 1. Remove the bottom border in Firefox <40. + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ +abbr[title] { + border-bottom: none; /* 1 */ + text-decoration: underline; /* 2 */ + text-decoration: underline dotted; /* 2 */ +} -// Typography +/** + * Prevent the duplicate application of `bolder` by the next rule in Safari 6. + */ -// To achieve a pleasant vertical rhythm, we use Compass' Vertical Rhythm mixins -// so that the line height of our base font becomes the basic unit of vertical -// measurement. We use multiples of that unit to set the top and bottom margins -// for our block level elements and to set the line heights of any fonts. -// For more information, see http://24ways.org/2006/compose-to-a-vertical-rhythm +b, +strong { + font-weight: inherit; +} +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ -// Set 1 unit of vertical rhythm on the top and bottom margin. -p, -pre, { - margin: 0 0 $indent-amount; +b, +strong { + font-weight: bolder; } -blockquote { - // Also indent the quote on both sides. - margin: $indent-amount; - color: $blockquote-color; +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +%monospace, +code, +kbd, +samp { + font-family: monospace, monospace; /* 1 */ + @if support-for(ie, 6) { + _font-family: 'courier new', monospace; + } + font-size: 1em; /* 2 */ } +/** + * Add the correct font style in Android <4.4. + */ -// Address variable `h1` font-size and margin within `section` and `article` -// contexts in Firefox 4+, Safari 5, and Chrome. +dfn { + font-style: italic; +} + +/** + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. + */ h1 { @extend %display-type; // Set the font-size and line-height while keeping a proper vertical rhythm. - @include adjust-font-size-to($h1-font-size, 1); + @include adjust-font-size-to($h1-font-size, 2); // Set 1 unit of vertical rhythm on the top and bottom margins. @include leader(1.25, $h1-font-size); @include trailer(.5, $h1-font-size); @@ -202,20 +210,20 @@ h1 { h2 { @extend %display-type; - @include adjust-font-size-to($h2-font-size, 1); + @include adjust-font-size-to($h2-font-size, 1.5); @include leader(1.25, $h2-font-size); @include trailer(.5, $h2-font-size); } h3 { @extend %display-type; - @include adjust-font-size-to($h3-font-size, 1); + @include adjust-font-size-to($h3-font-size, 1.25); @include leader(1, $h3-font-size); @include trailer(.5, $h3-font-size); } h4 { - @include adjust-font-size-to($h4-font-size, 1); + @include adjust-font-size-to($h4-font-size, 1.25); @include leader(1, $h4-font-size); @include trailer(.5, $h4-font-size); } @@ -235,127 +243,127 @@ h6 { font-weight: 400; } -// Address styling not present in IE 8/9, Safari 5, and Chrome. -abbr[title] { - border-bottom: 1px dotted; -} - -// Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome. -b, -strong { - font-weight: 800; -} - -// Address styling not present in Safari 5 and Chrome. -dfn { - font-style: italic; -} -// Address differences between Firefox and other browsers. -hr { - box-sizing: content-box; - height: 0; - margin: 1em 0; - padding-bottom: -1px; - border: 1px solid #dddddd; -} +/** + * Add the correct background and color in IE <10. + */ -// Address styling not present in IE 8/9. mark { - background: #ffff00; - color: #000000; -} - -// Correct font family set oddly in Safari 5 and Chrome. -code, -kbd, -pre, -samp, -tt, -var { - font-size: $base-font-size; - // The value of $font-monospace ends with ", serif". - font-family: $font-monospace; - - @if $legacy-support-for-ie6 { - _font-family: "courier new", monospace; - } -} - -// Improve readability of pre-formatted text in all browsers. -pre { - - @if $legacy-support-for-ie6 or $legacy-support-for-ie7 { - white-space: pre; - word-wrap: break-word; - } @else { - white-space: pre-wrap; - } + background-color: $yellow; + color: $black; } -// Set consistent quote types. -q { - quotes: "\201C" "\201D" "\2018" "\2019"; -} +/** + * Add the correct font size in all browsers. + */ -// Address inconsistent and variable font size in all browsers. small { font-size: 80%; } -// Prevent `sub` and `sup` affecting `line-height` in all browsers. +/** + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. + */ + sub, sup { + font-size: 75%; + line-height: 0; position: relative; vertical-align: baseline; - line-height: 0; - font-size: 75%; +} + +sub { + bottom: -0.25em; } sup { - top: -.5em; + top: -0.5em; } -sub { - bottom: -.25em; +/* Embedded content + ========================================================================== */ + +/** + * Remove the border on images inside links in IE <11. + */ + +img { + // Responsive images + max-width: 100%; + // Remove border when inside `a` element in IE 8/9. + border: 0; + @if support-for(ie, 7) { + /* Improve image quality when scaled in IE 7. */ + -ms-interpolation-mode: bicubic; + } +} + +/** + * Hide the overflow in IE. + */ + +svg:not(:root) { + overflow: hidden; } +/* Grouping content + ========================================================================== */ -// Lists + +/** + * Set 1 unit of vertical rhythm on the top and bottom margin. + */ + +blockquote { + margin: rhythm(1); +} + +/** + * Address margins set differently in IE 6/7. + */ dl, menu, ol, ul { - // Address margins set differently in IE 6/7. - margin: 0 0 $indent-amount; + margin: rhythm(1) 0; } +/** + * Turn off margins on nested lists. + */ + ol, ul { - ol, ul { - // Turn off margins on nested lists. - margin: 0 0 $indent-amount; + margin: 0; } } + dd { - // LTR margin: 0 0 0 $indent-amount; } -// Address paddings set differently in IE 6/7. +/** + * Address paddings set differently in IE 6/7. + */ + menu, ol, ul { - // LTR padding: 0 0 0 $indent-amount; } -@if $legacy-support-for-ie7 { - // Correct list images handled incorrectly in IE 7. + +@if support-for(ie, 7) { + /** + * Correct list images handled incorrectly in IE 7. + */ + nav ul, nav ol { list-style: none; @@ -363,502 +371,264 @@ ul { } } +/** + * Add the correct margin in IE 8. + */ -// Embedded content and figures - -// @todo Look into adding responsive embedded video. - -img { - // Responsive images - max-width: 100%; - // Remove border when inside `a` element in IE 8/9. - border: 0; - // Suppress the space beneath the baseline - vertical-align: bottom; - - @if $legacy-support-for-ie7 { - // Improve image quality when scaled in IE 7. - -ms-interpolation-mode: bicubic; - } - - @if $legacy-support-for-ie8 { - // Correct IE 8 not scaling image height when resized. - width: auto; - } -} - -figcaption { - margin-top: .5em; - color: $figcaption-color; - font-style: italic; +figure { + margin: rhythm(1); } -// Responsive video styles for youtube and vimeo. -// Requires a "video-wrapper" class on the -// tag containing the iframe embed code. - -.video-wrapper { - position: relative; - height: 0; - margin: 1em 0; - // 16:9 ratio - padding-bottom: 56.25%; -} +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ -.video-wrapper iframe { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; +hr { + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ } +/** + * Set 1 unit of vertical rhythm on the top and bottom margin. + */ -// Correct overflow displayed oddly in IE 9. - -svg:not(:root) { - overflow: hidden; +p, +pre { + margin: 0 0 rhythm(1); } -// Address margin not present in IE 8/9 and Safari 5. -figure { - margin: 1em 0; + +pre { + @extend %monospace; } +/* Forms + ========================================================================== */ -// Forms +/** + * Known issues: + * - By default, Chrome on OS X and Safari on OS X allow very limited styling of + * select, unless a border property is set. The default font weight on + * optgroup elements cannot safely be changed in Chrome on OSX and Safari on + * OS X. + * - It is recommended that you do not style checkbox and radio inputs as + * Firefox's implementation does not respect box-sizing, padding, or width. + * - Certain font size values applied to number inputs cause the cursor style of + * the decrement button to change from default to text. + * - The search input is not fully stylable by default. In Chrome and Safari on + * OSX/iOS you can't control font, padding, border, or background. In Chrome + * and Safari on Windows you can't control border properly. It will apply + * border-width but will only show a border color (which cannot be controlled) + * for the outer 1px of that border. Applying -webkit-appearance: textfield + * addresses these issues without removing the benefits of search inputs (e.g. + * showing past searches). Safari (but not Chrome) will clip the cancel button + * on when it has padding (and textfield appearance). + */ +@if support-for(ie, 7) { + /** + * Correct margin displayed oddly in IE 6/7. + */ -@if $legacy-support-for-ie6 or $legacy-support-for-ie7 { - // Correct margin displayed oddly in IE 6/7. form { margin: 0; } } -// Define consistent border, margin, and padding. -fieldset { - margin: 0 2px; - // Apply borders and padding that keep the vertical rhythm. - border-color: #c0c0c0; -} - - -// 1. Correct `color` not being inherited in IE 8/9. -// 2. Remove padding so people aren't caught out if they zero out fieldsets. -// 3. Correct alignment displayed oddly in IE 6/7. - -legend { - // 2 - padding: 0; - // 1 - border: 0; - - @if $legacy-support-for-ie6 or $legacy-support-for-ie7 { - // 3 LTR - *margin-left: -7px; - } -} - - -// 1. Correct font family not being inherited in all browsers. -// 2. Correct font size not being inherited in all browsers. -// 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome. -// 4. Improve appearance and consistency with IE 6/7. -// 5. Keep form elements constrained in their containers. +/** + * 1. Change font properties to `inherit` in all browsers (opinionated). + * 2. Remove the margin in Firefox and Safari. + * 3. Address `font-family` inconsistency between `textarea` and other form in IE 7 + * 4. Improve appearance and consistency with IE 6/7. + */ button, input, +optgroup, select, textarea { - // 5 - box-sizing: border-box; - // 5 - max-width: 100%; - // 3 - margin: 0; - // 1 - font-family: inherit; - // 2 - font-size: 100%; - - @if $legacy-support-for-ie6 or $legacy-support-for-ie7 { - // 4 - vertical-align: baseline; - // 4 - *vertical-align: middle; + font: inherit; /* 1 */ + margin: 0; /* 2 */ + @if support-for(ie, 7) { + *font-family: $base-font-family; /* 3 */ + *vertical-align: middle; /* 4 */ } } +/** + * Show the overflow in IE. + */ -// Address Firefox 4+ setting `line-height` on `input` using `!important` in -// the UA stylesheet. - -button, -input { - line-height: normal; +button { + overflow: visible; } - -// Address inconsistent `text-transform` inheritance for `button` and `select`. -// All other form control elements do not inherit `text-transform` values. -// Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+. -// Correct `select` style inheritance in Firefox 4+ and Opera. +/** + * Remove the inheritance of text transform in Edge, Firefox, and IE. + * 1. Remove the inheritance of text transform in Firefox. + */ button, -select { +select { /* 1 */ text-transform: none; } - -// 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` -// and `video` controls. -// 2. Correct inability to style clickable `input` types in iOS. -// 3. Improve usability and consistency of cursor style between image-type -// `input` and others. -// 4. Remove inner spacing in IE 7 without affecting normal text inputs. -// Known issue: inner spacing remains in IE 6. +/** + * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video` + * controls in Android 4. + * 2. Correct the inability to style clickable types in iOS and Safari. + */ button, -// 1 -html input[type="button"], -input[type="reset"], -input[type="submit"] { - // 3 - cursor: pointer; - // 2 - -webkit-appearance: button; - - - @if $legacy-support-for-ie7 { - // 4 - *overflow: visible; - } -} - -// Re-set default cursor for disabled elements. - -button[disabled], -html input[disabled] { - cursor: default; +html [type="button"], /* 1 */ +[type="reset"], +[type="submit"] { + -webkit-appearance: button; /* 2 */ } +button, +[type="button"], +[type="reset"], +[type="submit"] { -// 1. Address box sizing set to `content-box` in IE 8/9. -// 2. Remove excess padding in IE 8/9. -// 3. Remove excess padding in IE 7. -// Known issue: excess padding remains in IE 6. - -input[type="checkbox"], -input[type="radio"] { - // 1 - box-sizing: border-box; - // 2 - padding: 0; + /** + * Remove the inner border and padding in Firefox. + */ - @if $legacy-support-for-ie7 { - // 3 - *height: 13px; - // 3 - *width: 13px; + &::-moz-focus-inner { + border-style: none; + padding: 0; } -} - - -// 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome. -// 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome -// (include `-moz` to future-proof). - -input[type="search"] { - // 2 - box-sizing: content-box; - // 1 - -webkit-appearance: textfield; -} + /** + * Restore the focus styles unset by the previous rule. + */ -// Remove inner padding and search cancel button in Safari 5 and Chrome -// on OS X. - -input[type="search"]::-webkit-search-cancel-button, -input[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; -} - -// Remove inner padding and border in Firefox 4+. -button::-moz-focus-inner, -input::-moz-focus-inner { - padding: 0; - border: 0; -} - - -// 1. Remove default vertical scrollbar in IE 8/9. -// 2. Improve readability and alignment in all browsers. - -textarea { - // 1 - overflow: auto; - // 2 - vertical-align: top; -} - -// Drupal-style form labels. -label { - display: block; -} - - -// SITE SPECIFIC form element styles. Adapted from purecss, under the Yahoo! Inc. BSD license -// Please visit http://purecss.io/ for more information -// purecss.io: Copyright 2014 Yahoo! Inc. All rights reserved. - - -input[type="text"], -input[type="password"], -input[type="email"], -input[type="url"], -input[type="date"], -input[type="month"], -input[type="time"], -input[type="datetime"], -input[type="datetime-local"], -input[type="week"], -input[type="number"], -input[type="search"], -input[type="tel"], -input[type="color"], -select, -textarea { - box-sizing: border-box; - outline: none; - text-indent: .5em; - -webkit-appearance: none; - -webkit-user-select: none; - - &:hover, - &:focus, - &:active { - outline: none; + &:-moz-focusring { + outline: 1px dotted ButtonText; } } +/** + * Show the overflow in Edge. + */ - -// Need to separate out the :not() selector from the rest of the CSS 2.1 selectors -// since IE8 won't execute CSS that contains a CSS3 selector. - -input:not([type]) { - box-sizing: border-box; - outline: none; - border: 1px solid $input-not-border; - background: $input-not-background; - color: $input-not; - text-indent: .5em; - -webkit-appearance: none; - -webkit-user-select: none; - - &:hover, - &:focus, - &:active { - outline: none; - border: 1px solid $input-not-hover; +input { + overflow: visible; + @if support-for(firefox, 29) { + // Firefox sets `line-height` using `!important` in the UA stylesheet. + line-height: normal; } } +/** + * 1. Add the correct box sizing in IE <11. + * 2. Remove the padding in IE <11. + * 3. Remove excess padding in IE 7. + * Known issue: excess padding remains in IE 6. + */ -// Chrome (as of v.32/34 on OS X) needs additional room for color to display. -// May be able to remove this tweak as color inputs become more standardized across browsers. -input[type="color"] { - padding: .2em .5em; -} - - -// Need to separate out the :not() selector from the rest of the CSS 2.1 selectors -// since IE8 won't execute CSS that contains a CSS3 selector. - -input[type="file"]:focus, -input[type="radio"]:focus, -input[type="checkbox"]:focus { - outline: 1px auto $input-focus-outline; -} - -input[type="text"][disabled], -input[type="password"][disabled], -input[type="email"][disabled], -input[type="url"][disabled], -input[type="date"][disabled], -input[type="month"][disabled], -input[type="time"][disabled], -input[type="datetime"][disabled], -input[type="datetime-local"][disabled], -input[type="week"][disabled], -input[type="number"][disabled], -input[type="search"][disabled], -input[type="tel"][disabled], -input[type="color"][disabled], -select[disabled], -textarea[disabled] { - background-color: $input-disabled-background; - color: $input-disabled-text; - cursor: not-allowed; +[type="checkbox"], +[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ + @if support-for(ie, 7) { + *height: 13px; /* 3 */ + *width: 13px; /* 3 */ + } } +/** + * Correct the cursor style of increment and decrement buttons in Chrome. + */ -// Need to separate out the :not() selector from the rest of the CSS 2.1 selectors -// since IE8 won't execute CSS that contains a CSS3 selector. - -input:not([type])[disabled] { - background-color: $input-disabled-not-background; - color: $input-disabled-not-text; - cursor: not-allowed; -} - -input[readonly], -select[readonly], -textarea[readonly] { - border-color: $input-readonly-border; - background: $input-readonly-background; - color: $input-readonly-text; +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; } -input:focus:invalid, -textarea:focus:invalid, -select:focus:invalid { - border-color: $input-invalid-border; - color: $input-invalid-text; -} +/** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ -input:focus:invalid:focus, -textarea:focus:invalid:focus, -select:focus:invalid:focus { - border-color: $input-invalid-border-focus; -} +[type="search"] { + -webkit-appearance: textfield; /* 1 */ + outline-offset: -2px; /* 2 */ -input[type="file"]:focus:invalid:focus, -input[type="radio"]:focus:invalid:focus, -input[type="checkbox"]:focus:invalid:focus { - outline-color:$input-check-outline; -} + /** + * Remove the inner padding and cancel buttons in Chrome and Safari on OS X. + */ -input[type="checkbox"], -input[type="radio"] { - position: relative; - top: 7px; - float: left; - margin-right: .5em; -} - -select { - box-sizing: border-box; - width: 100%; - height: 2em; - outline: none; - border: 1px solid $select-border; - border-radius: 0; - background-color: $select-background; - background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAGCAYAAAD68A/GAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChNYWNpbnRvc2gpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkU4QTMzNkUyNDAwQzExRTNBOEY4OTE4N0E1NkQ4QjVCIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkU4QTMzNkUzNDAwQzExRTNBOEY4OTE4N0E1NkQ4QjVCIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RThBMzM2RTA0MDBDMTFFM0E4Rjg5MTg3QTU2RDhCNUIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6RThBMzM2RTE0MDBDMTFFM0E4Rjg5MTg3QTU2RDhCNUIiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4x37VGAAAAWklEQVR42mI0NjZeysDAEMWAHyxlAhKZQPwAj6L7QJwFUvgJiKOB+C8WRX+gcp+YoALHgLgZi0KQ2HEQgwlJsAWIjyLxjwBxK4yDrBBkdQwQf4DiGGTnAAQYAGJbEyV4nwHtAAAAAElFTkSuQmCC); - background-repeat: no-repeat; - background-position: 97% 50%; - text-indent: .5em; - -webkit-appearance: none; - - &:hover, - &:focus, - &:active { - outline: 0; - border: 1px solid $select-border-hover; + &::-webkit-search-cancel-button, + &::-webkit-search-decoration { + -webkit-appearance: none; } } -select[multiple] { - height: auto; -} - -label { -} - -fieldset { - margin: 0; - padding: .25em 0 .75em; - border: 0; -} - -legend { - display: block; - width: 100%; - margin-bottom: 1.5em; - padding: .5em 0; -} - -input + input, -select + select, -input + select, -select + input { - margin-top: .5em; -} +/** + * Correct the text style of placeholders in Chrome, Edge, and Safari. + */ -button:not(.toolbar-icon) { - margin: 1em 0; - padding: 1em; - border: 1px solid transparent; - background: $button-background; - color: $button-text; +::-webkit-input-placeholder { + color: inherit; + opacity: 0.54; } -button:hover { - background: $button-hover-background; - color: $button-hover-text; -} +/** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ -button:focus { - outline-style: dotted; - outline-color: $button-focus-outline; - outline-width: 1px; +::-webkit-file-upload-button { + -webkit-appearance: button; /* 1 */ + font: inherit; /* 2 */ } -button[type="reset"] { - padding: 1em; - border: none; - background: transparent; - color: $button-reset-text; - text-decoration: underline; - font-size: 14px; -} +/** + * Change the border, margin, and padding in all browsers (opinionated). + */ -button[type="reset"]:hover { - color: $button-reset-text-hover; +fieldset { + border: 1px solid $white-60; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; } -// Styles for placeholder text -::-webkit-input-placeholder { - color: $placeholder-text; -} +/** + * 1. Correct the text wrapping in Edge and IE. + * 2. Correct the color inheritance from `fieldset` elements in IE. + * 3. Remove the padding so developers are not caught out when they zero out + * `fieldset` elements in all browsers. + * 4. Correct alignment displayed oddly in IE 6/7. + */ -:-moz-placeholder { - // Firefox 18- - color: $placeholder-text; +legend { + box-sizing: border-box; /* 1 */ + display: table; /* 1 */ + max-width: 100%; /* 1 */ + white-space: normal; /* 1 */ + color: inherit; /* 2 */ + padding: 0; /* 3 */ + @if support-for(ie, 7) { + *margin-left: -7px; /* 4 */ + } } -::-moz-placeholder { - // Firefox 19+ - color: $placeholder-text; -} +/** + * Restore the font weight unset by a previous rule. + */ -:-ms-input-placeholder { - color: $placeholder-text; +optgroup { + font-weight: bold; } +/** + * Remove the default vertical scrollbar in IE. + */ -// Tables - -table { - // Add margins. - margin-top: 1em; - margin-bottom: 1em; - // Remove most spacing between table cells. - border-collapse: collapse; - border-spacing: 0; - // Prevent cramped-looking tables +textarea { + overflow: auto; } -/* stylelint-enable */ \ No newline at end of file diff --git a/STYLEGUIDE_TEMPLATE/source/code/sass/_support-for.scss b/STYLEGUIDE_TEMPLATE/source/code/sass/_support-for.scss new file mode 100644 index 0000000..6275f0d --- /dev/null +++ b/STYLEGUIDE_TEMPLATE/source/code/sass/_support-for.scss @@ -0,0 +1,64 @@ +// Support the last 4 versions of all browsers except IE. +$support-for: ( + chrome: -4, + edge: -4, + firefox: -4, + ie: 9, + opera: -4, + safari: -4, + '*': -4, +) !default; + +// Set the current version number for all browsers. As of: 2016-04-30 +$support-for-current-browser-version: ( + chrome: 50, // https://en.wikipedia.org/wiki/Google_Chrome_release_history + edge: 25, // https://en.wikipedia.org/wiki/Microsoft_Edge + firefox: 46, // https://en.wikipedia.org/wiki/Firefox_release_history + ie: 11, // https://en.wikipedia.org/wiki/Internet_Explorer_versions + opera: 36, // https://en.wikipedia.org/wiki/Opera_(web_browser) + safari: 9, // https://en.wikipedia.org/wiki/Safari_version_history +) !default; + + +// support-for() +// +// Determines if the project has declared a minimum supported version number for +// the specified browser. +// +// If configured, this is a wrapper function that uses Compass' +// support-legacy-browser(). +// @see http://compass-style.org/reference/compass/support/#function-support-legacy-browser +// +@function support-for($browser, $version) { + // Ensure $version is an integer (or null). + @if not (type-of($version) == "null" or type-of($version) == "number" and round($version) == $version) { + @error "The $version parameter of support-for() must be an integer; #{type-of($version)} given."; + } + + // Check against declared minimums. + $min-version: null; + @if map-has-key($support-for, $browser) { + $min-version: map-get($support-for, $browser); + } + @else if map-has-key($support-for, '*') { + $min-version: map-get($support-for, '*'); + } + + // Ensure $min-version is an integer (or null). + @if type-of($min-version) != "null" and type-of($min-version) != "number" { + @error "$support-for: (#{$browser}: #{$min-version}) must be set to an integer (or null); #{$min-version} is a #{type-of($min-version)}."; + } + @elseif type-of($min-version) == "number" and round($min-version) != $min-version { + @error "$support-for: (#{$browser}: #{$min-version}) must be set to an integer (or null); #{$min-version} is not an integer."; + } + + // Negative $min-version means "X most recent versions". + @if type-of($min-version) == "number" and $min-version < 0 { + @if not map-has-key($support-for-current-browser-version, $browser) { + @error "#{$browser} not found in $support-for-current-browser-version map; it must be set to an integer."; + } + $min-version: map-get($support-for-current-browser-version, $browser) + $min-version + 1; + } + + @return if(($min-version and ($version >= $min-version)), true, false); +} diff --git a/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-1up.scss b/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-1up.scss index 425fe1a..272b90c 100644 --- a/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-1up.scss +++ b/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-1up.scss @@ -3,8 +3,12 @@ * Layout rules for full-width content */ + // ============================================================================= + // Basic 1-up layout + // ============================================================================= + .l-1up { - @include zen-grid-item-base(); - @include zen-new-row(); - @include zen-grid-item(12, 1); + // Uncomment to display grid overlay for 1-up + // @include background-grid($color: rgba(blue, .2)); + @include isolation-span(12, 1, 'both'); } diff --git a/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-2up.scss b/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-2up.scss index 33e5f51..abc987c 100644 --- a/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-2up.scss +++ b/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-2up.scss @@ -4,54 +4,46 @@ */ // ============================================================================= -// Ruleset for content going from 1-column at mobile, -// to 2-column as horizontal space allows -// $omega-gutter: "false" = will wrap an item -// $omega-gutter: "true" = will not wrap an item +// Basic 2-up Float layout // ============================================================================= .l-2up { - @include zen-new-row(); - @include zen-grid-item(12, 1); -} - -// make every 2nd list item wrap -.l-2up:nth-of-type(2n+1) { + @include isolation-span(12, 1, 'both'); @include breakpoint($bp1) { - @include zen-new-row(right); - @include zen-grid-item(6, 1); + @include float-span(6); } -} -// clears a new row from the tallest element in the row above -.l-2up:nth-of-type(2n+2) { + &:nth-of-type(2n+1) { + @include breakpoint($bp1) { + @include float-span(6, 'first'); + } + } - @include breakpoint($bp1) { - @include zen-new-row(right); - @include zen-grid-item(6, 7); + &:nth-of-type(2n) { + @include breakpoint($bp1) { + @include float-span(6, 'last'); + } } } + // ============================================================================= -// Basic 2-up layouts +// Basic 2-up Isolation layout // ============================================================================= .l-2up--1 { - @include zen-new-row(); - @include zen-grid-item(12, 1); + @include isolation-span(12, 1, 'both'); @include breakpoint($bp1) { - @include zen-grid-item(6, 1); + @include isolation-span(6, 1, 'both'); } } .l-2up--2 { - @include zen-new-row(); - @include zen-grid-item(12, 1); + @include isolation-span(12, 1, 'both'); @include breakpoint($bp1) { - @include zen-new-row(none); - @include zen-grid-item(6, 7); + @include isolation-span(6, 7, 'none'); } } diff --git a/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-33-66.scss b/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-33-66.scss index 0f63611..d917854 100644 --- a/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-33-66.scss +++ b/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-33-66.scss @@ -3,23 +3,22 @@ * Layout rules for one third / two thirds (33/66) content */ +// ============================================================================= +// Basic 33-66 Isolation layout +// ============================================================================= + .l-33-66--1 { - @include zen-new-row(); - @include zen-grid-item(12, 1); + @include isolation-span(12, 1, 'both'); @include breakpoint($bp1) { - @include zen-grid-item(4, 1); - @include zen-float(left); + @include isolation-span(4, 1, 'both'); } } .l-33-66--2 { - @include zen-new-row(); - @include zen-grid-item(12, 1); + @include isolation-span(12, 1, 'both'); @include breakpoint($bp1) { - @include zen-new-row(none); - @include zen-grid-item(8, 5); - @include zen-float(left); + @include isolation-span(8, 5, 'none'); } } diff --git a/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-3up.scss b/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-3up.scss index 0cca0fd..0378e43 100644 --- a/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-3up.scss +++ b/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-3up.scss @@ -4,83 +4,54 @@ */ // ============================================================================= -// Ruleset for content going from 1-column at mobile, -// to two-column, to 3-column as horizontal space allows -// $omega-gutter: "false" = will wrap an item -// $omega-gutter: "true" = will not wrap an item +// Basic 3-up Float layout // ============================================================================= .l-3up { - @include zen-grid-item-base(); - @include zen-grid-item(12, 1); - @include zen-new-row(); + @include isolation-span(12, 1, 'both'); - &:nth-of-type(3n+1) { - - @include breakpoint($bp1) { - @include zen-grid-item(6, 1); - } - - @include breakpoint($bp3) { - @include zen-new-row(); - @include zen-grid-item(4, 1); - } + @include breakpoint($bp1) { + @include float-span(4); } - &:nth-of-type(3n+2) { + &:nth-of-type(3n+1) { @include breakpoint($bp1) { - @include zen-grid-item(6, 7); - @include zen-new-row(none); - } - - @include breakpoint($bp3) { - @include zen-grid-item(4, 5); + @include float-span(4, 'first'); } } - &:nth-of-type(3n+3) { - + &:nth-of-type(3n) { @include breakpoint($bp1) { - @include zen-new-row(); - @include zen-grid-item(6, 1); - } - - @include breakpoint($bp3) { - @include zen-new-row(none); - @include zen-grid-item(4, 9); + @include float-span(4, 'last'); } } } + // ============================================================================= -// Basic 3-up layouts +// Basic 3-up Isolation layout // ============================================================================= .l-3up--1 { - @include zen-new-row(); - @include zen-grid-item(12, 1); + @include isolation-span(12, 1, 'both'); @include breakpoint($bp1) { - @include zen-grid-item(4, 1); + @include isolation-span(4, 1, 'both'); } } .l-3up--2 { - @include zen-new-row(); - @include zen-grid-item(12, 1); + @include isolation-span(12, 1, 'both'); @include breakpoint($bp1) { - @include zen-new-row(none); - @include zen-grid-item(4, 5); + @include isolation-span(4, 5, 'none'); } } .l-3up--3 { - @include zen-new-row(); - @include zen-grid-item(12, 1); + @include isolation-span(12, 1, 'both'); @include breakpoint($bp1) { - @include zen-new-row(none); - @include zen-grid-item(4, 9); + @include isolation-span(4, 9, 'none'); } } diff --git a/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-4up.scss b/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-4up.scss index bef5e3d..efbf08a 100644 --- a/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-4up.scss +++ b/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-4up.scss @@ -4,91 +4,62 @@ */ // ============================================================================= -// Ruleset for content going from 1-column at mobile, -// to two-column, to 4-column as horizontal space allows -// $omega-gutter: "false" = will wrap an item -// $omega-gutter: "true" = will not wrap an item +// Basic 4-up Float layout // ============================================================================= -.l-4up, -%l-4up { - @include zen-grid-item-base(); - @include zen-flow-item-width(12, 12, $omega-gutter: false); - float: left; +.l-4up { + @include isolation-span(12, 1, 'both'); @include breakpoint($bp1) { - @include zen-flow-item-width(6, 12, $omega-gutter: true); + @include float-span(3); } - @include breakpoint($bp3) { - @include zen-flow-item-width(3, 12, $omega-gutter: true); + &:nth-of-type(4n+1) { + @include breakpoint($bp1) { + @include float-span(3, 'first'); + } } -} -// make every 2nd list item wrap -.l-4up:nth-of-type(2n) { - @include breakpoint($bp1) { - @include zen-flow-item-width(6, 12, $omega-gutter: false); - } - - @include breakpoint($bp3) { - @include zen-flow-item-width(3, 12, $omega-gutter: true); + &:nth-of-type(4n) { + @include breakpoint($bp1) { + @include float-span(3, 'last'); + } } } -// make every 4th list item wrap -.l-4up:nth-of-type(4n) { - @include breakpoint($bp3) { - @include zen-flow-item-width(3, 12, $omega-gutter: false); - } -} -// clears a new row from the tallest element in the row above -.l-4up:nth-of-type(4n+1) { - - @include breakpoint($bp3) { - @include zen-new-row(); - } -} // ============================================================================= -// Basic 4-up layouts +// Basic 4-up Isolation layout // ============================================================================= .l-4up--1 { - @include zen-new-row(); - @include zen-grid-item(12, 1); + @include isolation-span(12, 1, 'both'); @include breakpoint($bp1) { - @include zen-grid-item(3, 1); + @include isolation-span(3, 1, 'both'); } } .l-4up--2 { - @include zen-new-row(); - @include zen-grid-item(12, 1); + @include isolation-span(12, 1, 'both'); @include breakpoint($bp1) { - @include zen-new-row(none); - @include zen-grid-item(3, 4); + @include isolation-span(3, 4, 'none'); } } .l-4up--3 { - @include zen-new-row(); - @include zen-grid-item(12, 1); + @include isolation-span(12, 1, 'both'); @include breakpoint($bp1) { - @include zen-new-row(none); - @include zen-grid-item(3, 7); + @include isolation-span(3, 7, 'none'); } } .l-4up--4 { - @include zen-new-row(); - @include zen-grid-item(12, 1); + @include isolation-span(12, 1, 'both'); @include breakpoint($bp1) { - @include zen-new-row(none); - @include zen-grid-item(3, 10); + @include isolation-span(3, 10, 'none'); } } diff --git a/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-66-33.scss b/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-66-33.scss index 2cc7fdf..77791a1 100644 --- a/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-66-33.scss +++ b/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-66-33.scss @@ -3,44 +3,22 @@ * Layout rules for two thirds / one third (66/33) content */ -.l-66-33 { - @include zen-grid-item-base(); - @include zen-flow-item-width(12, 12, $omega-gutter: false); - @include zen-float(); - - &:nth-of-type(2n+1) { - - @include breakpoint($bp1) { - @include zen-flow-item-width(8, 12, $omega-gutter: false, $alpha-gutter: false); - } - } - - // clears a new row from the tallest element in the row above - &:nth-of-type(2n+2) { - - @include breakpoint($bp1) { - @include zen-flow-item-width(4, 12, $omega-gutter: false, $alpha-gutter: true); - } - } -} +// ============================================================================= +// Basic 66-33 Isolation layout +// ============================================================================= .l-66-33--1 { - @include zen-new-row(); - @include zen-grid-item(12, 1); + @include isolation-span(12, 1, 'both'); @include breakpoint($bp1) { - @include zen-grid-item(8, 1); - @include zen-float(left); + @include isolation-span(8, 1, 'both'); } } .l-66-33--2 { - @include zen-new-row(); - @include zen-grid-item(12, 1); + @include isolation-span(12, 1, 'both'); @include breakpoint($bp1) { - @include zen-new-row(none); - @include zen-grid-item(4, 9); - @include zen-float(left); + @include isolation-span(4, 9, 'none'); } } diff --git a/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-6up.scss b/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-6up.scss index 6ff3166..586cfa2 100644 --- a/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-6up.scss +++ b/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-6up.scss @@ -3,154 +3,79 @@ * Layout rules for 6-up content */ -.l-6up { - @include zen-grid-item-base(); - @include zen-flow-item-width(12, 12, $omega-gutter: false); - float: left; - - &:nth-of-type(2n+1) { - - // act like a 2up at bp1 - @include breakpoint($bp0 $bp1) { - @include zen-flow-item-width(6, 12, $omega-gutter: true); - } - } - - &:nth-of-type(2n+2) { - - // act like a 2up at bp1 - @include breakpoint($bp0 $bp1) { - @include zen-flow-item-width(6, 12, $omega-gutter: false); - } - } - - &:nth-of-type(3n+1) { - - // act like a 3up at bp2 - @include breakpoint($bp1 $bp2) { - @include zen-flow-item-width(4, 12, $omega-gutter: true); - } - - } - - &:nth-of-type(3n+2) { - - // act like a 3up at bp2 - @include breakpoint($bp1 $bp2) { - @include zen-flow-item-width(4, 12, $omega-gutter: false); - } - } +// ============================================================================= +// Basic 6-up Float layout +// ============================================================================= - &:nth-of-type(3n+3) { - - // act like a 3up at bp2 - @include breakpoint($bp1 $bp2) { - @include zen-flow-item-width(4, 12, $omega-gutter: false, $alpha-gutter: true); - } - } - - &:nth-of-type(4n+1) { - // act like a 4up at bp3 - @include breakpoint($bp2 $bp3) { - @include zen-flow-item-width(3, 12, $omega-gutter: true); - } - } - - &:nth-of-type(4n+2) { - // act like a 4up at bp3 - @include breakpoint($bp2 $bp3) { - @include zen-flow-item-width(3, 12, $omega-gutter: false); - } - } +.l-6up { + @include isolation-span(12, 1, 'both'); - &:nth-of-type(4n+3), - &:nth-of-type(4n+4) { - // act like a 4up at bp3 - @include breakpoint($bp2 $bp3) { - @include zen-flow-item-width(3, 12, $omega-gutter: false, $alpha-gutter: true); - } + @include breakpoint($bp1) { + @include float-span(2); } &:nth-of-type(6n+1) { - // act like a 4up at bp3 - @include breakpoint($bp3) { - @include zen-flow-item-width(2, 12, $omega-gutter: true); - } - } - - &:nth-of-type(6n+2) { - // act like a 4up at bp3 - @include breakpoint($bp3) { - @include zen-flow-item-width(2, 12, $omega-gutter: false); + @include breakpoint($bp1) { + @include float-span(2, 'first'); } } - &:nth-of-type(6n+3), - &:nth-of-type(6n+4), - &:nth-of-type(6n+5), - &:nth-of-type(6n+6) { - // act like a 4up at bp3 - @include breakpoint($bp3) { - @include zen-flow-item-width(2, 12, $omega-gutter: false, $alpha-gutter: true); + &:nth-of-type(6n) { + @include breakpoint($bp1) { + @include float-span(2, 'last'); } } } + +// ============================================================================= +// Basic 6-up Isolation layout +// ============================================================================= + .l-6up--1 { - @include zen-new-row(); - @include zen-grid-item(12, 1); + @include isolation-span(12, 1, 'both'); @include breakpoint($bp1) { - @include zen-grid-item(2, 1); + @include isolation-span(2, 1, 'both'); } } .l-6up--2 { - @include zen-new-row(); - @include zen-grid-item(12, 1); + @include isolation-span(12, 1, 'both'); @include breakpoint($bp1) { - @include zen-new-row(none); - @include zen-grid-item(2, 3); + @include isolation-span(2, 3, 'none'); } } .l-6up--3 { - @include zen-new-row(); - @include zen-grid-item(12, 1); + @include isolation-span(12, 1, 'both'); @include breakpoint($bp1) { - @include zen-new-row(none); - @include zen-grid-item(2, 5); + @include isolation-span(2, 5, 'none'); } } .l-6up--4 { - @include zen-new-row(); - @include zen-grid-item(12, 1); + @include isolation-span(12, 1, 'both'); @include breakpoint($bp1) { - @include zen-new-row(none); - @include zen-grid-item(2, 7); + @include isolation-span(2, 7, 'none'); } } .l-6up--5 { - @include zen-new-row(); - @include zen-grid-item(12, 1); + @include isolation-span(12, 1, 'both'); @include breakpoint($bp1) { - @include zen-new-row(none); - @include zen-grid-item(2, 9); + @include isolation-span(2, 9, 'none'); } } .l-6up--6 { - @include zen-new-row(); - @include zen-grid-item(12, 1); + @include isolation-span(12, 1, 'both'); @include breakpoint($bp1) { - @include zen-new-row(none); - @include zen-grid-item(2, 11); + @include isolation-span(2, 11, 'none'); } } diff --git a/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-singularity.scss b/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-singularity.scss new file mode 100644 index 0000000..6a9e00e --- /dev/null +++ b/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-singularity.scss @@ -0,0 +1,42 @@ +/** + * @file + * Define singularity gs base settings here. + * @see https://github.com/at-import/Singularity + */ + +////////////////////////////////////////// +// Singularity: Setup +////////////////////////////////////////// + +// Debug mode: Set to true for background grid overlay. +@include sgs-change('debug', true); + +// Set default grid for each breakpoint. +@include add-grid(12); +// +// Set default gutter. +@include add-gutter(1/2); + + + +////////////////////////////////////////// +// Singularity: Centered container +////////////////////////////////////////// + +.container { + // @include background-grid($color: rgba(blue, .2)); + @extend %clearfix; + width: 100%; + min-width: 260px; /* enforces a min-width in FF. */ + padding: 0 rhythm(1); + margin: 0 auto; + + @include breakpoint($bp2) { + width: 90%; + padding: 0; + } + + @include breakpoint($bp3) { + max-width: 1400px; + } +} diff --git a/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-zen-grids-base.scss b/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-zen-grids-base.scss deleted file mode 100644 index 0ff403d..0000000 --- a/STYLEGUIDE_TEMPLATE/source/code/sass/layouts/_l-zen-grids-base.scss +++ /dev/null @@ -1,66 +0,0 @@ -/** - * @file - * Define zen grids base settings here. - * @see http://zengrids.com - */ - -// We are going to create a 980px wide, 12 column grid with 48px gutters between -// columns (applied as 24px of left/right padding on each column). -$zen-columns: 12; -$zen-gutters: $base-line-height * 2; - -// If you need IE6/7 support for box-sizing: border-box (default), see _base.scss -//$zen-box-sizing: content-box; - - -// You can generate more efficient CSS if you manually apply the -// zen-grid-item-base mixin to all grid items from within a single ruleset. -$zen-auto-include-item-base: true; -// $zen-auto-include-flow-item-base: false; - -/* - * Center the page. - */ - -.container { - /* For screen sizes larger than 1200px, prevent excessively long lines of text - by setting a max-width. */ - margin-left: auto; - margin-right: auto; - min-width: 260px; /* enforces a min-width in FF. */ - @include breakpoint($bp1) { width: 90%; } - @include breakpoint($bp2) { max-width: 1400px; } -} - -/* - * Apply the shared properties of grid items in a single, efficient ruleset. - */ -// See the note about $zen-auto-include-item-base above. - -.container, -.grid-item { - @include zen-grid-item-base(); -} - -/* - * Containers for grid items and flow items. - */ - -.container { - @include zen-grid-container(); -} - -// Dynamically alters the outside padding on zengrid containers -.container { - padding-left: 0; - padding-right: 0; -// For example: -// @include breakpoint($bp1){ -// padding-left: ($zen-gutter-width / 4); -// padding-right: ($zen-gutter-width / 4); -// } -// @include breakpoint($bp2){ -// padding-left: ($zen-gutter-width / 2); -// padding-right: ($zen-gutter-width / 2); -// } -} diff --git a/STYLEGUIDE_TEMPLATE/source/code/sass/styleguide/_styleguide.scss b/STYLEGUIDE_TEMPLATE/source/code/sass/styleguide/_styleguide.scss index 623dc2d..56581cc 100644 --- a/STYLEGUIDE_TEMPLATE/source/code/sass/styleguide/_styleguide.scss +++ b/STYLEGUIDE_TEMPLATE/source/code/sass/styleguide/_styleguide.scss @@ -6,34 +6,34 @@ */ .l-styleguide-column { - @include zen-new-row(); - @include zen-grid-item(12, 1); - @include breakpoint($bp1){ - @include zen-grid-item(8, 1); + @include isolation-span(12, 1, 'both'); + @include breakpoint($bp1) { + @include isolation-span(8, 1, 'none'); } - @include breakpoint($bp2){ - @include zen-grid-item(7, 2); + + @include breakpoint($bp2) { + @include isolation-span(7, 2, 'none'); } } .l-styleguide-rail { - @include zen-new-row(); - @include zen-grid-item(12, 1); - @include breakpoint($bp1){ - @include zen-new-row(none); - @include zen-grid-item(4, 1); + @include isolation-span(12, 1, 'both'); + + @include breakpoint($bp1) { + @include isolation-span(4, 1, 'none'); } - @include breakpoint($bp2){ - @include zen-grid-item(3, 2); + + @include breakpoint($bp2) { + @include isolation-span(3, 2, 'none'); } } .styleguide-copyright { - //@include adjust-font-size-to($label, 1.5); + @include adjust-font-size-to($label, 1.5); color: $gray-medium; - padding: 4em 0; - margin-top: 8em; + padding: rhythm(2) 0; + margin-top: rhythm(2); border-top: 1px solid $gray-light; } @@ -42,41 +42,41 @@ } .styleguide-section { - margin-top: 4em; + margin-top: rhythm(3); border-top: 1px solid $gray-light; - padding-top: 2em; + padding-top: rhythm(2); } .styleguide-list { - padding: 0 0 0 2em; + h4 { - //@include leader(0); - //@include trailer(0.25); + @include leader(0); + @include trailer(0.25); font-weight: 400; } } .styleguide-component { background-color: $white; - padding: 2em 0; + padding: rhythm(2) 0; } .component-header { background-color: $gray-light; - margin: 1.5em 0; - padding: 1.5em 0; + margin: rhythm(1) 0; + padding: rhythm(1) 0; } .color-title { border-bottom: 1px solid $gray-light; - padding-bottom: 1em; - margin: 2em 0; + padding-bottom: rhythm(1); + margin: rhythm(2) 0; } .color-block { width: 100%; height: 50px; - margin-top: 1em; + margin-top: rhythm(1); } .color-label { @@ -89,5 +89,36 @@ } .styleguide-body { - margin-bottom: 2em; + margin-bottom: rhythm(2); +} + +// Grid demo styles +.demo { + background-color: $gray-light; + padding: rhythm(1); +} + +// Set example nest wrap styles +.nest-wrap { + @extend %clearfix; + background-color: $gray-light; + padding: 0; +} + +// Set the column count for nested example +@include layout(8) { + .nest-item { + @include isolation-span(8, 1, 'both'); + background-color: darken($gray-light, 4%); + padding: rhythm(1); + + @include breakpoint($bp1) { + @include float-span(2); + margin-bottom: 0; + + &:last-child { + @include float-span(4, "last"); + } + } + } } diff --git a/STYLEGUIDE_TEMPLATE/source/code/sass/styles.scss b/STYLEGUIDE_TEMPLATE/source/code/sass/styles.scss index d14cef2..6a5da8b 100644 --- a/STYLEGUIDE_TEMPLATE/source/code/sass/styles.scss +++ b/STYLEGUIDE_TEMPLATE/source/code/sass/styles.scss @@ -8,11 +8,17 @@ /* Import Sass mixins, variables, Compass modules, etc. */ @import "init"; +/* Set browser support */ +@import "support-for"; + +/* Set the vertical rhythm */ +@import "vertical-rhythm/vertical_rhythm"; + /* HTML element (SMACSS base) rules */ @import "normalize"; /* Layout rules */ -@import "layouts/l-zen-grids-base"; +@import "layouts/l-singularity"; @import "layouts/l-1up"; @import "layouts/l-66-33"; @import "layouts/l-33-66"; diff --git a/STYLEGUIDE_TEMPLATE/source/code/sass/vertical-rhythm/_grid_background.scss b/STYLEGUIDE_TEMPLATE/source/code/sass/vertical-rhythm/_grid_background.scss new file mode 100755 index 0000000..1deedd2 --- /dev/null +++ b/STYLEGUIDE_TEMPLATE/source/code/sass/vertical-rhythm/_grid_background.scss @@ -0,0 +1,29 @@ +// Set the color of your baseline +$grid-background-baseline-color : rgba(0, 0, 0, 0.5) !default; +// Set the height of your baseline grid +$grid-background-baseline-height : 1.5em !default; + +// toggle your vertical grids on and off +$show-baseline-grid-backgrounds : true !default; +// toggle all your grids on and off +$show-grid-backgrounds : true !default; + +// Add just the baseline grid to an element's background +@mixin baseline-grid-background( + $baseline : $grid-background-baseline-height, + $color : $grid-background-baseline-color +) { + @if $show-grid-backgrounds and $show-baseline-grid-backgrounds { + background-image: get-baseline-gradient($color); + background-size: 100% $baseline; + background-position: left top; + } +} + +// Create the gradient needed for baseline grids +@function get-baseline-gradient( + $color : $grid-background-baseline-color +) { + $gradient: linear-gradient(to top, $color 5%, rgba($color,0) 5%); + @return $gradient; +} diff --git a/STYLEGUIDE_TEMPLATE/source/code/sass/vertical-rhythm/_units.scss b/STYLEGUIDE_TEMPLATE/source/code/sass/vertical-rhythm/_units.scss new file mode 100755 index 0000000..0bb4a1b --- /dev/null +++ b/STYLEGUIDE_TEMPLATE/source/code/sass/vertical-rhythm/_units.scss @@ -0,0 +1,183 @@ +// @private Default font-size for all browsers +$browser-default-font-size: 16px; + +// Base font size in pixels, if not already defined. +// Should be the same as the font-size of the html element. +$base-font-size: 16px !default; + +// Whether to output fallback values in px when outputting rems. +$rem-with-px-fallback: true !default; + + +// Convert any CSS or value to any another. +// +// @param $length +// A css or value +// +// @param $to-unit +// String matching a css unit keyword, e.g. 'em', '%', etc. +// +// @param $from-context +// When converting from relative units, the absolute length (in px) to +// which $length refers (e.g. for $lengths in em units, would normally be the +// font-size of the current element). +// +// @param $to-context +// For converting to relative units, the absolute length in px to which the +// output value will refer. Defaults to the same as $from-context, since it is +// rarely needed. +@function convert-length( + $length, + $to-unit, + $from-context: $base-font-size, + $to-context: $from-context +) { + + $from-unit: unit($length); + + // Optimize for cases where `from` and `to` units are accidentally the same. + @if $from-unit == $to-unit { @return $length; } + + // Context values must be in px so we can determine a conversion ratio for + // relative units. + @if unit($from-context) != 'px' { @warn "Paremeter $from-context must resolve to a value in pixel units."; } + @if unit($to-context) != 'px' { @warn "Parameter $to-context must resolve to a value in pixel units."; } + + // Convert input length to pixels + $px-length: $length; + + @if $from-unit != 'px' { + // Convert relative units using the from-context parameter. + @if $from-unit == 'em' { $px-length: $length * $from-context / 1em } + @else if $from-unit == 'rem' { $px-length: $length * $base-font-size / 1rem } + @else if $from-unit == '%' { $px-length: $length * $from-context / 100% } + @else if $from-unit == 'ex' { $px-length: $length * $from-context / 2ex } + // Convert absolute units using Sass' conversion table. + @else if $from-unit == 'in' or + $from-unit == 'mm' or + $from-unit == 'cm' or + $from-unit == 'pt' or + $from-unit == 'pc' { $px-length: 0px + $length } + // Certain units can't be converted. + @else if $from-unit == 'ch' or + $from-unit == 'vw' or + $from-unit == 'vh' or + $from-unit == 'vmin' { + @warn "#{$from-unit} units can't be reliably converted; Returning original value."; + @return $length; + } + @else { + @warn "#{$from-unit} is an unknown length unit. Returning original value."; + @return $length; + } + } + + // Convert length in pixels to the output unit + $output-length: $px-length; + @if $to-unit != 'px' { + // Relative units + @if $to-unit == 'em' { $output-length: $px-length * 1em / $to-context } + @else if $to-unit == 'rem' { $output-length: $px-length * 1rem / $base-font-size } + @else if $to-unit == '%' { $output-length: $px-length * 100% / $to-context } + @else if $to-unit == 'ex' { $output-length: $px-length * 2ex / $to-context } + // Absolute units + @else if $to-unit == 'in' { $output-length: 0in + $px-length } + @else if $to-unit == 'mm' { $output-length: 0mm + $px-length } + @else if $to-unit == 'cm' { $output-length: 0cm + $px-length } + @else if $to-unit == 'pt' { $output-length: 0pt + $px-length } + @else if $to-unit == 'pc' { $output-length: 0pc + $px-length } + // Non-convertible units + @else if $to-unit == 'ch' or + $to-unit == 'vw' or + $to-unit == 'vh' or + $to-unit == 'vmin' { + @warn "#{$to-unit} units can't be reliably converted; Returning original value."; + @return $length; + } + @else { + @warn "#{$to-unit} is an unknown length unit. Returning original value."; + @return $length; + } + } + + @return $output-length; +} + + +// @private Get the px/rem versions of a value. +@function rem-fallback-values($value) { + $_return: ( + px: $value, + rem: $value, + ); + + @if type-of($value) == number and not unitless($value) { + @if unit($value) == rem { + $_return: map-merge($_return, ( + px: round(convert-length($value, px)), + )); + } @else if unit($value) == px { + $_return: map-merge($_return, ( + px: round($value), + rem: convert-length($value, rem), + )); + } + } + + @return $_return; +} + +// @private Get the px/rem versions of a list (or nested lists). +@function list-convert-rems($value) { + $_empty: ( + px: (), + rem: (), + ); + $_return: $_empty; + $_sep: null; + + @if type-of($value) == list { + $_sep: list-separator($value); + @each $sub in $value { + $_this: list-convert-rems($sub); + $_return: ( + px: append(map-get($_return, px), map-get($_this, px), $_sep), + rem: append(map-get($_return, rem), map-get($_this, rem), $_sep), + ); + } + } @else { + $_this: rem-fallback-values($value); + $_return: map-merge($_return, $_this); + } + + @return $_return; +} + + +// Output a given style rule containing rem values along with an (optional) +// fallback rule for older browsers (with rem values converted to px). +// +// @param $property +// The css property name. +// +// @param $values +// The value or list of values for the property. +// +// @param $use-px-fallback +// [ true | false ] +// +@mixin rem($property, $values, $use-px-fallback: $rem-with-px-fallback) { + + // get converted values. + $values: list-convert-rems($values); + $px-values: map-get($values, px); + $values: map-get($values, rem); + + // Use pixel fallback for browsers that don't understand rem units. + @if $use-px-fallback and $px-values != $values { + #{$property}: $px-values; + } + + // Use rem values for everyone else (overrides pixel values). + #{$property}: $values; +} diff --git a/STYLEGUIDE_TEMPLATE/source/code/sass/vertical-rhythm/_vertical_rhythm.scss b/STYLEGUIDE_TEMPLATE/source/code/sass/vertical-rhythm/_vertical_rhythm.scss new file mode 100755 index 0000000..bcd700a --- /dev/null +++ b/STYLEGUIDE_TEMPLATE/source/code/sass/vertical-rhythm/_vertical_rhythm.scss @@ -0,0 +1,309 @@ +/** + * @file + * Libsass-compatible port of Compass' vertical-rhythm helpers + * + * @see https://github.com/neoeno/libsass-compass-vertical-rhythm + */ + +@import "grid_background"; +@import "units"; + +// The default font size for all text in pixels +$base-font-size: 16px !default; + +// The distance between text baselines (vertical rhythm) in pixels. +$base-line-height: 24px !default; + +// The length unit in which to output rhythm values. +// Supported values: px, em, rem. Percent units can't be used since they +// make calculating padding and margins impractical, and percentage borders are +// not valid or supported in css. +$rhythm-unit: 'em' !default; + +// Whether to output fallback values in px when using rem as the rhythm-unit. +$rem-with-px-fallback: true !default; + +// Default values for rhythm borders properties. +// Supports style alone eg. `solid` or list of style and color eg. `solid #aaa`; +$default-rhythm-border-width: 1px !default; +$default-rhythm-border-style: solid !default; + +// Allows the `adjust-font-size-to` mixin and the `lines-for-font-size` function +// to round the line height to the nearest half line height instead of the +// nearest integral line height to avoid large spacing between lines. +$round-to-nearest-half-line: false !default; + +// Ensure there is at least this many pixels +// of vertical padding above and below the text. +$min-line-padding: 2px !default; + +// The leader is the amount of whitespace in a line. +// It might be useful in your calculations. +$base-leader: convert-length($base-line-height - $base-font-size, $rhythm-unit, $base-font-size); + +// The half-leader is the amount of whitespace above and below a line. +// It might be useful in your calculations. +$base-half-leader: $base-leader / 2; + +// @private Whether the rhythm output is in absolute units (px) or not (em, rem) +$relative-font-sizing: if($rhythm-unit == px, false, true); + +// Should we support IE6 by setting base font size? +$compass-rhythm-support-ie6: false; + +// Validate units +@if unit($base-font-size) != 'px' { @warn "$base-font-size must resolve to a pixel unit."; } +@if unit($base-line-height) != 'px' { @warn "$base-line-height must resolve to a pixel unit."; } +@if $rhythm-unit != 'px' and $rhythm-unit != 'em' and $rhythm-unit != 'rem' { + @warn "$rhythm-unit must be `px`, `em` or `rem`."; +} + + +// Calculate rhythm units. +@function rhythm($lines: 1, $font-size: $base-font-size, $offset: 0) { + $rhythm: convert-length($lines * $base-line-height - $offset, $rhythm-unit, $font-size); + @if unit($rhythm) == px { + $rhythm: floor($rhythm); + } + @return $rhythm; +} + +// Calculate the minimum multiple of rhythm units needed to contain the font-size. +@function lines-for-font-size($font-size) { + $lines: if($round-to-nearest-half-line, + ceil(2 * $font-size / $base-line-height) / 2, + ceil($font-size / $base-line-height)); + // If lines are cramped include some extra lead. + @if ($lines * $base-line-height - $font-size) < ($min-line-padding * 2) { + $lines: $lines + if($round-to-nearest-half-line, 0.5, 1); + } + @return $lines; +} + + +// @private Outputs rhythm values. For rem units, outputs pixel fallbacks +// by default. +@mixin output-rhythm($property, $values) { + @if $rhythm-unit == rem and $rem-with-px-fallback { + @include rem($property, $values); + } + @else { + $output: (); + @each $value in $values { + @if unit($value) == px { + // Ensure all pixel values are rounded to the nearest pixel. + $output: join($output, round($value)); + } + @else { + $output: join($output, $value); + } + } + #{$property}: $output; + } +} + +// Establishes a font baseline for the given font-size. +@mixin establish-baseline($font-size: $base-font-size) { + $relative-size: 100% * ($font-size / $browser-default-font-size); + + @if $compass-rhythm-support-ie6 and (not $relative-font-sizing) { + // IE 6 refuses to resize fonts set in pixels and it weirdly resizes fonts + // whose root is set in ems. So we set the root font size in percentages of + // the default font size, even if we are using absolute sizes elsewhere. + * html { font-size: $relative-size; } + } + html { + font-size: if($relative-font-sizing, $relative-size, $font-size); + + // Webkit has a bug that prevents line-height being set in rem on ; + // To work around this and simplify output, we can set initial line-height + // in ems for all relative rhythm units, even when $rhythm-unit is `rem`. + @if $relative-font-sizing { + line-height: convert-length($base-line-height, em); + } + @else { + line-height: round($base-line-height); + } + } +} + +// Resets the baseline to 1 rhythm unit +// Does not work on elements whose font-size is different from $base-font-size. +// +// @deprecated This mixin will be removed in the next release. +// Please use `adjust-leading-to(1)` instead. +@mixin reset-baseline($font-size: $base-font-size) { + @include adjust-leading-to(1, $font-size); +} + +// Show a background image that can be used to debug your alignments. +// As this is a development feature, this mixin never outputs pixel fallbacks +// for rem output. +// Include the $img argument if you would rather use your own image than the +// Compass default gradient image. +@mixin debug-vertical-alignment($img: false) { + @if $img { + background: image-url($img); + } + @else { + @include baseline-grid-background(if($round-to-nearest-half-line, rhythm(1/2), rhythm(1))); + } +} + +// Adjust a block to have a different font size and line height to maintain the +// rhythm. $lines specifies how many multiples of the baseline rhythm each line +// of this font should use up. It does not have to be an integer, but it +// defaults to the smallest integer that is large enough to fit the font. +// Use $from-size to adjust from a font-size other than the base font-size. +@mixin adjust-font-size-to($to-size, $lines: auto, $from-size: $base-font-size) { + $to-size: convert-length($to-size, px, $from-size); + @if $lines == auto { + $lines: lines-for-font-size($to-size); + } + @include output-rhythm(font-size, convert-length($to-size, $rhythm-unit, $from-size)); + @include adjust-leading-to($lines, $to-size); +} + +// Adjust a block to have different line height to maintain the rhythm. +// $lines specifies how many multiples of the baseline rhythm each line of this +// font should use up. It does not have to be an integer, but it defaults to the +// smallest integer that is large enough to fit the font. +@mixin adjust-leading-to($lines, $font-size: $base-font-size) { + @include output-rhythm(line-height, rhythm($lines, $font-size)); +} + +// Apply leading whitespace. The $property can be margin or padding. +@mixin leader($lines: 1, $font-size: $base-font-size, $property: margin) { + @include output-rhythm(#{$property}-top, rhythm($lines, $font-size)); +} + +// Apply leading whitespace as padding. +@mixin padding-leader($lines: 1, $font-size: $base-font-size) { + @include output-rhythm(padding-top, rhythm($lines, $font-size)); +} + +// Apply leading whitespace as margin. +@mixin margin-leader($lines: 1, $font-size: $base-font-size) { + @include output-rhythm(margin-top, rhythm($lines, $font-size)); +} + +// Apply trailing whitespace. The $property can be margin or padding. +@mixin trailer($lines: 1, $font-size: $base-font-size, $property: margin) { + @include output-rhythm(#{$property}-bottom, rhythm($lines, $font-size)); +} + +// Apply trailing whitespace as padding. +@mixin padding-trailer($lines: 1, $font-size: $base-font-size) { + @include output-rhythm(padding-bottom, rhythm($lines, $font-size)); +} + +// Apply trailing whitespace as margin. +@mixin margin-trailer($lines: 1, $font-size: $base-font-size) { + @include output-rhythm(margin-bottom, rhythm($lines, $font-size)); +} + +// Shorthand mixin to apply whitespace for top and bottom margins and padding. +@mixin rhythm( + $leader: 1, + $padding-leader: 0, + $padding-trailer: $padding-leader, + $trailer: $leader, + $font-size: $base-font-size +) { + @include leader($leader, $font-size); + @include padding-leader($padding-leader, $font-size); + @include padding-trailer($padding-trailer, $font-size); + @include trailer($trailer, $font-size); +} + +// Shorthand mixin to apply whitespace for top and bottom margins. +@mixin rhythm-margins( + $leader: 1, + $trailer: $leader, + $font-size: $base-font-size +) { + @include leader($leader, $font-size); + @include trailer($trailer, $font-size); +} + +// Shorthand mixin to apply whitespace for top and bottom padding. +@mixin rhythm-padding( + $padding-leader: 1, + $padding-trailer: $padding-leader, + $font-size: $base-font-size +) { + @include padding-leader($padding-leader, $font-size); + @include padding-trailer($padding-trailer, $font-size); +} + +// Apply a border and whitespace to any side without destroying the vertical +// rhythm. The whitespace must be greater than the width of the border. +@mixin apply-side-rhythm-border( + $side, + $width: $default-rhythm-border-width, + $lines: 1, + $font-size: $base-font-size, + $border-style: $default-rhythm-border-style +) { + // If applying borders to all sides, use shorthand properties + $border-prop: if($side == all, border, border-#{$side}); + @include output-rhythm(#{$border-prop}-width, convert-length($width, $rhythm-unit, $font-size)); + #{$border-prop}-style: nth($border-style, 1); + @if type-of($border-style) == list and length($border-style) > 1 { + #{$border-prop}-color: nth($border-style, 2); + } + $padding-prop: if($side == all, padding, padding-#{$side}); + @include output-rhythm(#{$padding-prop}, rhythm($lines, $font-size, $offset: $width)); +} + +// Apply a leading border. +// $border-style and $width are deprecated and will be removed in a future version of Compass. +@mixin leading-border( + $width: $default-rhythm-border-width, + $lines: 1, + $font-size: $base-font-size, + $border-style: $default-rhythm-border-style +) { + @include apply-side-rhythm-border(top, $width, $lines, $font-size, $border-style); +} + +// Apply a trailing border. +@mixin trailing-border( + $width: $default-rhythm-border-width, + $lines: 1, + $font-size: $base-font-size, + $border-style: $default-rhythm-border-style +) { + @include apply-side-rhythm-border(bottom, $width, $lines, $font-size, $border-style); +} + +// Apply both leading and trailing borders. +@mixin horizontal-borders( + $width: $default-rhythm-border-width, + $lines: 1, + $font-size: $base-font-size, + $border-style: $default-rhythm-border-style +) { + @include leading-border($width, $lines, $font-size, $border-style); + @include trailing-border($width, $lines, $font-size, $border-style); +} + +// Alias for `horizontal-borders` mixin. +@mixin h-borders( + $width: $default-rhythm-border-width, + $lines: 1, + $font-size: $base-font-size, + $border-style: $default-rhythm-border-style +) { + @include horizontal-borders($width, $lines, $font-size, $border-style); +} + +// Apply borders and whitespace equally to all sides. +@mixin rhythm-borders( + $width: $default-rhythm-border-width, + $lines: 1, + $font-size: $base-font-size, + $border-style: $default-rhythm-border-style +) { + @include apply-side-rhythm-border(all, $width, $lines, $font-size, $border-style); +} diff --git a/STYLEGUIDE_TEMPLATE/source/index.html b/STYLEGUIDE_TEMPLATE/source/index.html index f48f53b..7d397d4 100644 --- a/STYLEGUIDE_TEMPLATE/source/index.html +++ b/STYLEGUIDE_TEMPLATE/source/index.html @@ -5,42 +5,40 @@ title: Styleguide --- -
-
-
Living Styleguide
-

{{ site.title }}

-
-
-
-

Elements

-

Elements are the foundation of the system. Simply using typography and color, well designed Elements can begin to express the site's personality.

-
    - {% for styleguide in data.styleguides %} - {% if styleguide.section == "element" %} -
  • {{ styleguide.title }}
    • - {% endif %} - {% endfor %} -
-
-
-

Components

-

Based on the needs of the content, Components are arranged into specific layouts to create Templates.

-
    - - {% for styleguide in data.styleguides %} - {% if styleguide.section == "component" %} -
  • {{ styleguide.title }}
    • - {% endif %} - {% endfor %} - -
-
-
-

Templates

-

Based on the needs of the content, Components are arranged into specific layouts to create Templates.

- -
-
+
+
+
Living Styleguide
+

{{ site.title }}

+
+
+
+

Elements

+

Elements are the foundation of the system. Simply using typography and color, well designed Elements can begin to express the site's personality.

+
    + {% for styleguide in data.styleguides %} + {% if styleguide.section == "element" %} +
  • {{ styleguide.title }}
    • + {% endif %} + {% endfor %} +
+
+
+

Components

+

Based on the needs of the content, Components are arranged into specific layouts to create Templates.

+
    + {% for styleguide in data.styleguides %} + {% if styleguide.section == "component" %} +
  • {{ styleguide.title }}
    • + {% endif %} + {% endfor %} +
+
+
+

Templates

+

Based on the needs of the content, Components are arranged into specific layouts to create Templates.

+
+
+
diff --git a/STYLEGUIDE_TEMPLATE/source/styleguide/element-color-palette.html b/STYLEGUIDE_TEMPLATE/source/styleguide/element-color-palette.html index 07b3b3f..1536ba1 100644 --- a/STYLEGUIDE_TEMPLATE/source/styleguide/element-color-palette.html +++ b/STYLEGUIDE_TEMPLATE/source/styleguide/element-color-palette.html @@ -10,13 +10,11 @@

Primary Palette

-
Variable: {{ page.variable }}
Hex: # {{ page.hex }}
-
diff --git a/STYLEGUIDE_TEMPLATE/source/styleguide/element-grid.html b/STYLEGUIDE_TEMPLATE/source/styleguide/element-grid.html index c85d84e..c045d93 100644 --- a/STYLEGUIDE_TEMPLATE/source/styleguide/element-grid.html +++ b/STYLEGUIDE_TEMPLATE/source/styleguide/element-grid.html @@ -5,17 +5,11 @@ title: Grid System description: Add Description. --- - -
+
-

Default 12 Column grid layout classes

-

Re-use or modify to suit the needs of your project’s content.

+

12 Column "Isolation" grid layout classes

+

Perfect for single row layouts

@@ -84,5 +78,91 @@

Default 12 Column grid layout classes

l-66-33--2

+
+ +
+
+

12 Column "Float" grid layout classes

+

Perfect for multi-row layouts

+
+ +
+

l-1up

+
+ +
+
+

l-2up

+
+
+

l-2up

+
+
+ +
+
+

l-3up

+
+
+

l-3up

+
+
+

l-3up

+
+
+
+
+

l-4up

+
+
+

l-4up

+
+
+

l-4up

+
+
+

l-4up

+
+
+ +
+
+

l-6up

+
+
+

l-6up

+
+
+

l-6up

+
+
+

l-6up

+
+
+

l-6up

+
+
+

l-6up

+
+
+
+ +
+
+

Nested grid example

+

If need be you can nest items inside each other

+
+ +
+
+

l-6up

+

l-6up

+

l-3up (last)

+
+
+ +
+

l-3up--2

+
diff --git a/STYLEGUIDE_TEMPLATE/source/styleguide/element-typography.html b/STYLEGUIDE_TEMPLATE/source/styleguide/element-typography.html index 953aea3..40159b4 100644 --- a/STYLEGUIDE_TEMPLATE/source/styleguide/element-typography.html +++ b/STYLEGUIDE_TEMPLATE/source/styleguide/element-typography.html @@ -17,7 +17,7 @@
H5: It is a Period of Civil War Lorem ipsum dolor sit amet, consectetuer adi
H6: It is a Period of Civil War Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
- Paragraphs & Lists + Paragraphs & Lists

It is a period of civil war. Rebel spaceships, striking from a hidden base, have won their first victory against the evil Galactic Empire.

During the battle, Rebel spies managed to steal secret plans to the Empire’s ultimate weapon, the Death Star, an armored space station with enough power to destroy an entire planet.

@@ -60,7 +60,7 @@
H6: It is a Period of Civil War Lorem ipsum dolor sit amet, consectetuer adi

The u element is text with an unarticulated, though explicitly rendered, non-textual annotation

This text is deleted and This text is inserted

This text has a strikethrough

-

Superscript®

+

Superscript®

Subscript for things like H2O

This small text is small for for fine print, etc.

Abbreviation: HTML

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index c2071de..4084e3d 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,21 +1,21 @@ { "name": "butler", - "version": "1.0.0", + "version": "2.0.0", "dependencies": { "abbrev": { - "version": "1.0.7", + "version": "1.0.9", "from": "abbrev@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz" + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz" }, "alphanum-sort": { "version": "1.0.2", "from": "alphanum-sort@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz" }, - "ansi": { - "version": "0.3.1", - "from": "ansi@>=0.3.1 <0.4.0", - "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz" + "amdefine": { + "version": "1.0.0", + "from": "amdefine@>=0.0.4", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz" }, "ansi-regex": { "version": "2.0.0", @@ -23,16 +23,14 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz" }, "ansi-styles": { - "version": "2.2.0", - "from": "ansi-styles@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.0.tgz", - "dependencies": { - "color-convert": { - "version": "1.0.0", - "from": "color-convert@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.0.0.tgz" - } - } + "version": "2.2.1", + "from": "ansi-styles@>=2.2.1 <3.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz" + }, + "aproba": { + "version": "1.0.4", + "from": "aproba@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz" }, "archy": { "version": "1.0.0", @@ -40,14 +38,14 @@ "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz" }, "are-we-there-yet": { - "version": "1.0.6", - "from": "are-we-there-yet@>=1.0.6 <1.1.0", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.6.tgz" + "version": "1.1.2", + "from": "are-we-there-yet@>=1.1.2 <1.2.0", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz" }, "argparse": { - "version": "1.0.6", - "from": "argparse@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.6.tgz" + "version": "1.0.7", + "from": "argparse@>=1.0.7 <2.0.0", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.7.tgz" }, "arr-diff": { "version": "2.0.0", @@ -66,7 +64,7 @@ }, "array-find-index": { "version": "1.0.1", - "from": "array-find-index@>=1.0.0 <2.0.0", + "from": "array-find-index@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.1.tgz" }, "array-index": { @@ -75,14 +73,14 @@ "resolved": "https://registry.npmjs.org/array-index/-/array-index-1.0.0.tgz" }, "array-union": { - "version": "1.0.1", + "version": "1.0.2", "from": "array-union@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.1.tgz" + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz" }, "array-uniq": { - "version": "1.0.2", + "version": "1.0.3", "from": "array-uniq@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz" + "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz" }, "array-unique": { "version": "0.2.1", @@ -106,7 +104,7 @@ }, "async": { "version": "1.5.2", - "from": "async@>=1.4.0 <2.0.0", + "from": "async@>=1.5.2 <2.0.0", "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz" }, "async-foreach": { @@ -115,9 +113,9 @@ "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz" }, "autoprefixer": { - "version": "6.3.3", + "version": "6.3.7", "from": "autoprefixer@>=6.3.3 <7.0.0", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.3.3.tgz" + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.3.7.tgz" }, "aws-sign2": { "version": "0.6.0", @@ -125,16 +123,9 @@ "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz" }, "aws4": { - "version": "1.3.2", + "version": "1.4.1", "from": "aws4@>=1.2.1 <2.0.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.3.2.tgz", - "dependencies": { - "lru-cache": { - "version": "4.0.0", - "from": "lru-cache@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.0.tgz" - } - } + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz" }, "balanced-match": { "version": "0.1.0", @@ -147,21 +138,26 @@ "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz" }, "bl": { - "version": "1.0.3", - "from": "bl@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz", + "version": "1.1.2", + "from": "bl@>=1.1.2 <1.2.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz", "dependencies": { + "isarray": { + "version": "1.0.0", + "from": "isarray@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + }, "readable-stream": { - "version": "2.0.5", + "version": "2.0.6", "from": "readable-stream@>=2.0.5 <2.1.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.5.tgz" + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz" } } }, "block-stream": { - "version": "0.0.8", + "version": "0.0.9", "from": "block-stream@*", - "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz" + "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz" }, "boom": { "version": "2.10.1", @@ -169,21 +165,21 @@ "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz" }, "brace-expansion": { - "version": "1.1.3", + "version": "1.1.6", "from": "brace-expansion@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.3.tgz", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", "dependencies": { "balanced-match": { - "version": "0.3.0", - "from": "balanced-match@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz" + "version": "0.4.2", + "from": "balanced-match@>=0.4.1 <0.5.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz" } } }, "braces": { - "version": "1.8.3", + "version": "1.8.5", "from": "braces@>=1.8.2 <2.0.0", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.3.tgz" + "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz" }, "breakpoint-sass": { "version": "2.7.0", @@ -191,9 +187,14 @@ "resolved": "https://registry.npmjs.org/breakpoint-sass/-/breakpoint-sass-2.7.0.tgz" }, "browserslist": { - "version": "1.1.3", - "from": "browserslist@>=1.1.3 <1.2.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.1.3.tgz" + "version": "1.3.5", + "from": "browserslist@>=1.3.4 <1.4.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.3.5.tgz" + }, + "buffer-shims": { + "version": "1.0.0", + "from": "buffer-shims@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz" }, "builtin-modules": { "version": "1.1.1", @@ -201,19 +202,19 @@ "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz" }, "camelcase": { - "version": "2.1.0", + "version": "2.1.1", "from": "camelcase@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.0.tgz" + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz" }, "camelcase-keys": { - "version": "2.0.0", + "version": "2.1.0", "from": "camelcase-keys@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.0.0.tgz" + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz" }, "caniuse-db": { - "version": "1.0.30000415", - "from": "caniuse-db@>=1.0.30000409 <2.0.0", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000415.tgz" + "version": "1.0.30000510", + "from": "caniuse-db@>=1.0.30000488 <2.0.0", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000510.tgz" }, "caseless": { "version": "0.11.0", @@ -221,9 +222,9 @@ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz" }, "chalk": { - "version": "1.1.1", - "from": "chalk@1.1.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz", + "version": "1.1.3", + "from": "chalk@>=1.1.3 <2.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "dependencies": { "supports-color": { "version": "2.0.0", @@ -233,18 +234,18 @@ } }, "clap": { - "version": "1.0.10", + "version": "1.1.1", "from": "clap@>=1.0.9 <2.0.0", - "resolved": "https://registry.npmjs.org/clap/-/clap-1.0.10.tgz" + "resolved": "https://registry.npmjs.org/clap/-/clap-1.1.1.tgz" }, "cliui": { - "version": "3.1.0", - "from": "cliui@>=3.0.3 <4.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.1.0.tgz" + "version": "3.2.0", + "from": "cliui@>=3.2.0 <4.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz" }, "clone": { "version": "1.0.2", - "from": "clone@>=1.0.0 <2.0.0", + "from": "clone@>=1.0.2 <2.0.0", "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz" }, "clone-regexp": { @@ -268,14 +269,19 @@ "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz" }, "color": { - "version": "0.11.1", + "version": "0.11.3", "from": "color@>=0.11.0 <0.12.0", - "resolved": "https://registry.npmjs.org/color/-/color-0.11.1.tgz" + "resolved": "https://registry.npmjs.org/color/-/color-0.11.3.tgz" }, "color-convert": { - "version": "0.5.3", - "from": "color-convert@>=0.5.3 <0.6.0", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz" + "version": "1.3.1", + "from": "color-convert@>=1.3.0 <2.0.0", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.3.1.tgz" + }, + "color-diff": { + "version": "0.1.7", + "from": "color-diff@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/color-diff/-/color-diff-0.1.7.tgz" }, "color-name": { "version": "1.1.1", @@ -287,10 +293,22 @@ "from": "color-string@>=0.3.0 <0.4.0", "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz" }, + "colorguard": { + "version": "1.2.0", + "from": "colorguard@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/colorguard/-/colorguard-1.2.0.tgz", + "dependencies": { + "yargs": { + "version": "1.3.3", + "from": "yargs@>=1.2.6 <2.0.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz" + } + } + }, "colormin": { - "version": "1.1.0", + "version": "1.1.1", "from": "colormin@>=1.0.5 <2.0.0", - "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.0.tgz" + "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.1.tgz" }, "colors": { "version": "1.1.2", @@ -312,27 +330,15 @@ "from": "concat-map@0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" }, - "concat-stream": { - "version": "1.5.1", - "from": "concat-stream@>=1.4.7 <2.0.0", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.1.tgz", - "dependencies": { - "readable-stream": { - "version": "2.0.5", - "from": "readable-stream@>=2.0.0 <2.1.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.5.tgz" - } - } - }, - "config-chain": { - "version": "1.1.10", - "from": "config-chain@>=1.1.8 <1.2.0", - "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.10.tgz" + "console-control-strings": { + "version": "1.1.0", + "from": "console-control-strings@>=1.1.0 <1.2.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz" }, "convert-source-map": { - "version": "1.2.0", + "version": "1.3.0", "from": "convert-source-map@>=1.1.1 <2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.2.0.tgz" + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.3.0.tgz" }, "core-util-is": { "version": "1.0.2", @@ -352,19 +358,14 @@ } }, "cross-spawn": { - "version": "2.1.5", - "from": "cross-spawn@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-2.1.5.tgz" - }, - "cross-spawn-async": { - "version": "2.1.9", - "from": "cross-spawn-async@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.1.9.tgz", + "version": "3.0.1", + "from": "cross-spawn@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", "dependencies": { "lru-cache": { - "version": "4.0.0", - "from": "lru-cache@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.0.tgz" + "version": "4.0.1", + "from": "lru-cache@>=4.0.1 <5.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz" } } }, @@ -374,19 +375,46 @@ "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz" }, "css-color-names": { - "version": "0.0.3", - "from": "css-color-names@0.0.3", - "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.3.tgz" + "version": "0.0.4", + "from": "css-color-names@0.0.4", + "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz" + }, + "css-rule-stream": { + "version": "1.1.0", + "from": "css-rule-stream@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/css-rule-stream/-/css-rule-stream-1.1.0.tgz", + "dependencies": { + "readable-stream": { + "version": "1.0.34", + "from": "readable-stream@>=1.0.33-1 <1.1.0-0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz" + }, + "through2": { + "version": "0.6.5", + "from": "through2@>=0.6.3 <0.7.0", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz" + } + } + }, + "css-tokenize": { + "version": "1.0.1", + "from": "css-tokenize@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/css-tokenize/-/css-tokenize-1.0.1.tgz" }, "cssnano": { - "version": "3.5.2", + "version": "3.7.3", "from": "cssnano@>=3.5.2 <4.0.0", - "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.5.2.tgz" + "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.7.3.tgz" }, "csso": { - "version": "1.4.4", - "from": "csso@>=1.4.2 <1.5.0", - "resolved": "https://registry.npmjs.org/csso/-/csso-1.4.4.tgz" + "version": "2.0.0", + "from": "csso@>=2.0.0 <2.1.0", + "resolved": "https://registry.npmjs.org/csso/-/csso-2.0.0.tgz" + }, + "currently-unhandled": { + "version": "0.4.1", + "from": "currently-unhandled@>=0.4.1 <0.5.0", + "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz" }, "d": { "version": "0.1.1", @@ -394,9 +422,9 @@ "resolved": "https://registry.npmjs.org/d/-/d-0.1.1.tgz" }, "dashdash": { - "version": "1.13.0", - "from": "dashdash@>=1.10.1 <2.0.0", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.13.0.tgz", + "version": "1.14.0", + "from": "dashdash@>=1.12.0 <2.0.0", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz", "dependencies": { "assert-plus": { "version": "1.0.0", @@ -416,9 +444,9 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz" }, "decamelize": { - "version": "1.1.2", + "version": "1.2.0", "from": "decamelize@>=1.1.2 <2.0.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.1.2.tgz" + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz" }, "defaults": { "version": "1.0.3", @@ -445,30 +473,82 @@ "from": "deprecated@>=0.0.1 <0.0.2", "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz" }, + "detect-file": { + "version": "0.1.0", + "from": "detect-file@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-0.1.0.tgz" + }, + "doiuse": { + "version": "2.4.1", + "from": "doiuse@>=2.3.0 <3.0.0", + "resolved": "https://registry.npmjs.org/doiuse/-/doiuse-2.4.1.tgz", + "dependencies": { + "lodash": { + "version": "4.14.0", + "from": "lodash@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.0.tgz" + }, + "readable-stream": { + "version": "1.0.34", + "from": "readable-stream@>=1.0.33-1 <1.1.0-0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz" + }, + "source-map": { + "version": "0.4.4", + "from": "source-map@>=0.4.2 <0.5.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz" + }, + "through2": { + "version": "0.6.5", + "from": "through2@>=0.6.3 <0.7.0", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz" + }, + "window-size": { + "version": "0.1.4", + "from": "window-size@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz" + }, + "yargs": { + "version": "3.32.0", + "from": "yargs@>=3.5.4 <4.0.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz" + } + } + }, + "duplexer": { + "version": "0.1.1", + "from": "duplexer@>=0.1.1 <0.2.0" + }, "duplexer2": { "version": "0.0.2", "from": "duplexer2@0.0.2", "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz" }, "duplexify": { - "version": "3.4.3", + "version": "3.4.5", "from": "duplexify@>=3.2.0 <4.0.0", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.4.3.tgz", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.4.5.tgz", "dependencies": { "end-of-stream": { "version": "1.0.0", "from": "end-of-stream@1.0.0", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz" }, + "isarray": { + "version": "1.0.0", + "from": "isarray@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + }, "readable-stream": { - "version": "2.0.5", - "from": "readable-stream@>=2.0.0 <3.0.0" + "version": "2.1.4", + "from": "readable-stream@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz" } } }, "ecc-jsbn": { "version": "0.1.1", - "from": "ecc-jsbn@>=0.0.1 <1.0.0", + "from": "ecc-jsbn@>=0.1.1 <0.2.0", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz" }, "end-of-stream": { @@ -482,9 +562,9 @@ "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz" }, "es5-ext": { - "version": "0.10.11", - "from": "es5-ext@>=0.10.10 <0.11.0", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.11.tgz" + "version": "0.10.12", + "from": "es5-ext@>=0.10.11 <0.11.0", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.12.tgz" }, "es6-iterator": { "version": "2.0.0", @@ -497,13 +577,13 @@ "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz" }, "es6-symbol": { - "version": "3.0.2", + "version": "3.1.0", "from": "es6-symbol@>=3.0.2 <4.0.0", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.0.2.tgz" + "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.0.tgz" }, "escape-string-regexp": { "version": "1.0.5", - "from": "escape-string-regexp@>=1.0.4 <2.0.0", + "from": "escape-string-regexp@>=1.0.2 <2.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" }, "esprima": { @@ -517,19 +597,24 @@ "resolved": "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz" }, "expand-brackets": { - "version": "0.1.4", + "version": "0.1.5", "from": "expand-brackets@>=0.1.4 <0.2.0", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.4.tgz" + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz" }, "expand-range": { - "version": "1.8.1", + "version": "1.8.2", "from": "expand-range@>=1.8.1 <2.0.0", - "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.1.tgz" + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz" + }, + "expand-tilde": { + "version": "1.2.2", + "from": "expand-tilde@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz" }, "extend": { - "version": "2.0.1", - "from": "extend@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/extend/-/extend-2.0.1.tgz" + "version": "3.0.0", + "from": "extend@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz" }, "extend-shallow": { "version": "2.0.1", @@ -567,14 +652,26 @@ "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz" }, "find-up": { - "version": "1.1.1", + "version": "1.1.2", "from": "find-up@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.1.tgz" + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz" }, "findup-sync": { - "version": "0.3.0", - "from": "findup-sync@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz" + "version": "0.4.2", + "from": "findup-sync@>=0.4.2 <0.5.0", + "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.2.tgz" + }, + "fined": { + "version": "1.0.1", + "from": "fined@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/fined/-/fined-1.0.1.tgz", + "dependencies": { + "lodash.isarray": { + "version": "4.0.0", + "from": "lodash.isarray@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-4.0.0.tgz" + } + } }, "first-chunk-stream": { "version": "1.0.0", @@ -582,9 +679,9 @@ "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz" }, "flagged-respawn": { - "version": "0.3.1", - "from": "flagged-respawn@>=0.3.1 <0.4.0", - "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.1.tgz" + "version": "0.3.2", + "from": "flagged-respawn@>=0.3.2 <0.4.0", + "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.2.tgz" }, "flatten": { "version": "1.0.2", @@ -592,14 +689,14 @@ "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz" }, "for-in": { - "version": "0.1.4", - "from": "for-in@>=0.1.4 <0.2.0", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.4.tgz" + "version": "0.1.5", + "from": "for-in@>=0.1.5 <0.2.0", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.5.tgz" }, "for-own": { - "version": "0.1.3", + "version": "0.1.4", "from": "for-own@>=0.1.3 <0.2.0", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.3.tgz" + "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.4.tgz" }, "forever-agent": { "version": "0.6.1", @@ -607,19 +704,34 @@ "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz" }, "form-data": { - "version": "1.0.0-rc3", - "from": "form-data@>=1.0.0-rc3 <1.1.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz" + "version": "1.0.0-rc4", + "from": "form-data@>=1.0.0-rc4 <1.1.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz" + }, + "fs-exists-sync": { + "version": "0.1.0", + "from": "fs-exists-sync@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz" + }, + "fs.realpath": { + "version": "1.0.0", + "from": "fs.realpath@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" }, "fstream": { - "version": "1.0.8", + "version": "1.0.10", "from": "fstream@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz" + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.10.tgz" + }, + "gather-stream": { + "version": "1.0.0", + "from": "gather-stream@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/gather-stream/-/gather-stream-1.0.0.tgz" }, "gauge": { - "version": "1.2.7", - "from": "gauge@>=1.2.5 <1.3.0", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.7.tgz" + "version": "2.6.0", + "from": "gauge@>=2.6.0 <2.7.0", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz" }, "gaze": { "version": "0.5.2", @@ -636,20 +748,37 @@ "from": "generate-object-property@>=1.1.0 <2.0.0", "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz" }, + "get-caller-file": { + "version": "1.0.1", + "from": "get-caller-file@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.1.tgz" + }, "get-stdin": { "version": "4.0.1", "from": "get-stdin@>=4.0.1 <5.0.0", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz" }, + "getpass": { + "version": "0.1.6", + "from": "getpass@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz", + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "from": "assert-plus@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" + } + } + }, "gift": { "version": "0.6.1", "from": "gift@>=0.6.1 <0.7.0", "resolved": "https://registry.npmjs.org/gift/-/gift-0.6.1.tgz" }, "glob": { - "version": "5.0.15", - "from": "glob@>=5.0.0 <5.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz" + "version": "4.5.3", + "from": "glob@>=4.3.1 <5.0.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz" }, "glob-base": { "version": "0.3.0", @@ -666,20 +795,10 @@ "from": "glob-stream@>=3.1.5 <4.0.0", "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz", "dependencies": { - "glob": { - "version": "4.5.3", - "from": "glob@>=4.3.1 <5.0.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz" - }, - "minimatch": { - "version": "2.0.10", - "from": "minimatch@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz" - }, "readable-stream": { - "version": "1.0.33", + "version": "1.0.34", "from": "readable-stream@>=1.0.33-1 <1.1.0-0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz" + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz" }, "through2": { "version": "0.6.5", @@ -698,10 +817,20 @@ "from": "glob2base@>=0.0.12 <0.0.13", "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz" }, + "global-modules": { + "version": "0.2.3", + "from": "global-modules@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz" + }, + "global-prefix": { + "version": "0.1.4", + "from": "global-prefix@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.4.tgz" + }, "globby": { - "version": "4.0.0", + "version": "4.1.0", "from": "globby@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-4.0.0.tgz", + "resolved": "https://registry.npmjs.org/globby/-/globby-4.1.0.tgz", "dependencies": { "glob": { "version": "6.0.4", @@ -748,9 +877,9 @@ "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz" }, "graceful-fs": { - "version": "4.1.3", + "version": "4.1.5", "from": "graceful-fs@>=4.1.2 <5.0.0", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.3.tgz" + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.5.tgz" }, "graceful-readlink": { "version": "1.0.1", @@ -776,23 +905,27 @@ }, "gulp-gh-pages": { "version": "0.5.4", - "from": "gulp-gh-pages@latest", + "from": "gulp-gh-pages@>=0.5.4 <0.6.0", "resolved": "https://registry.npmjs.org/gulp-gh-pages/-/gulp-gh-pages-0.5.4.tgz", "dependencies": { - "extend": { - "version": "3.0.0", - "from": "extend@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz" + "glob": { + "version": "5.0.15", + "from": "glob@>=5.0.3 <6.0.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz" }, "glob-stream": { "version": "5.3.2", "from": "glob-stream@>=5.3.2 <6.0.0", "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.2.tgz", "dependencies": { + "isarray": { + "version": "0.0.1", + "from": "isarray@0.0.1" + }, "readable-stream": { - "version": "1.0.33", + "version": "1.0.34", "from": "readable-stream@>=1.0.33-1 <1.1.0-0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz" + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz" }, "through2": { "version": "0.6.5", @@ -801,15 +934,20 @@ } } }, + "isarray": { + "version": "1.0.0", + "from": "isarray@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + }, "ordered-read-streams": { "version": "0.3.0", "from": "ordered-read-streams@>=0.3.0 <0.4.0", "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz" }, "readable-stream": { - "version": "2.0.5", + "version": "2.1.4", "from": "readable-stream@>=2.0.2 <3.0.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.5.tgz" + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz" }, "unique-stream": { "version": "2.2.1", @@ -822,21 +960,21 @@ "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.1.1.tgz" }, "vinyl-fs": { - "version": "2.4.2", + "version": "2.4.3", "from": "vinyl-fs@>=2.2.1 <3.0.0", - "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.2.tgz" + "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.3.tgz" } } }, "gulp-postcss": { - "version": "6.1.0", + "version": "6.1.1", "from": "gulp-postcss@>=6.1.0 <7.0.0", - "resolved": "https://registry.npmjs.org/gulp-postcss/-/gulp-postcss-6.1.0.tgz" + "resolved": "https://registry.npmjs.org/gulp-postcss/-/gulp-postcss-6.1.1.tgz" }, "gulp-sass": { - "version": "2.2.0", + "version": "2.3.2", "from": "gulp-sass@>=2.2.0 <3.0.0", - "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-2.2.0.tgz" + "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-2.3.2.tgz" }, "gulp-sourcemaps": { "version": "1.6.0", @@ -845,7 +983,8 @@ "dependencies": { "vinyl": { "version": "1.1.1", - "from": "vinyl@>=1.0.0 <2.0.0" + "from": "vinyl@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.1.1.tgz" } } }, @@ -881,6 +1020,11 @@ "from": "has-ansi@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz" }, + "has-color": { + "version": "0.1.7", + "from": "has-color@>=0.1.7 <0.2.0", + "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz" + }, "has-flag": { "version": "1.0.0", "from": "has-flag@>=1.0.0 <2.0.0", @@ -897,13 +1041,13 @@ "resolved": "https://registry.npmjs.org/has-own/-/has-own-1.0.0.tgz" }, "has-unicode": { - "version": "2.0.0", + "version": "2.0.1", "from": "has-unicode@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.0.tgz" + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz" }, "hawk": { "version": "3.1.3", - "from": "hawk@>=3.1.0 <3.2.0", + "from": "hawk@>=3.1.3 <3.2.0", "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz" }, "hoek": { @@ -912,15 +1056,25 @@ "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz" }, "hosted-git-info": { - "version": "2.1.4", + "version": "2.1.5", "from": "hosted-git-info@>=2.1.4 <3.0.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz" + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz" + }, + "html-comment-regex": { + "version": "1.1.1", + "from": "html-comment-regex@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz" }, "http-signature": { "version": "1.1.1", "from": "http-signature@>=1.1.0 <1.2.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz" }, + "in-publish": { + "version": "2.0.0", + "from": "in-publish@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz" + }, "indent-string": { "version": "2.1.0", "from": "indent-string@>=2.1.0 <3.0.0", @@ -932,14 +1086,9 @@ "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz" }, "inflight": { - "version": "1.0.4", + "version": "1.0.5", "from": "inflight@>=1.0.4 <2.0.0", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz" - }, - "inherit": { - "version": "2.2.3", - "from": "inherit@>=2.2.2 <3.0.0", - "resolved": "https://registry.npmjs.org/inherit/-/inherit-2.2.3.tgz" + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz" }, "inherits": { "version": "2.0.1", @@ -948,28 +1097,40 @@ }, "ini": { "version": "1.3.4", - "from": "ini@>=1.2.0 <2.0.0", + "from": "ini@>=1.3.4 <2.0.0", "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz" }, "install": { - "version": "0.5.4", + "version": "0.5.7", "from": "install@>=0.5.4 <0.6.0", - "resolved": "https://registry.npmjs.org/install/-/install-0.5.4.tgz" + "resolved": "https://registry.npmjs.org/install/-/install-0.5.7.tgz" }, "interpret": { - "version": "1.0.0", + "version": "1.0.1", "from": "interpret@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.0.tgz" + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.1.tgz" }, "invert-kv": { "version": "1.0.0", "from": "invert-kv@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz" }, + "irregular-plurals": { + "version": "1.2.0", + "from": "irregular-plurals@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.2.0.tgz" + }, "is-absolute": { - "version": "0.1.7", - "from": "is-absolute@>=0.1.7 <0.2.0", - "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz" + "version": "0.2.5", + "from": "is-absolute@>=0.2.3 <0.3.0", + "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.5.tgz", + "dependencies": { + "is-windows": { + "version": "0.1.1", + "from": "is-windows@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.1.1.tgz" + } + } }, "is-absolute-url": { "version": "2.0.0", @@ -982,9 +1143,9 @@ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz" }, "is-buffer": { - "version": "1.1.2", + "version": "1.1.3", "from": "is-buffer@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.2.tgz" + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.3.tgz" }, "is-builtin-module": { "version": "1.0.0", @@ -1010,7 +1171,7 @@ }, "is-equal-shallow": { "version": "0.1.3", - "from": "is-equal-shallow@>=0.1.1 <0.2.0", + "from": "is-equal-shallow@>=0.1.3 <0.2.0", "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz" }, "is-extendable": { @@ -1035,7 +1196,7 @@ }, "is-glob": { "version": "2.0.1", - "from": "is-glob@>=2.0.0 <3.0.0", + "from": "is-glob@>=2.0.1 <3.0.0", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz" }, "is-my-json-valid": { @@ -1053,6 +1214,11 @@ "from": "is-plain-obj@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz" }, + "is-posix-bracket": { + "version": "0.1.1", + "from": "is-posix-bracket@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz" + }, "is-primitive": { "version": "2.0.0", "from": "is-primitive@>=2.0.0 <3.0.0", @@ -1069,14 +1235,14 @@ "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz" }, "is-relative": { - "version": "0.1.3", - "from": "is-relative@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz" + "version": "0.2.1", + "from": "is-relative@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz" }, "is-stream": { - "version": "1.0.1", + "version": "1.1.0", "from": "is-stream@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.0.1.tgz" + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz" }, "is-supported-regexp-flag": { "version": "1.0.0", @@ -1084,15 +1250,20 @@ "resolved": "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz" }, "is-svg": { - "version": "1.1.1", - "from": "is-svg@>=1.1.1 <2.0.0", - "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-1.1.1.tgz" + "version": "2.0.1", + "from": "is-svg@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.0.1.tgz" }, "is-typedarray": { "version": "1.0.0", "from": "is-typedarray@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz" }, + "is-unc-path": { + "version": "0.1.1", + "from": "is-unc-path@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.1.tgz" + }, "is-utf8": { "version": "0.2.1", "from": "is-utf8@>=0.2.0 <0.3.0", @@ -1103,6 +1274,11 @@ "from": "is-valid-glob@>=0.3.0 <0.4.0", "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz" }, + "is-windows": { + "version": "0.2.0", + "from": "is-windows@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz" + }, "isarray": { "version": "0.0.1", "from": "isarray@0.0.1", @@ -1114,9 +1290,16 @@ "resolved": "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz" }, "isobject": { - "version": "2.0.0", + "version": "2.1.0", "from": "isobject@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.0.0.tgz" + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "dependencies": { + "isarray": { + "version": "1.0.0", + "from": "isarray@1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + } + } }, "isstream": { "version": "0.1.2", @@ -1134,9 +1317,9 @@ "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz" }, "js-yaml": { - "version": "3.4.6", - "from": "js-yaml@>=3.4.3 <3.5.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.4.6.tgz" + "version": "3.6.1", + "from": "js-yaml@>=3.6.0 <3.7.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz" }, "jsbn": { "version": "0.1.0", @@ -1158,34 +1341,72 @@ "from": "json-stringify-safe@>=5.0.1 <5.1.0", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz" }, + "jsonfilter": { + "version": "1.1.2", + "from": "jsonfilter@>=1.1.2 <2.0.0", + "resolved": "https://registry.npmjs.org/jsonfilter/-/jsonfilter-1.1.2.tgz", + "dependencies": { + "minimist": { + "version": "1.2.0", + "from": "minimist@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz" + }, + "readable-stream": { + "version": "1.0.34", + "from": "readable-stream@>=1.0.33-1 <1.1.0-0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz" + }, + "through2": { + "version": "0.6.5", + "from": "through2@>=0.6.3 <0.7.0", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz" + } + } + }, "jsonify": { "version": "0.0.0", "from": "jsonify@>=0.0.0 <0.1.0", "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz" }, + "jsonparse": { + "version": "0.0.5", + "from": "jsonparse@0.0.5", + "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz" + }, "jsonpointer": { "version": "2.0.0", "from": "jsonpointer@2.0.0", "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz" }, + "JSONStream": { + "version": "0.8.4", + "from": "JSONStream@>=0.8.4 <0.9.0", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz" + }, "jsprim": { - "version": "1.2.2", + "version": "1.3.0", "from": "jsprim@>=1.2.2 <2.0.0", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz" + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.0.tgz" }, "kind-of": { - "version": "3.0.2", + "version": "3.0.3", "from": "kind-of@>=3.0.2 <4.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.2.tgz" + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.3.tgz" }, "lazystream": { "version": "1.0.0", "from": "lazystream@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz", "dependencies": { + "isarray": { + "version": "1.0.0", + "from": "isarray@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + }, "readable-stream": { - "version": "2.0.5", - "from": "readable-stream@>=2.0.5 <3.0.0" + "version": "2.1.4", + "from": "readable-stream@>=2.0.5 <3.0.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz" } } }, @@ -1194,10 +1415,27 @@ "from": "lcid@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz" }, + "ldjson-stream": { + "version": "1.2.1", + "from": "ldjson-stream@>=1.2.1 <2.0.0", + "resolved": "https://registry.npmjs.org/ldjson-stream/-/ldjson-stream-1.2.1.tgz", + "dependencies": { + "readable-stream": { + "version": "1.0.34", + "from": "readable-stream@>=1.0.33-1 <1.1.0-0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz" + }, + "through2": { + "version": "0.6.5", + "from": "through2@>=0.6.1 <0.7.0", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz" + } + } + }, "liftoff": { - "version": "2.2.0", + "version": "2.3.0", "from": "liftoff@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.2.0.tgz" + "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.3.0.tgz" }, "load-json-file": { "version": "1.1.0", @@ -1254,10 +1492,20 @@ "from": "lodash._root@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz" }, - "lodash._stack": { - "version": "4.1.1", - "from": "lodash._stack@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash._stack/-/lodash._stack-4.1.1.tgz" + "lodash.assign": { + "version": "4.1.0", + "from": "lodash.assign@>=4.0.3 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.1.0.tgz" + }, + "lodash.assignwith": { + "version": "4.1.0", + "from": "lodash.assignwith@>=4.0.7 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.assignwith/-/lodash.assignwith-4.1.0.tgz" + }, + "lodash.clonedeep": { + "version": "4.4.0", + "from": "lodash.clonedeep@>=4.3.2 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.4.0.tgz" }, "lodash.escape": { "version": "3.2.0", @@ -1265,51 +1513,49 @@ "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz" }, "lodash.isarguments": { - "version": "3.0.8", + "version": "3.0.9", "from": "lodash.isarguments@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.8.tgz" + "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.9.tgz" }, "lodash.isarray": { "version": "3.0.4", "from": "lodash.isarray@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz" }, + "lodash.isempty": { + "version": "4.3.0", + "from": "lodash.isempty@>=4.2.1 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.3.0.tgz" + }, "lodash.isequal": { - "version": "4.1.1", + "version": "4.3.0", "from": "lodash.isequal@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.1.1.tgz", - "dependencies": { - "lodash.keys": { - "version": "4.0.5", - "from": "lodash.keys@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.0.5.tgz" - } - } + "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.3.0.tgz" + }, + "lodash.isplainobject": { + "version": "4.0.5", + "from": "lodash.isplainobject@>=4.0.4 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.5.tgz" + }, + "lodash.isstring": { + "version": "4.0.1", + "from": "lodash.isstring@>=4.0.1 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz" }, "lodash.keys": { "version": "3.1.2", "from": "lodash.keys@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz" }, - "lodash.pad": { - "version": "4.1.0", - "from": "lodash.pad@>=4.1.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.1.0.tgz" - }, - "lodash.padend": { - "version": "4.2.0", - "from": "lodash.padend@>=4.1.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.2.0.tgz" + "lodash.mapvalues": { + "version": "4.5.0", + "from": "lodash.mapvalues@>=4.4.0 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.5.0.tgz" }, - "lodash.padstart": { - "version": "4.2.0", - "from": "lodash.padstart@>=4.1.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.2.0.tgz" - }, - "lodash.repeat": { - "version": "4.0.0", - "from": "lodash.repeat@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-4.0.0.tgz" + "lodash.pick": { + "version": "4.3.0", + "from": "lodash.pick@>=4.2.1 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.3.0.tgz" }, "lodash.restparam": { "version": "3.6.1", @@ -1326,26 +1572,31 @@ "from": "lodash.templatesettings@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz" }, - "lodash.tostring": { - "version": "4.1.2", - "from": "lodash.tostring@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.tostring/-/lodash.tostring-4.1.2.tgz" - }, "log-symbols": { "version": "1.0.2", "from": "log-symbols@>=1.0.2 <2.0.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz" }, "loud-rejection": { - "version": "1.3.0", + "version": "1.6.0", "from": "loud-rejection@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.3.0.tgz" + "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz" }, "lru-cache": { "version": "2.7.3", "from": "lru-cache@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz" }, + "macaddress": { + "version": "0.2.8", + "from": "macaddress@>=0.2.8 <0.3.0", + "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz" + }, + "map-cache": { + "version": "0.2.2", + "from": "map-cache@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz" + }, "map-obj": { "version": "1.0.1", "from": "map-obj@>=1.0.1 <2.0.0", @@ -1368,31 +1619,37 @@ "from": "merge-stream@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.0.tgz", "dependencies": { + "isarray": { + "version": "1.0.0", + "from": "isarray@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + }, "readable-stream": { - "version": "2.0.5", - "from": "readable-stream@>=2.0.1 <3.0.0" + "version": "2.1.4", + "from": "readable-stream@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz" } } }, "micromatch": { - "version": "2.3.7", + "version": "2.3.11", "from": "micromatch@>=2.3.7 <3.0.0", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.7.tgz" + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz" }, "mime-db": { - "version": "1.22.0", - "from": "mime-db@>=1.22.0 <1.23.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz" + "version": "1.23.0", + "from": "mime-db@>=1.23.0 <1.24.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz" }, "mime-types": { - "version": "2.1.10", + "version": "2.1.11", "from": "mime-types@>=2.1.7 <2.2.0", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz" + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz" }, "minimatch": { - "version": "3.0.0", - "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz" + "version": "2.0.10", + "from": "minimatch@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz" }, "minimist": { "version": "0.0.8", @@ -1412,7 +1669,14 @@ "multimatch": { "version": "2.1.0", "from": "multimatch@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz" + "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz", + "dependencies": { + "minimatch": { + "version": "3.0.2", + "from": "minimatch@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz" + } + } }, "multipipe": { "version": "0.1.2", @@ -1420,38 +1684,58 @@ "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz" }, "nan": { - "version": "2.2.0", - "from": "nan@>=2.0.8 <3.0.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.2.0.tgz" + "version": "2.4.0", + "from": "nan@>=2.3.2 <3.0.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz" }, "node-gyp": { - "version": "3.3.0", - "from": "node-gyp@>=3.0.1 <4.0.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.3.0.tgz", + "version": "3.4.0", + "from": "node-gyp@>=3.3.1 <4.0.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.4.0.tgz", "dependencies": { "glob": { - "version": "4.5.3", - "from": "glob@>=3.0.0 <4.0.0||>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz", - "dependencies": { - "minimatch": { - "version": "2.0.10", - "from": "minimatch@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz" - } - } + "version": "7.0.5", + "from": "glob@>=7.0.3 <8.0.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz" }, "minimatch": { - "version": "1.0.0", - "from": "minimatch@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz" + "version": "3.0.2", + "from": "minimatch@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz" } } }, "node-sass": { - "version": "3.4.2", - "from": "node-sass@>=3.4.1 <4.0.0", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-3.4.2.tgz" + "version": "3.8.0", + "from": "node-sass@>=3.4.2 <4.0.0", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-3.8.0.tgz", + "dependencies": { + "gaze": { + "version": "1.1.0", + "from": "gaze@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.0.tgz" + }, + "glob": { + "version": "7.0.5", + "from": "glob@>=7.0.3 <8.0.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz" + }, + "globule": { + "version": "1.0.0", + "from": "globule@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.0.0.tgz" + }, + "lodash": { + "version": "4.9.0", + "from": "lodash@>=4.9.0 <4.10.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.9.0.tgz" + }, + "minimatch": { + "version": "3.0.2", + "from": "minimatch@>=3.0.0 <3.1.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz" + } + } }, "node-uuid": { "version": "1.4.7", @@ -1479,19 +1763,19 @@ "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz" }, "normalize-url": { - "version": "1.4.1", + "version": "1.6.0", "from": "normalize-url@>=1.4.0 <2.0.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.4.1.tgz" + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.6.0.tgz" }, "npm": { - "version": "3.7.5", + "version": "3.10.5", "from": "npm@>=3.7.5 <4.0.0", - "resolved": "https://registry.npmjs.org/npm/-/npm-3.7.5.tgz", + "resolved": "https://registry.npmjs.org/npm/-/npm-3.10.5.tgz", "dependencies": { "abbrev": { - "version": "1.0.7", - "from": "abbrev@>=1.0.7 <1.1.0", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz" + "version": "1.0.9", + "from": "abbrev@1.0.9", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz" }, "ansi-regex": { "version": "2.0.0", @@ -1509,18 +1793,19 @@ "resolved": "https://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz" }, "aproba": { - "version": "1.0.1", - "from": "aproba@>=1.0.1 <1.1.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.0.1.tgz" + "version": "1.0.4", + "from": "aproba@>=1.0.3 <1.1.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz" }, "archy": { "version": "1.0.0", "from": "archy@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz" }, - "async-some": { - "version": "1.0.2", - "from": "async-some@>=1.0.2 <1.1.0" + "asap": { + "version": "2.0.4", + "from": "asap@latest", + "resolved": "https://unpm.uberinternal.com/asap/-/asap-2.0.4.tgz" }, "chownr": { "version": "1.0.1", @@ -1577,14 +1862,7 @@ }, "dezalgo": { "version": "1.0.3", - "from": "dezalgo@>=1.0.3 <1.1.0", - "dependencies": { - "asap": { - "version": "2.0.3", - "from": "asap@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.3.tgz" - } - } + "from": "dezalgo@>=1.0.3 <1.1.0" }, "editor": { "version": "1.0.0", @@ -1592,27 +1870,28 @@ "resolved": "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz" }, "fs-vacuum": { - "version": "1.2.7", - "from": "fs-vacuum@>=1.2.7 <1.3.0", - "resolved": "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.7.tgz" + "version": "1.2.9", + "from": "fs-vacuum@latest", + "resolved": "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.9.tgz" }, "fs-write-stream-atomic": { "version": "1.0.8", "from": "fs-write-stream-atomic@1.0.8" }, "fstream": { - "version": "1.0.8", - "from": "fstream@>=1.0.8 <1.1.0", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz" + "version": "1.0.10", + "from": "fstream@>=1.0.10 <1.1.0", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.10.tgz" }, "fstream-npm": { - "version": "1.0.7", - "from": "fstream-npm@>=1.0.7 <1.1.0", + "version": "1.1.0", + "from": "fstream-npm@latest", + "resolved": "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.1.0.tgz", "dependencies": { "fstream-ignore": { - "version": "1.0.3", + "version": "1.0.5", "from": "fstream-ignore@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.3.tgz", + "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz", "dependencies": { "minimatch": { "version": "3.0.0", @@ -1620,14 +1899,14 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz", "dependencies": { "brace-expansion": { - "version": "1.1.2", + "version": "1.1.4", "from": "brace-expansion@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.4.tgz", "dependencies": { "balanced-match": { - "version": "0.3.0", - "from": "balanced-match@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz" + "version": "0.4.1", + "from": "balanced-match@>=0.4.1 <0.5.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.1.tgz" }, "concat-map": { "version": "0.0.1", @@ -1643,24 +1922,29 @@ } }, "glob": { - "version": "7.0.0", - "from": "glob@latest", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.0.tgz", + "version": "7.0.4", + "from": "glob@>=7.0.3 <7.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.4.tgz", "dependencies": { + "fs.realpath": { + "version": "1.0.0", + "from": "fs.realpath@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" + }, "minimatch": { "version": "3.0.0", "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz", "dependencies": { "brace-expansion": { - "version": "1.1.3", + "version": "1.1.5", "from": "brace-expansion@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.3.tgz", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.5.tgz", "dependencies": { "balanced-match": { - "version": "0.3.0", - "from": "balanced-match@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz" + "version": "0.4.1", + "from": "balanced-match@>=0.4.1 <0.5.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.1.tgz" }, "concat-map": { "version": "0.0.1", @@ -1679,18 +1963,19 @@ } }, "graceful-fs": { - "version": "4.1.3", - "from": "graceful-fs@>=4.1.2 <4.2.0", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.3.tgz" + "version": "4.1.4", + "from": "graceful-fs@>=4.1.3 <4.2.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.4.tgz" }, "has-unicode": { - "version": "2.0.0", - "from": "has-unicode@2.0.0", - "resolved": "file:../has-unicode" + "version": "2.0.1", + "from": "has-unicode@>=2.0.0 <2.1.0", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz" }, "hosted-git-info": { - "version": "2.1.4", - "from": "hosted-git-info@>=2.1.4 <2.2.0" + "version": "2.1.5", + "from": "hosted-git-info@latest", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz" }, "iferr": { "version": "0.1.5", @@ -1703,9 +1988,9 @@ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz" }, "inflight": { - "version": "1.0.4", - "from": "inflight@>=1.0.4 <1.1.0", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz" + "version": "1.0.5", + "from": "inflight@latest", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz" }, "inherits": { "version": "2.0.1", @@ -1718,8 +2003,9 @@ "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz" }, "init-package-json": { - "version": "1.9.3", - "from": "init-package-json@>=1.9.3 <1.10.0", + "version": "1.9.4", + "from": "init-package-json@latest", + "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.4.tgz", "dependencies": { "glob": { "version": "6.0.4", @@ -1731,12 +2017,14 @@ "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0", "dependencies": { "brace-expansion": { - "version": "1.1.3", + "version": "1.1.4", "from": "brace-expansion@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.4.tgz", "dependencies": { "balanced-match": { - "version": "0.3.0", - "from": "balanced-match@>=0.3.0 <0.4.0" + "version": "0.4.1", + "from": "balanced-match@>=0.4.1 <0.5.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.1.tgz" }, "concat-map": { "version": "0.0.1", @@ -1770,19 +2058,19 @@ "resolved": "https://registry.npmjs.org/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz" }, "lodash._baseuniq": { - "version": "4.4.0", + "version": "4.6.0", "from": "lodash._baseuniq@latest", - "resolved": "https://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-4.4.0.tgz", + "resolved": "https://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz", "dependencies": { + "lodash._createset": { + "version": "4.0.3", + "from": "lodash._createset@>=4.0.0 <4.1.0", + "resolved": "https://registry.npmjs.org/lodash._createset/-/lodash._createset-4.0.3.tgz" + }, "lodash._root": { "version": "3.0.1", - "from": "lodash._root@>=3.0.0 <4.0.0", + "from": "lodash._root@>=3.0.0 <3.1.0", "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz" - }, - "lodash._setcache": { - "version": "4.1.0", - "from": "lodash._setcache@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash._setcache/-/lodash._setcache-4.1.0.tgz" } } }, @@ -1807,80 +2095,65 @@ "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz" }, "lodash.clonedeep": { - "version": "4.3.0", - "from": "lodash.clonedeep@latest", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.3.0.tgz", + "version": "4.3.2", + "from": "lodash.clonedeep@4.3.2", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.3.2.tgz", "dependencies": { "lodash._baseclone": { - "version": "4.5.0", + "version": "4.5.3", "from": "lodash._baseclone@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.0.tgz" + "resolved": "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.3.tgz" } } }, - "lodash.isarguments": { - "version": "3.0.7", - "from": "lodash.isarguments@latest", - "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.7.tgz" - }, - "lodash.isarray": { - "version": "4.0.0", - "from": "lodash.isarray@latest", - "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-4.0.0.tgz" - }, - "lodash.keys": { - "version": "4.0.3", - "from": "lodash.keys@latest", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.0.3.tgz" - }, "lodash.restparam": { "version": "3.6.1", "from": "lodash.restparam@3.6.1", "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz" }, "lodash.union": { - "version": "4.2.0", + "version": "4.4.0", "from": "lodash.union@latest", - "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.2.0.tgz", + "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.4.0.tgz", "dependencies": { "lodash._baseflatten": { - "version": "4.1.0", - "from": "lodash._baseflatten@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.1.0.tgz" + "version": "4.2.1", + "from": "lodash._baseflatten@>=4.2.0 <4.3.0", + "resolved": "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.2.1.tgz" }, "lodash.rest": { - "version": "4.0.1", + "version": "4.0.3", "from": "lodash.rest@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.rest/-/lodash.rest-4.0.1.tgz" + "resolved": "https://registry.npmjs.org/lodash.rest/-/lodash.rest-4.0.3.tgz" } } }, "lodash.uniq": { - "version": "4.2.0", - "from": "lodash.uniq@>=4.2.0 <4.3.0", - "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.2.0.tgz" + "version": "4.3.0", + "from": "lodash.uniq@latest", + "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.3.0.tgz" }, "lodash.without": { - "version": "4.1.0", + "version": "4.2.0", "from": "lodash.without@latest", - "resolved": "https://registry.npmjs.org/lodash.without/-/lodash.without-4.1.0.tgz", + "resolved": "https://registry.npmjs.org/lodash.without/-/lodash.without-4.2.0.tgz", "dependencies": { "lodash._basedifference": { - "version": "4.4.0", - "from": "lodash._basedifference@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.4.0.tgz", + "version": "4.5.0", + "from": "lodash._basedifference@>=4.5.0 <4.6.0", + "resolved": "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.5.0.tgz", "dependencies": { - "lodash._setcache": { - "version": "4.1.0", - "from": "lodash._setcache@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash._setcache/-/lodash._setcache-4.1.0.tgz" + "lodash._root": { + "version": "3.0.1", + "from": "lodash._root@>=3.0.0 <3.1.0", + "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz" } } }, "lodash.rest": { - "version": "4.0.1", + "version": "4.0.3", "from": "lodash.rest@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.rest/-/lodash.rest-4.0.1.tgz" + "resolved": "https://registry.npmjs.org/lodash.rest/-/lodash.rest-4.0.3.tgz" } } }, @@ -1897,58 +2170,34 @@ } }, "node-gyp": { - "version": "3.3.0", - "from": "node-gyp@>=3.3.0 <3.4.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.3.0.tgz", + "version": "3.4.0", + "from": "node-gyp@latest", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.4.0.tgz", "dependencies": { - "glob": { - "version": "4.5.3", - "from": "glob@>=3.0.0 <4.0.0||>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz", + "minimatch": { + "version": "3.0.2", + "from": "minimatch@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz", "dependencies": { - "minimatch": { - "version": "2.0.10", - "from": "minimatch@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", + "brace-expansion": { + "version": "1.1.5", + "from": "brace-expansion@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.5.tgz", "dependencies": { - "brace-expansion": { - "version": "1.1.3", - "from": "brace-expansion@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.3.tgz", - "dependencies": { - "balanced-match": { - "version": "0.3.0", - "from": "balanced-match@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz" - }, - "concat-map": { - "version": "0.0.1", - "from": "concat-map@0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" - } - } + "balanced-match": { + "version": "0.4.1", + "from": "balanced-match@>=0.4.1 <0.5.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.1.tgz" + }, + "concat-map": { + "version": "0.0.1", + "from": "concat-map@0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" } } } } }, - "minimatch": { - "version": "1.0.0", - "from": "minimatch@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz", - "dependencies": { - "lru-cache": { - "version": "2.7.3", - "from": "lru-cache@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz" - }, - "sigmund": { - "version": "1.0.1", - "from": "sigmund@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz" - } - } - }, "path-array": { "version": "1.0.1", "from": "path-array@>=1.0.0 <2.0.0", @@ -1961,7 +2210,7 @@ "dependencies": { "debug": { "version": "2.2.0", - "from": "debug@*", + "from": "debug@>=2.2.0 <3.0.0", "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", "dependencies": { "ms": { @@ -1972,9 +2221,9 @@ } }, "es6-symbol": { - "version": "3.0.2", + "version": "3.1.0", "from": "es6-symbol@>=3.0.2 <4.0.0", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.0.2.tgz", + "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.0.tgz", "dependencies": { "d": { "version": "0.1.1", @@ -1982,9 +2231,9 @@ "resolved": "https://registry.npmjs.org/d/-/d-0.1.1.tgz" }, "es5-ext": { - "version": "0.10.11", - "from": "es5-ext@>=0.10.10 <0.11.0", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.11.tgz", + "version": "0.10.12", + "from": "es5-ext@>=0.10.11 <0.11.0", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.12.tgz", "dependencies": { "es6-iterator": { "version": "2.0.0", @@ -2007,9 +2256,8 @@ "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz" }, "normalize-git-url": { - "version": "3.0.1", - "from": "normalize-git-url@>=3.0.1 <3.1.0", - "resolved": "https://registry.npmjs.org/normalize-git-url/-/normalize-git-url-3.0.1.tgz" + "version": "3.0.2", + "from": "normalize-git-url@>=3.0.2 <3.1.0" }, "normalize-package-data": { "version": "2.3.5", @@ -2040,18 +2288,48 @@ "from": "npm-install-checks@3.0.0" }, "npm-package-arg": { - "version": "4.1.0", - "from": "npm-package-arg@>=4.1.0 <4.2.0" + "version": "4.2.0", + "from": "npm-package-arg@4.2.0", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.2.0.tgz" }, "npm-registry-client": { - "version": "7.0.9", - "from": "npm-registry-client@>=7.0.9 <7.1.0", + "version": "7.1.2", + "from": "npm-registry-client@latest", + "resolved": "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.1.2.tgz", "dependencies": { "concat-stream": { "version": "1.5.1", "from": "concat-stream@>=1.4.6 <2.0.0", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.1.tgz", "dependencies": { + "readable-stream": { + "version": "2.0.6", + "from": "readable-stream@>=2.0.0 <2.1.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", + "dependencies": { + "core-util-is": { + "version": "1.0.2", + "from": "core-util-is@>=1.0.0 <1.1.0" + }, + "isarray": { + "version": "1.0.0", + "from": "isarray@>=1.0.0 <1.1.0" + }, + "process-nextick-args": { + "version": "1.0.7", + "from": "process-nextick-args@>=1.0.6 <1.1.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz" + }, + "string_decoder": { + "version": "0.10.31", + "from": "string_decoder@>=0.10.0 <0.11.0" + }, + "util-deprecate": { + "version": "1.0.2", + "from": "util-deprecate@>=1.0.1 <1.1.0" + } + } + }, "typedarray": { "version": "0.0.6", "from": "typedarray@>=0.0.5 <0.1.0", @@ -2067,22 +2345,19 @@ } }, "npm-user-validate": { - "version": "0.1.2", - "from": "npm-user-validate@>=0.1.2 <0.2.0", - "resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.2.tgz" + "version": "0.1.4", + "from": "npm-user-validate@latest", + "resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.4.tgz" }, "npmlog": { - "version": "2.0.2", - "from": "npmlog@>=2.0.0 <2.1.0", + "version": "3.1.2", + "from": "npmlog@latest", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-3.1.2.tgz", "dependencies": { - "ansi": { - "version": "0.3.1", - "from": "ansi@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz" - }, "are-we-there-yet": { - "version": "1.0.6", - "from": "are-we-there-yet@>=1.0.6 <1.1.0", + "version": "1.1.2", + "from": "are-we-there-yet@>=1.1.2 <1.2.0", + "resolved": "http://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz", "dependencies": { "delegates": { "version": "1.0.0", @@ -2091,36 +2366,73 @@ } } }, + "console-control-strings": { + "version": "1.1.0", + "from": "console-control-strings@>=1.1.0 <1.2.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz" + }, "gauge": { - "version": "1.2.7", - "from": "gauge@>=1.2.5 <1.3.0", + "version": "2.6.0", + "from": "gauge@>=2.6.0 <2.7.0", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz", "dependencies": { - "lodash.pad": { - "version": "4.1.0", - "from": "lodash.pad@>=4.1.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.1.0.tgz" + "has-color": { + "version": "0.1.7", + "from": "has-color@>=0.1.7 <0.2.0", + "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz" }, - "lodash.padend": { - "version": "4.2.0", - "from": "lodash.padend@>=4.1.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.2.0.tgz" + "object-assign": { + "version": "4.1.0", + "from": "object-assign@>=4.0.1 <5.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz" }, - "lodash.padstart": { - "version": "4.2.0", - "from": "lodash.padstart@>=4.1.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.2.0.tgz" + "signal-exit": { + "version": "3.0.0", + "from": "signal-exit@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.0.tgz" }, - "lodash.repeat": { - "version": "4.0.0", - "from": "lodash.repeat@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-4.0.0.tgz" + "string-width": { + "version": "1.0.1", + "from": "string-width@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.1.tgz", + "dependencies": { + "code-point-at": { + "version": "1.0.0", + "from": "code-point-at@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz", + "dependencies": { + "number-is-nan": { + "version": "1.0.0", + "from": "number-is-nan@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz" + } + } + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "dependencies": { + "number-is-nan": { + "version": "1.0.0", + "from": "number-is-nan@^1.0.0", + "resolved": "http://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz" + } + } + } + } }, - "lodash.tostring": { - "version": "4.1.1", - "from": "lodash.tostring@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.tostring/-/lodash.tostring-4.1.1.tgz" + "wide-align": { + "version": "1.1.0", + "from": "wide-align@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.0.tgz" } } + }, + "set-blocking": { + "version": "2.0.0", + "from": "set-blocking@>=2.0.0 <2.1.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz" } } }, @@ -2186,8 +2498,9 @@ } }, "read-package-json": { - "version": "2.0.3", - "from": "read-package-json@2.0.3", + "version": "2.0.4", + "from": "read-package-json@>=2.0.3 <2.1.0", + "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.4.tgz", "dependencies": { "glob": { "version": "6.0.4", @@ -2226,36 +2539,42 @@ "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz", "dependencies": { "jju": { - "version": "1.2.1", + "version": "1.3.0", "from": "jju@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/jju/-/jju-1.2.1.tgz" + "resolved": "https://registry.npmjs.org/jju/-/jju-1.3.0.tgz" } } } } }, "read-package-tree": { - "version": "5.1.2", - "from": "read-package-tree@>=5.1.2 <5.2.0", - "resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.2.tgz" + "version": "5.1.5", + "from": "read-package-tree@>=5.1.4 <5.2.0", + "resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.5.tgz" }, "readable-stream": { - "version": "2.0.5", - "from": "readable-stream@2.0.5", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.5.tgz", + "version": "2.1.4", + "from": "readable-stream@latest", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz", "dependencies": { + "buffer-shims": { + "version": "1.0.0", + "from": "buffer-shims@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz" + }, "core-util-is": { "version": "1.0.2", "from": "core-util-is@>=1.0.0 <1.1.0" }, "isarray": { - "version": "0.0.1", - "from": "isarray@0.0.1" + "version": "1.0.0", + "from": "isarray@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" }, "process-nextick-args": { - "version": "1.0.6", - "from": "process-nextick-args@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz" + "version": "1.0.7", + "from": "process-nextick-args@>=1.0.6 <1.1.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz" }, "string_decoder": { "version": "0.10.31", @@ -2274,13 +2593,13 @@ "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz" }, "realize-package-specifier": { - "version": "3.0.1", - "from": "realize-package-specifier@>=3.0.1 <3.1.0" + "version": "3.0.3", + "from": "realize-package-specifier@>=3.0.2 <3.1.0" }, "request": { - "version": "2.69.0", + "version": "2.72.0", "from": "request@latest", - "resolved": "https://registry.npmjs.org/request/-/request-2.69.0.tgz", + "resolved": "https://registry.npmjs.org/request/-/request-2.72.0.tgz", "dependencies": { "aws-sign2": { "version": "0.6.0", @@ -2288,21 +2607,62 @@ "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz" }, "aws4": { - "version": "1.2.1", + "version": "1.3.2", "from": "aws4@>=1.2.1 <2.0.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.2.1.tgz", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.3.2.tgz", "dependencies": { "lru-cache": { - "version": "2.7.3", - "from": "lru-cache@>=2.6.5 <3.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz" + "version": "4.0.1", + "from": "lru-cache@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz", + "dependencies": { + "pseudomap": { + "version": "1.0.2", + "from": "pseudomap@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz" + }, + "yallist": { + "version": "2.0.0", + "from": "yallist@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz" + } + } } } }, "bl": { - "version": "1.0.1", - "from": "bl@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.1.tgz" + "version": "1.1.2", + "from": "bl@>=1.1.2 <1.2.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz", + "dependencies": { + "readable-stream": { + "version": "2.0.6", + "from": "readable-stream@>=2.0.5 <2.1.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", + "dependencies": { + "core-util-is": { + "version": "1.0.2", + "from": "core-util-is@>=1.0.0 <1.1.0" + }, + "isarray": { + "version": "1.0.0", + "from": "isarray@>=1.0.0 <1.1.0" + }, + "process-nextick-args": { + "version": "1.0.6", + "from": "process-nextick-args@>=1.0.6 <1.1.0" + }, + "string_decoder": { + "version": "0.10.31", + "from": "string_decoder@>=0.10.0 <0.11.0" + }, + "util-deprecate": { + "version": "1.0.2", + "from": "util-deprecate@>=1.0.1 <1.1.0" + } + } + } + } }, "caseless": { "version": "0.11.0", @@ -2332,9 +2692,9 @@ "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz" }, "form-data": { - "version": "1.0.0-rc3", + "version": "1.0.0-rc4", "from": "form-data@>=1.0.0-rc3 <1.1.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz", "dependencies": { "async": { "version": "1.5.2", @@ -2349,19 +2709,19 @@ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz", "dependencies": { "chalk": { - "version": "1.1.1", + "version": "1.1.3", "from": "chalk@>=1.1.1 <2.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "dependencies": { "ansi-styles": { - "version": "2.1.0", - "from": "ansi-styles@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz" + "version": "2.2.1", + "from": "ansi-styles@>=2.2.1 <3.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz" }, "escape-string-regexp": { - "version": "1.0.4", + "version": "1.0.5", "from": "escape-string-regexp@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.4.tgz" + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" }, "has-ansi": { "version": "2.0.0", @@ -2388,9 +2748,9 @@ } }, "is-my-json-valid": { - "version": "2.12.4", + "version": "2.13.1", "from": "is-my-json-valid@>=2.12.4 <3.0.0", - "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.4.tgz", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz", "dependencies": { "generate-function": { "version": "2.0.0", @@ -2422,14 +2782,14 @@ } }, "pinkie-promise": { - "version": "2.0.0", + "version": "2.0.1", "from": "pinkie-promise@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", "dependencies": { "pinkie": { - "version": "2.0.1", + "version": "2.0.4", "from": "pinkie@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz" + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz" } } } @@ -2495,9 +2855,9 @@ } }, "sshpk": { - "version": "1.7.3", + "version": "1.7.4", "from": "sshpk@>=1.7.0 <2.0.0", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.7.3.tgz", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.7.4.tgz", "dependencies": { "asn1": { "version": "0.2.3", @@ -2505,9 +2865,16 @@ "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz" }, "dashdash": { - "version": "1.12.2", + "version": "1.13.0", "from": "dashdash@>=1.10.1 <2.0.0", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.12.2.tgz" + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.13.0.tgz", + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "from": "assert-plus@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" + } + } }, "ecc-jsbn": { "version": "0.1.1", @@ -2525,9 +2892,9 @@ "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz" }, "tweetnacl": { - "version": "0.13.3", + "version": "0.14.3", "from": "tweetnacl@>=0.13.0 <1.0.0", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz" + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz" } } } @@ -2549,14 +2916,14 @@ "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz" }, "mime-types": { - "version": "2.1.9", + "version": "2.1.10", "from": "mime-types@>=2.1.7 <2.2.0", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz", "dependencies": { "mime-db": { - "version": "1.21.0", - "from": "mime-db@>=1.21.0 <1.22.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz" + "version": "1.22.0", + "from": "mime-db@>=1.22.0 <1.23.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz" } } }, @@ -2566,14 +2933,14 @@ "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz" }, "oauth-sign": { - "version": "0.8.0", + "version": "0.8.1", "from": "oauth-sign@>=0.8.0 <0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz" + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.1.tgz" }, "qs": { - "version": "6.0.2", - "from": "qs@>=6.0.2 <6.1.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz" + "version": "6.1.0", + "from": "qs@>=6.1.0 <6.2.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz" }, "stringstream": { "version": "0.0.5", @@ -2581,9 +2948,9 @@ "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz" }, "tough-cookie": { - "version": "2.2.1", + "version": "2.2.2", "from": "tough-cookie@>=2.2.0 <2.3.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz" + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz" }, "tunnel-agent": { "version": "0.4.2", @@ -2618,14 +2985,14 @@ "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz" }, "sorted-object": { - "version": "1.0.0", - "from": "sorted-object@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/sorted-object/-/sorted-object-1.0.0.tgz" + "version": "2.0.0", + "from": "sorted-object@latest", + "resolved": "https://registry.npmjs.org/sorted-object/-/sorted-object-2.0.0.tgz" }, "strip-ansi": { - "version": "3.0.0", - "from": "strip-ansi@3.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz" + "version": "3.0.1", + "from": "strip-ansi@*", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz" }, "tar": { "version": "2.2.1", @@ -2718,33 +3085,21 @@ } }, "which": { - "version": "1.2.4", - "from": "which@>=1.2.1 <1.3.0", - "resolved": "https://registry.npmjs.org/which/-/which-1.2.4.tgz", + "version": "1.2.10", + "from": "which@latest", + "resolved": "https://registry.npmjs.org/which/-/which-1.2.10.tgz", "dependencies": { - "is-absolute": { - "version": "0.1.7", - "from": "is-absolute@>=0.1.7 <0.2.0", - "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz", - "dependencies": { - "is-relative": { - "version": "0.1.3", - "from": "is-relative@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz" - } - } - }, "isexe": { - "version": "1.1.1", + "version": "1.1.2", "from": "isexe@>=1.1.1 <2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-1.1.1.tgz" + "resolved": "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz" } } }, "wrappy": { - "version": "1.0.1", - "from": "wrappy@>=1.0.1 <1.1.0", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz" + "version": "1.0.2", + "from": "wrappy@latest", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" }, "write-file-atomic": { "version": "1.1.4", @@ -2752,15 +3107,10 @@ } } }, - "npmconf": { - "version": "2.1.2", - "from": "npmconf@>=2.1.2 <3.0.0", - "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz" - }, "npmlog": { - "version": "2.0.2", - "from": "npmlog@>=0.0.0 <1.0.0||>=1.0.0 <2.0.0||>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-2.0.2.tgz" + "version": "3.1.2", + "from": "npmlog@>=0.0.0 <1.0.0||>=1.0.0 <2.0.0||>=2.0.0 <3.0.0||>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-3.1.2.tgz" }, "num2fraction": { "version": "1.2.2", @@ -2773,14 +3123,14 @@ "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz" }, "oauth-sign": { - "version": "0.8.1", - "from": "oauth-sign@>=0.8.0 <0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.1.tgz" + "version": "0.8.2", + "from": "oauth-sign@>=0.8.1 <0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz" }, "object-assign": { - "version": "4.0.1", + "version": "4.1.0", "from": "object-assign@>=4.0.1 <5.0.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz" + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz" }, "object.omit": { "version": "2.0.0", @@ -2789,9 +3139,14 @@ }, "once": { "version": "1.3.3", - "from": "once@>=1.3.0 <2.0.0", + "from": "once@>=1.3.0 <1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz" }, + "onecolor": { + "version": "3.0.4", + "from": "onecolor@>=3.0.4 <4.0.0", + "resolved": "https://registry.npmjs.org/onecolor/-/onecolor-3.0.4.tgz" + }, "orchestrator": { "version": "0.3.7", "from": "orchestrator@>=0.3.0 <0.4.0", @@ -2804,7 +3159,7 @@ }, "os-homedir": { "version": "1.0.1", - "from": "os-homedir@>=1.0.0 <2.0.0", + "from": "os-homedir@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz" }, "os-locale": { @@ -2812,11 +3167,6 @@ "from": "os-locale@>=1.4.0 <2.0.0", "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz" }, - "os-shim": { - "version": "0.1.3", - "from": "os-shim@>=0.1.2 <0.2.0", - "resolved": "https://registry.npmjs.org/os-shim/-/os-shim-0.1.3.tgz" - }, "os-tmpdir": { "version": "1.0.1", "from": "os-tmpdir@>=1.0.0 <2.0.0", @@ -2824,9 +3174,14 @@ }, "osenv": { "version": "0.1.3", - "from": "osenv@>=0.0.0 <1.0.0", + "from": "osenv@>=0.1.3 <0.2.0", "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz" }, + "parse-filepath": { + "version": "1.0.1", + "from": "parse-filepath@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.1.tgz" + }, "parse-glob": { "version": "3.0.4", "from": "parse-glob@>=3.0.4 <4.0.0", @@ -2852,6 +3207,16 @@ "from": "path-is-absolute@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz" }, + "path-root": { + "version": "0.1.1", + "from": "path-root@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz" + }, + "path-root-regex": { + "version": "0.1.2", + "from": "path-root-regex@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz" + }, "path-type": { "version": "1.1.0", "from": "path-type@>=1.0.0 <2.0.0", @@ -2868,24 +3233,34 @@ "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz" }, "pinkie-promise": { - "version": "2.0.0", + "version": "2.0.1", "from": "pinkie-promise@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz" + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz" + }, + "pipetteur": { + "version": "2.0.3", + "from": "pipetteur@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/pipetteur/-/pipetteur-2.0.3.tgz" + }, + "plur": { + "version": "2.1.2", + "from": "plur@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz" }, "postcss": { - "version": "5.0.19", - "from": "postcss@>=5.0.15 <6.0.0", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.0.19.tgz" + "version": "5.1.1", + "from": "postcss@>=5.0.21 <6.0.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.1.1.tgz" }, "postcss-bem-linter": { - "version": "2.3.3", + "version": "2.5.1", "from": "postcss-bem-linter@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-bem-linter/-/postcss-bem-linter-2.3.3.tgz" + "resolved": "https://registry.npmjs.org/postcss-bem-linter/-/postcss-bem-linter-2.5.1.tgz" }, "postcss-calc": { - "version": "5.2.0", + "version": "5.3.0", "from": "postcss-calc@>=5.2.0 <6.0.0", - "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.2.0.tgz" + "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.0.tgz" }, "postcss-colormin": { "version": "2.2.0", @@ -2893,9 +3268,9 @@ "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.0.tgz" }, "postcss-convert-values": { - "version": "2.3.4", + "version": "2.4.0", "from": "postcss-convert-values@>=2.3.4 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.3.4.tgz" + "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.4.0.tgz" }, "postcss-discard-comments": { "version": "2.0.4", @@ -2908,9 +3283,14 @@ "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.0.1.tgz" }, "postcss-discard-empty": { - "version": "2.0.1", + "version": "2.1.0", "from": "postcss-discard-empty@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.0.1.tgz" + "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz" + }, + "postcss-discard-overridden": { + "version": "0.1.1", + "from": "postcss-discard-overridden@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz" }, "postcss-discard-unused": { "version": "2.2.1", @@ -2918,14 +3298,14 @@ "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.1.tgz" }, "postcss-filter-plugins": { - "version": "2.0.0", + "version": "2.0.1", "from": "postcss-filter-plugins@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.0.tgz" + "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.1.tgz" }, "postcss-merge-idents": { - "version": "2.1.5", + "version": "2.1.6", "from": "postcss-merge-idents@>=2.1.5 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.5.tgz" + "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.6.tgz" }, "postcss-merge-longhand": { "version": "2.0.1", @@ -2933,9 +3313,9 @@ "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.1.tgz" }, "postcss-merge-rules": { - "version": "2.0.6", + "version": "2.0.10", "from": "postcss-merge-rules@>=2.0.3 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.0.6.tgz" + "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.0.10.tgz" }, "postcss-message-helpers": { "version": "2.0.0", @@ -2943,14 +3323,14 @@ "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz" }, "postcss-minify-font-values": { - "version": "1.0.3", + "version": "1.0.5", "from": "postcss-minify-font-values@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.3.tgz" + "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz" }, "postcss-minify-gradients": { - "version": "1.0.1", + "version": "1.0.3", "from": "postcss-minify-gradients@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.1.tgz" + "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.3.tgz" }, "postcss-minify-params": { "version": "1.0.4", @@ -2958,9 +3338,9 @@ "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.0.4.tgz" }, "postcss-minify-selectors": { - "version": "2.0.4", + "version": "2.0.5", "from": "postcss-minify-selectors@>=2.0.4 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.0.4.tgz" + "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.0.5.tgz" }, "postcss-normalize-charset": { "version": "1.1.0", @@ -2973,46 +3353,56 @@ "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.7.tgz" }, "postcss-ordered-values": { - "version": "2.1.0", + "version": "2.2.1", "from": "postcss-ordered-values@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.1.0.tgz" + "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.1.tgz" }, "postcss-reduce-idents": { "version": "2.3.0", "from": "postcss-reduce-idents@>=2.2.2 <3.0.0", "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.3.0.tgz" }, + "postcss-reduce-initial": { + "version": "1.0.0", + "from": "postcss-reduce-initial@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.0.tgz" + }, "postcss-reduce-transforms": { "version": "1.0.3", "from": "postcss-reduce-transforms@>=1.0.3 <2.0.0", "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.3.tgz" }, "postcss-reporter": { - "version": "1.3.3", + "version": "1.4.1", "from": "postcss-reporter@>=1.3.3 <2.0.0", - "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-1.3.3.tgz", + "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-1.4.1.tgz", "dependencies": { "lodash": { - "version": "4.6.1", + "version": "4.14.0", "from": "lodash@>=4.1.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.6.1.tgz" + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.0.tgz" } } }, + "postcss-resolve-nested-selector": { + "version": "0.1.1", + "from": "postcss-resolve-nested-selector@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz" + }, "postcss-scss": { - "version": "0.1.6", + "version": "0.1.9", "from": "postcss-scss@>=0.1.6 <0.2.0", - "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-0.1.6.tgz" + "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-0.1.9.tgz" }, "postcss-selector-parser": { - "version": "1.3.2", - "from": "postcss-selector-parser@>=1.3.1 <2.0.0", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-1.3.2.tgz" + "version": "2.1.1", + "from": "postcss-selector-parser@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.1.1.tgz" }, "postcss-svgo": { - "version": "2.1.2", + "version": "2.1.4", "from": "postcss-svgo@>=2.1.1 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.2.tgz" + "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.4.tgz" }, "postcss-unique-selectors": { "version": "2.0.2", @@ -3025,14 +3415,14 @@ "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz" }, "postcss-zindex": { - "version": "2.0.1", + "version": "2.1.1", "from": "postcss-zindex@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.0.1.tgz" + "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.1.1.tgz" }, "prepend-http": { - "version": "1.0.3", + "version": "1.0.4", "from": "prepend-http@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.3.tgz" + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz" }, "preserve": { "version": "0.2.0", @@ -3045,14 +3435,9 @@ "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.2.tgz" }, "process-nextick-args": { - "version": "1.0.6", + "version": "1.0.7", "from": "process-nextick-args@>=1.0.6 <1.1.0", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz" - }, - "proto-list": { - "version": "1.2.4", - "from": "proto-list@>=1.2.1 <1.3.0", - "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz" + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz" }, "pseudomap": { "version": "1.0.2", @@ -3065,20 +3450,25 @@ "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz" }, "qs": { - "version": "6.0.2", - "from": "qs@>=6.0.2 <6.1.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz" + "version": "6.2.1", + "from": "qs@>=6.2.0 <6.3.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz" }, "query-string": { - "version": "3.0.1", - "from": "query-string@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-3.0.1.tgz" + "version": "4.2.2", + "from": "query-string@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.2.2.tgz" }, "randomatic": { "version": "1.1.5", "from": "randomatic@>=1.1.3 <2.0.0", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.5.tgz" }, + "read-file-stdin": { + "version": "0.2.1", + "from": "read-file-stdin@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/read-file-stdin/-/read-file-stdin-0.2.1.tgz" + }, "read-pkg": { "version": "1.1.0", "from": "read-pkg@>=1.0.0 <2.0.0", @@ -3090,13 +3480,13 @@ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz" }, "readable-stream": { - "version": "1.1.13", + "version": "1.1.14", "from": "readable-stream@>=1.1.9 <1.2.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz" + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz" }, "rechoir": { "version": "0.6.2", - "from": "rechoir@>=0.6.0 <0.7.0", + "from": "rechoir@>=0.6.2 <0.7.0", "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz" }, "redent": { @@ -3105,9 +3495,9 @@ "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz" }, "reduce-css-calc": { - "version": "1.2.1", + "version": "1.2.4", "from": "reduce-css-calc@>=1.2.0 <2.0.0", - "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.2.1.tgz" + "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.2.4.tgz" }, "reduce-function-call": { "version": "1.0.1", @@ -3115,9 +3505,9 @@ "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.1.tgz" }, "regex-cache": { - "version": "0.4.2", + "version": "0.4.3", "from": "regex-cache@>=0.4.2 <0.5.0", - "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.2.tgz" + "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz" }, "repeat-element": { "version": "1.1.2", @@ -3130,9 +3520,9 @@ "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.4.tgz" }, "repeating": { - "version": "2.0.0", + "version": "2.0.1", "from": "repeating@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz" + "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz" }, "replace-ext": { "version": "0.0.1", @@ -3140,65 +3530,83 @@ "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz" }, "request": { - "version": "2.69.0", + "version": "2.74.0", "from": "request@>=2.61.0 <3.0.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.69.0.tgz", - "dependencies": { - "extend": { - "version": "3.0.0", - "from": "extend@>=3.0.0 <3.1.0", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz" - } - } + "resolved": "https://registry.npmjs.org/request/-/request-2.74.0.tgz" + }, + "require-directory": { + "version": "2.1.1", + "from": "require-directory@>=2.1.1 <3.0.0", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz" }, "require-from-string": { - "version": "1.1.0", + "version": "1.2.0", "from": "require-from-string@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.1.0.tgz" + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.0.tgz" + }, + "require-main-filename": { + "version": "1.0.1", + "from": "require-main-filename@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz" }, "resolve": { "version": "1.1.7", - "from": "resolve@>=1.1.6 <2.0.0", + "from": "resolve@>=1.1.7 <2.0.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz" }, + "resolve-dir": { + "version": "0.1.0", + "from": "resolve-dir@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.0.tgz" + }, "resolve-from": { "version": "2.0.0", "from": "resolve-from@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz" }, "rimraf": { - "version": "2.5.2", - "from": "rimraf@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.2.tgz", + "version": "2.5.4", + "from": "rimraf@>=2.4.3 <3.0.0", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz", "dependencies": { "glob": { - "version": "7.0.0", - "from": "glob@>=7.0.0 <8.0.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.0.tgz" + "version": "7.0.5", + "from": "glob@>=7.0.5 <8.0.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz" + }, + "minimatch": { + "version": "3.0.2", + "from": "minimatch@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz" } } }, "sass-graph": { - "version": "2.1.1", - "from": "sass-graph@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.1.1.tgz", + "version": "2.1.2", + "from": "sass-graph@>=2.1.1 <3.0.0", + "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.1.2.tgz", "dependencies": { "glob": { - "version": "6.0.4", - "from": "glob@>=6.0.4 <7.0.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz" + "version": "7.0.5", + "from": "glob@>=7.0.0 <8.0.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz" }, "lodash": { - "version": "4.6.1", + "version": "4.14.0", "from": "lodash@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.6.1.tgz" + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.0.tgz" + }, + "minimatch": { + "version": "3.0.2", + "from": "minimatch@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz" } } }, "sax": { - "version": "1.1.5", - "from": "sax@>=1.1.4 <1.2.0", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.5.tgz" + "version": "1.2.1", + "from": "sax@>=1.2.1 <1.3.0", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz" }, "semver": { "version": "4.3.6", @@ -3210,15 +3618,25 @@ "from": "sequencify@>=0.0.7 <0.1.0", "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz" }, + "set-blocking": { + "version": "2.0.0", + "from": "set-blocking@>=2.0.0 <2.1.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz" + }, "sigmund": { "version": "1.0.1", "from": "sigmund@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz" }, "signal-exit": { - "version": "2.1.2", - "from": "signal-exit@>=2.1.2 <3.0.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-2.1.2.tgz" + "version": "3.0.0", + "from": "signal-exit@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.0.tgz" + }, + "singularitygs": { + "version": "1.7.0", + "from": "singularitygs@>=1.7.0 <2.0.0", + "resolved": "https://registry.npmjs.org/singularitygs/-/singularitygs-1.7.0.tgz" }, "sntp": { "version": "1.0.9", @@ -3226,34 +3644,29 @@ "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz" }, "sort-keys": { - "version": "1.1.1", + "version": "1.1.2", "from": "sort-keys@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.1.tgz" + "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz" }, "source-map": { - "version": "0.5.3", - "from": "source-map@>=0.5.1 <0.6.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz" + "version": "0.5.6", + "from": "source-map@>=0.5.6 <0.6.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz" }, "sparkles": { "version": "1.0.0", "from": "sparkles@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz" }, - "spawn-sync": { - "version": "1.0.15", - "from": "spawn-sync@>=1.0.15 <2.0.0", - "resolved": "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.15.tgz" - }, "spdx-correct": { "version": "1.0.2", "from": "spdx-correct@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz" }, "spdx-exceptions": { - "version": "1.0.4", + "version": "1.0.5", "from": "spdx-exceptions@>=1.0.4 <2.0.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz" + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.5.tgz" }, "spdx-expression-parse": { "version": "1.0.2", @@ -3261,9 +3674,31 @@ "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz" }, "spdx-license-ids": { - "version": "1.2.0", + "version": "1.2.2", "from": "spdx-license-ids@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.0.tgz" + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz" + }, + "specificity": { + "version": "0.1.6", + "from": "specificity@>=0.1.5 <0.2.0", + "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.1.6.tgz" + }, + "split2": { + "version": "0.2.1", + "from": "split2@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/split2/-/split2-0.2.1.tgz", + "dependencies": { + "readable-stream": { + "version": "1.0.34", + "from": "readable-stream@>=1.0.33-1 <1.1.0-0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz" + }, + "through2": { + "version": "0.6.5", + "from": "through2@>=0.6.1 <0.7.0", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz" + } + } }, "sprintf-js": { "version": "1.0.3", @@ -3271,15 +3706,32 @@ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz" }, "sshpk": { - "version": "1.7.4", + "version": "1.9.0", "from": "sshpk@>=1.7.0 <2.0.0", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.7.4.tgz" + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.9.0.tgz", + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "from": "assert-plus@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" + } + } + }, + "stream-combiner": { + "version": "0.2.2", + "from": "stream-combiner@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz" }, "stream-consume": { "version": "0.1.0", "from": "stream-consume@>=0.1.0 <0.2.0", "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz" }, + "stream-shift": { + "version": "1.0.0", + "from": "stream-shift@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz" + }, "strict-uri-encode": { "version": "1.1.0", "from": "strict-uri-encode@>=1.0.0 <2.0.0", @@ -3320,10 +3772,22 @@ "from": "strip-indent@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz" }, + "stylehacks": { + "version": "2.3.1", + "from": "stylehacks@>=2.3.0 <3.0.0", + "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-2.3.1.tgz", + "dependencies": { + "minimist": { + "version": "1.2.0", + "from": "minimist@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz" + } + } + }, "stylelint": { - "version": "4.4.0", + "version": "4.5.1", "from": "stylelint@>=4.4.0 <5.0.0", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-4.4.0.tgz", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-4.5.1.tgz", "dependencies": { "balanced-match": { "version": "0.3.0", @@ -3336,21 +3800,26 @@ "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz" }, "lodash": { - "version": "4.6.1", + "version": "4.14.0", "from": "lodash@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.6.1.tgz" + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.0.tgz" + }, + "postcss-selector-parser": { + "version": "1.3.3", + "from": "postcss-selector-parser@>=1.3.3 <2.0.0", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-1.3.3.tgz" } } }, "stylelint-selector-bem-pattern": { - "version": "0.2.1", + "version": "0.2.3", "from": "stylelint-selector-bem-pattern@>=0.2.1 <0.3.0", - "resolved": "https://registry.npmjs.org/stylelint-selector-bem-pattern/-/stylelint-selector-bem-pattern-0.2.1.tgz", + "resolved": "https://registry.npmjs.org/stylelint-selector-bem-pattern/-/stylelint-selector-bem-pattern-0.2.3.tgz", "dependencies": { "lodash": { - "version": "4.6.1", + "version": "4.14.0", "from": "lodash@>=3.10.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.6.1.tgz" + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.0.tgz" } } }, @@ -3360,24 +3829,51 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz" }, "svgo": { - "version": "0.6.1", + "version": "0.6.6", "from": "svgo@>=0.6.1 <0.7.0", - "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.6.1.tgz" + "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.6.6.tgz" + }, + "synesthesia": { + "version": "1.0.1", + "from": "synesthesia@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/synesthesia/-/synesthesia-1.0.1.tgz", + "dependencies": { + "css-color-names": { + "version": "0.0.3", + "from": "css-color-names@0.0.3", + "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.3.tgz" + } + } }, "tar": { "version": "2.2.1", "from": "tar@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz" }, + "text-table": { + "version": "0.2.0", + "from": "text-table@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz" + }, + "through": { + "version": "2.3.8", + "from": "through@>=2.2.7 <3.0.0", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz" + }, "through2": { "version": "2.0.1", "from": "through2@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz", "dependencies": { + "isarray": { + "version": "1.0.0", + "from": "isarray@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + }, "readable-stream": { - "version": "2.0.5", + "version": "2.0.6", "from": "readable-stream@>=2.0.0 <2.1.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.5.tgz" + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz" } } }, @@ -3387,14 +3883,14 @@ "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz" }, "tildify": { - "version": "1.1.2", + "version": "1.2.0", "from": "tildify@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.1.2.tgz" + "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz" }, "time-stamp": { - "version": "1.0.0", + "version": "1.0.1", "from": "time-stamp@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.0.0.tgz" + "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.0.1.tgz" }, "to-absolute-glob": { "version": "0.1.1", @@ -3402,9 +3898,9 @@ "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz" }, "tough-cookie": { - "version": "2.2.1", - "from": "tough-cookie@>=2.2.0 <2.3.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz" + "version": "2.3.1", + "from": "tough-cookie@>=2.3.0 <2.4.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz" }, "trim-newlines": { "version": "1.0.0", @@ -3412,24 +3908,19 @@ "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz" }, "tunnel-agent": { - "version": "0.4.2", + "version": "0.4.3", "from": "tunnel-agent@>=0.4.1 <0.5.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz" + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz" }, "tweetnacl": { - "version": "0.14.1", - "from": "tweetnacl@>=0.13.0 <1.0.0", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.1.tgz" + "version": "0.13.3", + "from": "tweetnacl@>=0.13.0 <0.14.0", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz" }, - "typedarray": { - "version": "0.0.6", - "from": "typedarray@>=0.0.5 <0.1.0", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz" - }, - "uid-number": { - "version": "0.0.5", - "from": "uid-number@0.0.5", - "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz" + "unc-path-regex": { + "version": "0.1.2", + "from": "unc-path-regex@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz" }, "underscore": { "version": "1.8.3", @@ -3442,9 +3933,9 @@ "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz" }, "uniqid": { - "version": "1.0.0", - "from": "uniqid@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-1.0.0.tgz" + "version": "3.1.0", + "from": "uniqid@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-3.1.0.tgz" }, "uniqs": { "version": "2.0.0", @@ -3481,6 +3972,11 @@ "from": "validate-npm-package-license@>=3.0.1 <4.0.0", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz" }, + "vendors": { + "version": "1.0.0", + "from": "vendors@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.0.tgz" + }, "verror": { "version": "1.3.6", "from": "verror@1.3.6", @@ -3507,9 +4003,9 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz" }, "readable-stream": { - "version": "1.0.33", + "version": "1.0.34", "from": "readable-stream@>=1.0.33-1 <1.1.0-0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz" + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz" }, "strip-bom": { "version": "1.0.0", @@ -3539,19 +4035,29 @@ "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz" }, "which": { - "version": "1.2.4", - "from": "which@>=1.2.4 <2.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-1.2.4.tgz" + "version": "1.2.10", + "from": "which@>=1.2.10 <2.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-1.2.10.tgz" + }, + "which-module": { + "version": "1.0.0", + "from": "which-module@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz" + }, + "wide-align": { + "version": "1.1.0", + "from": "wide-align@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.0.tgz" }, "window-size": { - "version": "0.1.4", - "from": "window-size@>=0.1.4 <0.2.0", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz" + "version": "0.2.0", + "from": "window-size@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz" }, "wrap-ansi": { - "version": "1.0.0", - "from": "wrap-ansi@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-1.0.0.tgz" + "version": "2.0.0", + "from": "wrap-ansi@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.0.0.tgz" }, "wrap-promise": { "version": "1.0.1", @@ -3559,9 +4065,14 @@ "resolved": "https://registry.npmjs.org/wrap-promise/-/wrap-promise-1.0.1.tgz" }, "wrappy": { - "version": "1.0.1", + "version": "1.0.2", "from": "wrappy@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz" + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + }, + "write-file-stdout": { + "version": "0.0.2", + "from": "write-file-stdout@0.0.2", + "resolved": "https://registry.npmjs.org/write-file-stdout/-/write-file-stdout-0.0.2.tgz" }, "xtend": { "version": "4.0.1", @@ -3569,9 +4080,9 @@ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" }, "y18n": { - "version": "3.2.0", - "from": "y18n@>=3.2.0 <4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.0.tgz" + "version": "3.2.1", + "from": "y18n@>=3.2.1 <4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz" }, "yallist": { "version": "2.0.0", @@ -3579,14 +4090,21 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz" }, "yargs": { - "version": "3.32.0", - "from": "yargs@>=3.8.0 <4.0.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz" - }, - "zen-grids": { - "version": "2.0.1", - "from": "zen-grids@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/zen-grids/-/zen-grids-2.0.1.tgz" + "version": "4.8.1", + "from": "yargs@>=4.7.1 <5.0.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz" + }, + "yargs-parser": { + "version": "2.4.1", + "from": "yargs-parser@>=2.4.1 <3.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz", + "dependencies": { + "camelcase": { + "version": "3.0.0", + "from": "camelcase@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz" + } + } } } } diff --git a/package.json b/package.json index f1f7b08..89b9036 100644 --- a/package.json +++ b/package.json @@ -32,8 +32,8 @@ "npm": "^3.7.5", "postcss-reporter": "^1.3.3", "postcss-scss": "^0.1.6", + "singularitygs": "^1.7.0", "stylelint": "^4.4.0", - "stylelint-selector-bem-pattern": "^0.2.1", - "zen-grids": "^2.0.1" + "stylelint-selector-bem-pattern": "^0.2.1" } }