diff --git a/package.json b/package.json index 7c372aa9b..0ad740272 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "phantomjs-prebuilt": "^2.1.13", "postcss": "^5.1.2", "postcss-loader": "^0.11.1", - "postcss-salad": "^1.0.5", + "postcss-salad": "^1.0.8", "rimraf": "^2.5.4", "sinon": "^1.17.6", "sinon-chai": "^2.8.0", diff --git a/packages/theme-default/src/alert.css b/packages/theme-default/src/alert.css index 461c5f10b..05e2b1f5d 100644 --- a/packages/theme-default/src/alert.css +++ b/packages/theme-default/src/alert.css @@ -12,7 +12,7 @@ position: relative; background-color: var(--color-white); overflow: hidden; - color: #fff; + color: var(--color-white); opacity: 1; display: table; transition: opacity .2s; @@ -59,14 +59,14 @@ } & .el-alert__description { - color: #fff; + color: var(--color-white); font-size: var(--alert-description-font-size); margin: 5px 0 0 0; } @e closebtn { font-size: var(--alert-close-font-size); - color: #fff; + color: var(--color-white); opacity: 1; position: absolute 12px 15px * *; cursor: pointer; diff --git a/packages/theme-default/src/autocomplete.css b/packages/theme-default/src/autocomplete.css index f8dbeb475..d9ac6251f 100644 --- a/packages/theme-default/src/autocomplete.css +++ b/packages/theme-default/src/autocomplete.css @@ -12,8 +12,8 @@ left: 0; top: 110%; margin: 5px 0 0; - background-color: #fff; - border: 1px solid #D3DCE6; + background-color: var(--color-white); + border: 1px solid var(--color-base-gray); width: 100%; padding: 6px 0; z-index: 10; @@ -29,7 +29,7 @@ padding: 0 10px; margin: 0; cursor: pointer; - color: #475669; + color: var(--color-extra-light-black); font-size: 14px; white-space: nowrap; overflow: hidden; @@ -40,14 +40,14 @@ } &.highlighted { background-color: var(--color-primary); - color: #fff; + color: var(--color-white); } &:active { background-color: darken(var(--color-primary), 0.2); } &.divider { margin-top: 6px; - border-top: 1px solid #D3DCE6; + border-top: 1px solid var(--color-base-gray); } &.divider:last-child { margin-bottom: -6px; @@ -64,7 +64,7 @@ @utils-vertical-center; &:hover { - background-color: #fff; + background-color: var(--color-white); } } diff --git a/packages/theme-default/src/badge.css b/packages/theme-default/src/badge.css index 1ee409e7f..5332c3072 100644 --- a/packages/theme-default/src/badge.css +++ b/packages/theme-default/src/badge.css @@ -10,7 +10,7 @@ @e content { background-color: var(--badge-fill); border-radius: var(--badge-radius); - color: #fff; + color: var(--color-white); display: inline-block; font-size: var(--badge-font-size); height: var(--badge-size); @@ -18,7 +18,7 @@ padding: 0 var(--badge-padding); text-align: center; white-space: nowrap; - border: 1px solid #fff; + border: 1px solid var(--color-white); @when fixed { position: absolute 0 calc(var(--badge-size) / 2 + 1) * *; diff --git a/packages/theme-default/src/breadcrumb.css b/packages/theme-default/src/breadcrumb.css index bc0631e6f..78e425299 100644 --- a/packages/theme-default/src/breadcrumb.css +++ b/packages/theme-default/src/breadcrumb.css @@ -10,7 +10,7 @@ @e separator { margin: 0 8px; - color: #c0ccda; + color: var(--color-extra-light-silver); } @e item { float: left; @@ -18,7 +18,7 @@ @e inner { &, & a { transition: color .15s linear; - color:#475669; + color:var(--color-extra-light-black); &:hover { color: var(--color-primary); @@ -31,7 +31,7 @@ .el-breadcrumb__item__inner, .el-breadcrumb__item__inner a { &, &:hover { - color: #99a9bf; + color: var(--color-light-silver); cursor: text; } } diff --git a/packages/theme-default/src/button.css b/packages/theme-default/src/button.css index eab195722..144d3fb24 100644 --- a/packages/theme-default/src/button.css +++ b/packages/theme-default/src/button.css @@ -48,13 +48,13 @@ @when plain { &:hover, &:focus { - background: #fff; + background: var(--color-white); border-color: var(--color-primary); color: var(--color-primary); } &:active { - background: #fff; + background: var(--color-white); border-color: shade(var(--color-primary), var(--button-active-shade-percent)); color: shade(var(--color-primary), var(--button-active-shade-percent)); outline: none; @@ -85,9 +85,9 @@ &, &:hover, &:focus { - background-color: #fff; - border-color: #d3dce6; - color: #C0CCDA; + background-color: var(--color-white); + border-color: var(--color-base-gray); + color: var(--color-extra-light-silver); } } } @@ -190,14 +190,14 @@ @each $type in (primary, success, warning, danger, info) { .el-button--$type { &:first-child { - border-right-color: rgba(#fff, 0.5); + border-right-color: rgba(var(--color-white), 0.5); } &:last-child { - border-left-color: rgba(#fff, 0.5); + border-left-color: rgba(var(--color-white), 0.5); } &:not(:first-child):not(:last-child) { - border-left-color: rgba(#fff, 0.5); - border-right-color: rgba(#fff, 0.5); + border-left-color: rgba(var(--color-white), 0.5); + border-right-color: rgba(var(--color-white), 0.5); } } } diff --git a/packages/theme-default/src/card.css b/packages/theme-default/src/card.css index c080c43cd..6d92dfee4 100644 --- a/packages/theme-default/src/card.css +++ b/packages/theme-default/src/card.css @@ -5,7 +5,7 @@ @b card { border: 1px solid var(--card-border-color); border-radius: var(--card-border-radius); - background-color: #fff; + background-color: var(--color-white); overflow: hidden; box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, .12), 0px 0px 6px 0px rgba(0, 0, 0, .04); diff --git a/packages/theme-default/src/common/var.css b/packages/theme-default/src/common/var.css index 2bfd047fc..a57221d77 100644 --- a/packages/theme-default/src/common/var.css +++ b/packages/theme-default/src/common/var.css @@ -12,33 +12,44 @@ /* Colors -------------------------- */ --color-primary: #20a0ff; + --color-success: #13ce66; --color-warning: #f7ba2a; --color-danger: #ff4949; --color-info: #50bfff; - --color-blue: #2e90fe; - --color-blue-light: #5da9ff; - --color-blue-lighter: rgba(var(--color-blue), 0.12); + + --color-secondary: color(var(--color-primary) s(99%) l(*0.9)); --color-white: #fff; + --color-dark-white: color(var(--color-white) blend(var(--color-primary) 2%)); --color-black: #000; - --color-grey: #c0ccda; + + --color-base-black: color(var(--color-primary) h(+6) s(33%) l(18%)); + --color-light-black: color(var(--color-base-black) h(+5) s(27%) l(27%)); + --color-extra-light-black: color(var(--color-base-black) h(+2) s(19%) l(35%)); + + --color-base-silver: color(var(--color-base-black) h(+3) s(16%) l(58%)); + --color-light-silver: color(var(--color-base-black) h(+3) s(23%) l(67%)); + --color-extra-light-silver: color(var(--color-base-black) s(26%) l(80%)); + + --color-base-gray: color(var(--color-base-black) s(28%) l(86%)); + --color-light-gray: color(var(--color-base-black) h(+10) s(33%) l(92%)); + --color-extra-light-gray: color(var(--color-base-black) h(+6) s(33%) l(95%)); /* Link -------------------------- */ - --link-color: #475669; + --link-color: var(--color-extra-light-black); --link-hover-color: var(--color-primary); /* Border -------------------------- */ --border-width-base: 1px; --border-style-base: solid; - --border-color-base: var(--color-grey); - --border-color-hover: #8492a6; + --border-color-base: var(--color-extra-light-silver); + --border-color-hover: var(--color-base-silver); --border-base: var(--border-width-base) var(--border-style-base) var(--border-color-base); --border-radius-base: 4px; --border-radius-small: 2px; --border-radius-circle: 100%; - --shadow-base: 0 0 2px rgba(var(--color-black), 0.18), 0 0 1px var(--color-blue-light); /* Box-shadow -------------------------- */ @@ -52,7 +63,7 @@ /* Font -------------------------- */ --font-size-base: 14px; - --font-color-base: #1f2d3d; + --font-color-base: var(--color-base-black); --font-color-disabled-base: #bbb; /* Size @@ -67,9 +78,9 @@ /* Disable base -------------------------- */ - --disabled-fill-base: #EFF2F7; + --disabled-fill-base: var(--color-extra-light-gray); --disabled-color-base: #bbb; - --disabled-border-base: #D3DCE6; + --disabled-border-base: var(--color-base-gray); /* Icon -------------------------- */ @@ -78,7 +89,7 @@ /* Checkbox -------------------------- */ --checkbox-font-size: 14px; - --checkbox-color: #1f2d3d; + --checkbox-color: var(--color-base-black); --checkbox-input-height: 18px; --checkbox-input-width: 18px; --checkbox-input-border-radius: var(--border-radius-base); @@ -95,17 +106,16 @@ --checkbox-disabled-checked-input-border-color: var(--disabled-border-base); --checkbox-disabled-checked-icon-color: var(--color-white); - --checkbox-checked-input-border-color: var(--color-blue); + --checkbox-checked-input-border-color: var(--color-secondary); --checkbox-checked-input-fill: var(--color-primary); --checkbox-checked-icon-color: var(--fill-base); - --checkbox-input-shadow-hover: var(--shadow-base); --checkbox-input-border-color-hover: var(--color-primary); /* Radio -------------------------- */ --radio-font-size: 14px; - --radio-color: #1f2d3d; + --radio-color: var(--color-base-black); --radio-input-height: 18px; --radio-input-width: 18px; --radio-input-border-radius: var(--border-radius-circle); @@ -126,7 +136,6 @@ --radio-checked-input-fill: var(--color-white); --radio-checked-icon-color: var(--color-primary); - --radio-input-shadow-hover: var(--shadow-base); --radio-input-border-color-hover: var(--color-primary); --radio-button-font-size: var(--font-size-base); @@ -136,9 +145,9 @@ --select-border-color-hover: var(--border-color-hover); --select-disabled-border: var(--disabled-border-base); --select-font-size: var(--font-size-base); - --select-close-hover-color: #99a9bf; + --select-close-hover-color: var(--color-light-silver); - --select-input-color: var(--color-grey); + --select-input-color: var(--color-extra-light-silver); --select-multiple-input-color: #666; --select-input-focus-background: var(--color-primary); --select-input-font-size: 12px; @@ -148,11 +157,11 @@ --select-tag-background: var(--color-primary); --select-option-color: var(--link-color); - --select-option-disabled-color: var(--color-grey); + --select-option-disabled-color: var(--color-extra-light-silver); --select-option-height: 36px; - --select-option-hover-background: #e5e9f2; + --select-option-hover-background: var(--color-light-gray); --select-option-selected: var(--color-primary); - --select-option-selected-hover: #1D8CE0; + --select-option-selected-hover: shade(var(--color-primary), 0.12); --select-group-color: #999; --select-group-height: 30px; @@ -203,8 +212,8 @@ --message-min-width: 300px; --message-padding: 10px 12px; --message-content-color: var(--border-color-hover); - --message-close-color: var(--color-grey); - --message-close-hover-color: #99A9BF; + --message-close-color: var(--color-extra-light-silver); + --message-close-hover-color: var(--color-light-silver); --message-success-color: var(--color-success); --message-info-color: var(--color-info); @@ -220,10 +229,10 @@ --notification-font-size: var(--font-size-base); --notification-color: var(--border-color-hover); --notification-title-font-size: 16px; - --notification-title-color: #1f2d3d; + --notification-title-color: var(--color-base-black); - --notification-close-color: var(--color-grey); - --notification-close-hover-color: #99A9BF; + --notification-close-color: var(--color-extra-light-silver); + --notification-close-hover-color: var(--color-light-silver); --notification-success-color: var(--color-success); --notification-info-color: var(--color-info); @@ -236,7 +245,6 @@ --input-color: var(--font-color-base); --input-width: 140px; --input-height: 36px; - --input-shadow-hover: var(--shadow-base); --input-border: var(--border-base); --input-border-color: var(--border-color-base); --input-border-radius: var(--border-radius-base); @@ -244,8 +252,8 @@ --input-fill: var(--color-white); --input-fill-disabled: var(--disabled-fill-base); --input-color-disabled: var(--font-color-disabled-base); - --input-icon-color: var(--color-grey); - --input-placeholder-color: #99a9bf; + --input-icon-color: var(--color-extra-light-silver); + --input-placeholder-color: var(--color-light-silver); --input-max-width: 314px; --input-hover-border: var(--border-color-hover); @@ -256,7 +264,7 @@ --input-disabled-fill: var(--disabled-fill-base); --input-disabled-border: var(--disabled-border-base); --input-disabled-color: var(--disabled-color-base); - --input-disabled-placeholder-color: var(--color-grey); + --input-disabled-placeholder-color: var(--color-extra-light-silver); --input-large-font-size: 16px; --input-large-height: 42px; @@ -276,8 +284,8 @@ --cascader-menu-border-color: var(--border-color-base); --cascader-menu-border-width: var(--border-width-base); --cascader-menu-color: var(--font-color-base); - --cascader-menu-option-color-active: var(--color-blue); - --cascader-menu-option-fill-active: rgba(var(--color-blue), 0.12); + --cascader-menu-option-color-active: var(--color-secondary); + --cascader-menu-option-fill-active: rgba(var(--color-secondary), 0.12); --cascader-menu-option-color-hover: var(--font-color-base); --cascader-menu-option-fill-hover: rgba(var(--color-black), 0.06); --cascader-menu-option-color-disabled: #999; @@ -301,15 +309,14 @@ -------------------------- */ --tab-font-size: var(--font-size-base); --tab-border-line: 1px solid #e4e4e4; - --tab-header-color-active: var(--color-blue); + --tab-header-color-active: var(--color-secondary); --tab-header-color-hover: var(--font-color-base); --tab-header-color: var(--font-color-base); --tab-header-fill-active: rgba(var(--color-black), 0.06); --tab-header-fill-hover: rgba(var(--color-black), 0.06); --tab-vertical-header-width: 90px; --tab-vertical-header-count-color: var(--color-white); - --tab-vertical-header-count-fill: var(--color-blue); - --tab-horizontal-border: 2px solid #438de0; + --tab-vertical-header-count-fill: var(--color-secondary); /* Button -------------------------- */ @@ -331,7 +338,7 @@ --button-mini-padding-vertical: 4px; --button-mini-padding-horizontal: 4px; - --button-default-color: #1F2D3D; + --button-default-color: var(--color-base-black); --button-default-fill: var(--color-white); --button-default-border: #c4c4c4; @@ -339,8 +346,8 @@ --button-ghost-fill: transparent; --button-ghost-border: none; - --button-disabled-color: var(--color-grey); - --button-disabled-fill: #EFF2F7; + --button-disabled-color: var(--color-extra-light-silver); + --button-disabled-fill: var(--color-extra-light-gray); --button-disabled-border: var(--disabled-border-base); --button-primary-border: var(--color-primary); @@ -374,9 +381,9 @@ /* Switch -------------------------- */ --switch-on-color: var(--color-primary); - --switch-off-color: var(--color-grey); - --switch-disabled-color: #E5E9F3; - --switch-disabled-text-color: #F9FAFC; + --switch-off-color: var(--color-extra-light-silver); + --switch-disabled-color: var(--color-light-gray); + --switch-disabled-text-color: var(--color-dark-white); --switch-font-size: var(--font-size-base); --switch-core-border-radius: 12px; @@ -386,22 +393,21 @@ /* Dialog -------------------------- */ - --dialog-background-color: var(--color-blue); - --dialog-footer-background: var(--color-blue-lighter); + --dialog-background-color: var(--color-secondary); --dialog-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); --dialog-tiny-width: 30%; --dialog-small-width: 50%; --dialog-large-width: 90%; - --dialog-close-color: var(--color-grey); + --dialog-close-color: var(--color-extra-light-silver); --dialog-close-hover-color: var(--color-primary); --dialog-title-font-size: 16px; --dialog-font-size: 14px; /* Table -------------------------- */ - --table-border-color: #e0e6ed; - --table-text-color: #1f2d3d; - --table-header-background: #EFF2F7; + --table-border-color: color(var(--border-color-base) h(-3) s(27%) l(90%)); + --table-text-color: var(--color-base-black); + --table-header-background: var(--color-extra-light-gray); /* Pagination -------------------------- */ @@ -409,7 +415,7 @@ --pagination-fill: var(--color-white); --pagination-color: var(--link-color); --pagination-border-radius: 2px; - --pagination-button-color: #99a9bf; + --pagination-button-color: var(--color-light-silver); --pagination-button-size: 28px; --pagination-button-disabled-color: #e4e4e4; --pagination-button-disabled-fill: var(--color-white); @@ -425,14 +431,14 @@ --popover-arrow-size: 6px; --popover-padding: 10px; --popover-title-font-size: 13px; - --popover-title-color: #1f2d3d; + --popover-title-color: var(--color-base-black); /* Tooltip -------------------------- */ - --tooltip-fill: #1f2d3d; + --tooltip-fill: var(--color-base-black); --tooltip-color: var(--color-white); --tooltip-font-size: 12px; - --tooltip-border-color: #1f2d3d; + --tooltip-border-color: var(--color-base-black); --tooltip-arrow-size: 6px; --tooltip-padding: 10px; @@ -445,8 +451,8 @@ --tag-font-size: 12px; --tag-border-radius: 4px; - --tag-gray-fill: #e5e9f2; - --tag-gray-border: #e5e9f2; + --tag-gray-fill: var(--color-light-gray); + --tag-gray-border: var(--color-light-gray); --tag-gray-color: var(--link-color); --tag-primary-fill: rgba(32,159,255,0.10); @@ -468,7 +474,7 @@ /* Dropdown -------------------------- */ --dropdown-menu-box-shadow: var(--box-shadow-dark); - --dropdown-menuItem-hover-fill: #e5e9f2; + --dropdown-menuItem-hover-fill: var(--color-light-gray); --dropdown-menuItem-hover-color: var(--link-color); /* Badge @@ -488,10 +494,10 @@ /* Slider --------------------------*/ --slider-main-background-color: var(--color-primary); - --slider-runway-background-color: #e5e9f2; - --slider-button-hover-color: #1d8ce0; - --slider-stop-background-color: var(--color-grey); - --slider-disable-color: var(--color-grey); + --slider-runway-background-color: var(--color-light-gray); + --slider-button-hover-color: shade(var(--color-primary), 0.12); + --slider-stop-background-color: var(--color-extra-light-silver); + --slider-disable-color: var(--color-extra-light-silver); --slider-margin: 16px 0; --slider-border-radius: 3px; @@ -509,14 +515,14 @@ /* Steps --------------------------*/ --menu-item-color: var(--link-color); - --menu-item-fill: #eff2f7; + --menu-item-fill: var(--color-extra-light-gray); --menu-item-hover-fill: var(--disabled-border-base); - --submenu-item-fill: #e5e9f2; + --submenu-item-fill: var(--color-light-gray); --dark-menu-item-color: var(--link-color); - --dark-menu-item-fill: #324057; + --dark-menu-item-fill: var(--color-light-black); --dark-menu-item-hover-fill: var(--link-color); - --dark-submenu-item-fill: #1f2d3d; + --dark-submenu-item-fill: var(--color-base-black); /* Rate --------------------------*/ @@ -524,19 +530,19 @@ --rate-font-size: var(--font-size-base); --rate-icon-size: 18px; --rate-icon-margin: 6px; - --rate-icon-color: #C6D1DE; + --rate-icon-color: var(--color-extra-light-silver); /* DatePicker --------------------------*/ --datepicker-color: var(--link-color); --datepicker-off-color: #ddd; --datepicker-header-color: var(--border-color-hover); - --datepicker-icon-color: #99a9bf; + --datepicker-icon-color: var(--color-light-silver); --datepicker-border-color: var(--disabled-border-base); --datepicker-inner-border-color: #e4e4e4; - --datepicker-cell-hover-color: #e5e9f2; - --datepicker-inrange-color: #D3ECFF; - --datepicker-inrange-hover-color: #AFDCFF; + --datepicker-cell-hover-color: var(--color-light-gray); + --datepicker-inrange-color: tint(var(--color-primary), 0.8); + --datepicker-inrange-hover-color: tint(var(--color-primary), 0.64); --datepicker-active-color: var(--color-primary); --datepicker-text-hover-color: var(--color-primary); @@ -547,8 +553,8 @@ /* Scrollbar --------------------------*/ - --scrollbar-background-color: rgba(#99a9bf, .3); - --scrollbar-hover-background-color: rgba(#99a9bf, .5); + --scrollbar-background-color: rgba(var(--color-light-silver), .3); + --scrollbar-hover-background-color: rgba(var(--color-light-silver), .5); /* Carousel --------------------------*/ @@ -564,14 +570,14 @@ /* Collapse --------------------------*/ - --collapse-border-color: #e0e6ed; + --collapse-border-color: color(var(--border-color-base) h(-3) s(27%) l(90%)); --collapse-header-height: 43px; --collapse-border-radius: 0; --collapse-header-padding: 20px; - --collapse-header-fill: #fff; - --collapse-header-color: #475669; + --collapse-header-fill: var(--color-white); + --collapse-header-color: var(--color-extra-light-black); --collapse-header-size: 13px; - --collapse-content-fill: #f9fafc; + --collapse-content-fill: var(--color-dark-white); --collapse-content-size: 13px; - --collapse-content-color: #1f2d3d; + --collapse-content-color: var(--color-base-black); } diff --git a/packages/theme-default/src/date-picker/month-table.css b/packages/theme-default/src/date-picker/month-table.css index f632d349f..e9a687f33 100644 --- a/packages/theme-default/src/date-picker/month-table.css +++ b/packages/theme-default/src/date-picker/month-table.css @@ -31,7 +31,7 @@ &.current .cell { background-color: var(--datepicker-active-color) !important; - color: #fff; + color: var(--color-white); } } } diff --git a/packages/theme-default/src/date-picker/picker-panel.css b/packages/theme-default/src/date-picker/picker-panel.css index 7e63bdcad..e2af06850 100644 --- a/packages/theme-default/src/date-picker/picker-panel.css +++ b/packages/theme-default/src/date-picker/picker-panel.css @@ -5,7 +5,7 @@ color: var(--datepicker-color); border: 1px solid var(--datepicker-border-color); box-shadow: 0 2px 6px #ccc; - background: #fff; + background: var(--color-white); border-radius: 2px; line-height: 20px; margin: 5px 0; @@ -27,7 +27,7 @@ border-top: 1px solid var(--datepicker-inner-border-color); padding: 4px; text-align: right; - background-color: #fff; + background-color: var(--color-white); position: relative; } @@ -103,7 +103,7 @@ border-right: 1px solid var(--datepicker-inner-border-color); box-sizing: border-box; padding-top: 6px; - background-color: #f9fafc; + background-color: var(--color-dark-white); } .el-picker-panel *[slot=sidebar] + .el-picker-panel__body, diff --git a/packages/theme-default/src/date-picker/time-picker.css b/packages/theme-default/src/date-picker/time-picker.css index ee0b288ad..d559ac02b 100644 --- a/packages/theme-default/src/date-picker/time-picker.css +++ b/packages/theme-default/src/date-picker/time-picker.css @@ -75,7 +75,7 @@ background-color: transparent; outline: none; font-size: 12px; - color: #8492a6; + color: var(--color-base-silver); &.confirm { font-weight: 800; diff --git a/packages/theme-default/src/date-picker/year-table.css b/packages/theme-default/src/date-picker/year-table.css index 29b6b50a8..5aff5a2c7 100644 --- a/packages/theme-default/src/date-picker/year-table.css +++ b/packages/theme-default/src/date-picker/year-table.css @@ -35,7 +35,7 @@ &.current .cell { background-color: var(--datepicker-active-color) !important; - color: #fff; + color: var(--color-white); } } } diff --git a/packages/theme-default/src/dialog.css b/packages/theme-default/src/dialog.css index af7bb3539..015841fba 100755 --- a/packages/theme-default/src/dialog.css +++ b/packages/theme-default/src/dialog.css @@ -8,7 +8,7 @@ position: absolute; left: 50%; transform: translateX(-50%); - background: #fff; + background: var(--color-white); border-radius: var(--border-radius-small); box-shadow: var(--dialog-box-shadow); box-sizing: border-box; @@ -55,12 +55,12 @@ line-height: 1; font-size: var(--dialog-title-font-size); font-weight: bold; - color: #1f2d3d; + color: var(--color-base-black); } @e body { padding: 30px 20px; - color: #475669; + color: var(--color-extra-light-black); font-size: var(--dialog-font-size); } diff --git a/packages/theme-default/src/dropdown.css b/packages/theme-default/src/dropdown.css index dae1f7a2e..fef3333ea 100644 --- a/packages/theme-default/src/dropdown.css +++ b/packages/theme-default/src/dropdown.css @@ -6,7 +6,7 @@ @b dropdown { display: inline-block; position: relative; - color: #475669; + color: var(--color-extra-light-black); font-size: var(--font-size-base); .el-button-group { @@ -27,8 +27,8 @@ } @b dropdown-menu { margin: 5px 0; - background-color: #fff; - border: 1px solid #D3DCE6; + background-color: var(--color-white); + border: 1px solid var(--color-base-gray); box-shadow: var(--dropdown-menu-box-shadow); padding: 6px 0; z-index: 10; @@ -51,19 +51,19 @@ @m divided { position: relative; margin-top: 6px; - border-top: 1px solid #D3DCE6; + border-top: 1px solid var(--color-base-gray); &:before { content: ''; height: 6px; display: block; margin: 0 -10px; - background-color: #fff; + background-color: var(--color-white); } } @when disabled { cursor: default; - color: #c0ccda; + color: var(--color-extra-light-silver); pointer-events: none; } } diff --git a/packages/theme-default/src/form.css b/packages/theme-default/src/form.css index 9e19cbd0d..d5fb6e856 100644 --- a/packages/theme-default/src/form.css +++ b/packages/theme-default/src/form.css @@ -40,7 +40,7 @@ vertical-align: middle; float: left; font-size: 14px; - color: #5e6d82; + color: var(--color-extra-light-black); line-height: 1; padding: 11px 12px 11px 0; box-sizing: border-box; @@ -52,7 +52,7 @@ @utils-clearfix; } @e error { - color: #ff4949; + color: var(--color-danger); font-size: 12px; line-height: 1; padding-top: 4px; diff --git a/packages/theme-default/src/input-number.css b/packages/theme-default/src/input-number.css index a3df29049..cb804fb56 100644 --- a/packages/theme-default/src/input-number.css +++ b/packages/theme-default/src/input-number.css @@ -20,7 +20,7 @@ line-height: calc(var(--input-height) - 2); top: 1px; text-align: center; - color: #99A9BF; + color: var(--color-light-silver); cursor: pointer; position: absolute; z-index: 1; diff --git a/packages/theme-default/src/input.css b/packages/theme-default/src/input.css index 726d3bfc0..0db64da5a 100644 --- a/packages/theme-default/src/input.css +++ b/packages/theme-default/src/input.css @@ -114,8 +114,8 @@ display: table-cell; } @e append, prepend { - background-color: #f9fafc; - color: #99a9bf; + background-color: var(--color-dark-white); + color: var(--color-light-silver); vertical-align: middle; display: table-cell; position: relative; @@ -184,7 +184,7 @@ width: 100%; font-size: var(--font-size-base); color: var(--input-color); - background-color: #fff; + background-color: var(--color-white); background-image: none; border: var(--input-border); border-radius: 4px; diff --git a/packages/theme-default/src/menu.css b/packages/theme-default/src/menu.css index 6edd6159b..c9aec06c0 100644 --- a/packages/theme-default/src/menu.css +++ b/packages/theme-default/src/menu.css @@ -33,18 +33,18 @@ & .el-menu-item, & .el-submenu__title { - color: #c0ccda; + color: var(--color-extra-light-silver); &:hover { - background-color: #475669; + background-color: var(--color-extra-light-black); } } & .el-submenu .el-menu { - background-color: #1f2f3d; + background-color: var(--color-base-black); & .el-menu-item:hover { - background-color: #475669; + background-color: var(--color-extra-light-black); } } } @@ -76,9 +76,9 @@ position: absolute; top: 65px; left: 0; - border:1px solid #d3dce6; + border:1px solid var(--color-base-gray); padding: 5px 0; - background-color: #fff; + background-color: var(--color-white); z-index: 100; min-width: 100%; box-shadow: 0px 2px 4px 0px rgba(0,0,0,0.12), 0px 0px 6px 0px rgba(0,0,0,0.04); @@ -91,7 +91,7 @@ } & .el-menu-item { - background-color: #fff; + background-color: var(--color-white); float: none; height: 36px; line-height: 36px; @@ -102,7 +102,7 @@ position: static; vertical-align: middle; margin-left: 5px; - color: #99a9bf; + color: var(--color-light-silver); margin-top: -3px; } } @@ -125,10 +125,10 @@ & .el-submenu { .el-menu-item, .el-submenu-title { - color: #475669; + color: var(--color-extra-light-black); &:hover { - background-color: #d3dce6; + background-color: var(--color-base-gray); } } .el-menu-item.is-active { @@ -152,7 +152,7 @@ margin-right: 0; } &:hover { - background-color: #d3dce6; + background-color: var(--color-base-gray); } @when active { color: var(--color-primary); @@ -165,11 +165,11 @@ @extend menu-item; &:hover { - background-color: #d3dce6; + background-color: var(--color-base-gray); } } & .el-menu { - background-color: #e5e9f2; + background-color: var(--color-light-gray); } & .el-menu-item { height: 50px; @@ -177,7 +177,7 @@ padding: 0 45px; &:hover { - background-color: #d3dce6; + background-color: var(--color-base-gray); } } @e icon-arrow { @@ -213,7 +213,7 @@ line-height: normal; font-size: 14px; padding-left: 20px; - color: #99a9bf; + color: var(--color-light-silver); } } } diff --git a/packages/theme-default/src/message-box.css b/packages/theme-default/src/message-box.css index 161a9b3e5..db63cae61 100644 --- a/packages/theme-default/src/message-box.css +++ b/packages/theme-default/src/message-box.css @@ -10,7 +10,7 @@ text-align: left; display: inline-block; vertical-align: middle; - background-color: #fff; + background-color: var(--color-white); width: var(--msgbox-width); border-radius: var(--msgbox-border-radius); font-size: var(--msgbox-font-size); diff --git a/packages/theme-default/src/message.css b/packages/theme-default/src/message.css index 82bcbd26f..3f79ba328 100644 --- a/packages/theme-default/src/message.css +++ b/packages/theme-default/src/message.css @@ -13,7 +13,7 @@ left: 50%; top: 20px; transform: translateX(-50%); - background-color: #fff; + background-color: var(--color-white); transition: opacity 0.3s, transform .4s; overflow: hidden; diff --git a/packages/theme-default/src/mixins/_button.css b/packages/theme-default/src/mixins/_button.css index dbc440c8e..8f065fe0d 100644 --- a/packages/theme-default/src/mixins/_button.css +++ b/packages/theme-default/src/mixins/_button.css @@ -30,13 +30,13 @@ &:hover, &:focus { - background: #fff; + background: var(--color-white); border-color: $border-color; color: $background-color; } &:active { - background: #fff; + background: var(--color-white); border-color: shade($border-color, var(--button-active-shade-percent)); color: shade($background-color, var(--button-active-shade-percent)); outline: none; diff --git a/packages/theme-default/src/notification.css b/packages/theme-default/src/notification.css index a236dce74..f43eb4b51 100644 --- a/packages/theme-default/src/notification.css +++ b/packages/theme-default/src/notification.css @@ -10,7 +10,7 @@ border-radius: var(--border-radius-small); position: fixed; right: 16px; - background-color: #fff; + background-color: var(--color-white); box-shadow: var(--notification-shadow); transition: opacity 0.3s, transform .3s, right .3s, top 0.4s; overflow: hidden; diff --git a/packages/theme-default/src/progress.css b/packages/theme-default/src/progress.css index c9e6ba896..8a0d45d8c 100644 --- a/packages/theme-default/src/progress.css +++ b/packages/theme-default/src/progress.css @@ -8,7 +8,7 @@ @e text { font-size:14px; - color:#475669; + color:var(--color-extra-light-black); display: inline-block; vertical-align: middle; margin-left: 10px; @@ -81,7 +81,7 @@ @e outer { height: 6px; border-radius: 100px; - background-color: #e5e9f2; + background-color: var(--color-light-gray); overflow: hidden; position: relative; vertical-align: middle; @@ -102,7 +102,7 @@ @e innerText { display: inline-block; vertical-align: middle; - color: #fff; + color: var(--color-white); font-size: 12px; margin: 0 5px; } diff --git a/packages/theme-default/src/radio.css b/packages/theme-default/src/radio.css index d68b4820b..f76bda170 100644 --- a/packages/theme-default/src/radio.css +++ b/packages/theme-default/src/radio.css @@ -87,7 +87,7 @@ } &::after { - circle: 6px #fff; + circle: 6px var(--color-white); content: ""; position: absolute; left: 50%; diff --git a/packages/theme-default/src/step.css b/packages/theme-default/src/step.css index 5b9fc3946..9c431cfc6 100644 --- a/packages/theme-default/src/step.css +++ b/packages/theme-default/src/step.css @@ -25,7 +25,7 @@ display: inline-block; position: absolute; border-color: inherit; - background-color: #c0ccda; + background-color: var(--color-extra-light-silver); @when icon { @when horizontal { @@ -83,59 +83,59 @@ border-style: solid; @when process { - color: #fff; - background-color: #c0ccda; - border-color: #c0ccda; + color: var(--color-white); + background-color: var(--color-extra-light-silver); + border-color: var(--color-extra-light-silver); } @when wait { - color: #c0ccda; - background-color: #fff; - border-color: #c0ccda; + color: var(--color-extra-light-silver); + background-color: var(--color-white); + border-color: var(--color-extra-light-silver); } @when success { - color: #fff; - background-color: #13ce66; - border-color: #13ce66; + color: var(--color-white); + background-color: var(--color-success); + border-color: var(--color-success); } @when error { - color: #fff; - background-color: #ff4949; - border-color: #ff4949; + color: var(--color-white); + background-color: var(--color-danger); + border-color: var(--color-danger); } @when finish { - color: #fff; - background-color: #20a0ff; - border-color: #20a0ff; + color: var(--color-white); + background-color: var(--color-primary); + border-color: var(--color-primary); } } @when process { - color: #c0ccda; - border-color: #c0ccda; + color: var(--color-extra-light-silver); + border-color: var(--color-extra-light-silver); } @when wait { - color: #c0ccda; - border-color: #c0ccda; + color: var(--color-extra-light-silver); + border-color: var(--color-extra-light-silver); } @when success { - color: #13ce66; - border-color: #13ce66; + color: var(--color-success); + border-color: var(--color-success); } @when error { - color: #ff4949; - border-color: #ff4949; + color: var(--color-danger); + border-color: var(--color-danger); } @when finish { - color: #20a0ff; - border-color: #20a0ff; + color: var(--color-primary); + border-color: var(--color-primary); } } @@ -152,27 +152,27 @@ @when process { font-weight: 700; - color: #475669; + color: var(--color-extra-light-black); } @when wait { font-weight: normal; - color: #99a9bf; + color: var(--color-light-silver); } @when success { font-weight: 700; - color: #13ce66; + color: var(--color-success); } @when error { font-weight: 700; - color: #ff4949; + color: var(--color-danger); } @when finish { font-weight: 700; - color: #20a0ff; + color: var(--color-primary); } } @@ -182,23 +182,23 @@ line-height: 14px; @when process { - color: #8492a6; + color: var(--color-base-silver); } @when wait { - color: #c0ccda; + color: var(--color-extra-light-silver); } @when success { - color: #13ce66; + color: var(--color-success); } @when error { - color: #ff4949; + color: var(--color-danger); } @when finish { - color: #20a0ff; + color: var(--color-primary); } } } diff --git a/packages/theme-default/src/table-column.css b/packages/theme-default/src/table-column.css index 1dfe3707c..e8cc13d84 100644 --- a/packages/theme-default/src/table-column.css +++ b/packages/theme-default/src/table-column.css @@ -12,9 +12,9 @@ } @b table-filter { - border: solid 1px #d3dce6; + border: solid 1px var(--color-base-gray); border-radius: 2px; - background-color: #fff; + background-color: var(--color-white); box-shadow: var(--dropdown-menu-box-shadow); box-sizing: border-box; margin: 2px 0; @@ -39,8 +39,8 @@ } @when active { - background-color: #20a0ff; - color: #fff; + background-color: var(--color-primary); + color: var(--color-white); } } @@ -49,19 +49,19 @@ } @e bottom { - border-top: 1px solid #d3dce6; + border-top: 1px solid var(--color-base-gray); padding: 8px; button { background: transparent; border: none; - color: #8492a6; + color: var(--color-base-silver); cursor: pointer; font-size: var(--font-size-base); padding: 0 3px; &:hover { - color: #20a0ff; + color: var(--color-primary); } &:focus { @@ -69,7 +69,7 @@ } &.is-disabled { - color: #c0ccda; + color: var(--color-extra-light-silver); cursor: not-allowed; } } diff --git a/packages/theme-default/src/table.css b/packages/theme-default/src/table.css index 8bb9a6c32..4f2482082 100644 --- a/packages/theme-default/src/table.css +++ b/packages/theme-default/src/table.css @@ -11,7 +11,7 @@ box-sizing: border-box; width: 100%; max-width: 100%; - background-color: #fff; + background-color: var(--color-white); border: 1px solid var(--table-border-color); font-size: 14px; color: var(--table-text-color); @@ -63,7 +63,7 @@ left: 50%; top: 50%; transform: translate(-50%, -50%); - color: #5e6d82; + color: color(var(--color-primary) s(16%) l(44%)); } @e expand-column { @@ -96,11 +96,11 @@ @e expanded-cell { padding: 20px 50px; - background-color: #f9fafc; + background-color: var(--color-dark-white); box-shadow: inset 0 2px 0 #f4f4f4; &:hover { - background-color: #f9fafc !important; + background-color: var(--color-dark-white) !important; } } @@ -277,7 +277,7 @@ box-sizing: border-box; &.highlight { - color: #20a0ff; + color: var(--color-primary); } } @@ -307,13 +307,13 @@ top: 11px; border-top: none; border-right: 5px solid transparent; - border-bottom: 5px solid #99a9bf; + border-bottom: 5px solid var(--color-light-silver); border-left: 5px solid transparent; } &.descending { bottom: 11px; - border-top: 5px solid #99a9bf; + border-top: 5px solid var(--color-light-silver); border-right: 5px solid transparent; border-bottom: none; border-left: 5px solid transparent; @@ -321,11 +321,11 @@ } & .ascending .sort-caret.ascending { - border-bottom-color: #475669; + border-bottom-color: var(--color-extra-light-black); } & .descending .sort-caret.descending { - border-top-color: #475669; + border-top-color: var(--color-extra-light-black); } & th.gutter, td.gutter { @@ -361,7 +361,7 @@ } & tr { - background-color: #fff; + background-color: var(--color-white); } @modifier striped { @@ -372,7 +372,7 @@ } &.current-row td { - background: #EFF7FF; + background: color(var(--color-primary) tint(92%)); } } } @@ -380,11 +380,11 @@ @e body { tr.hover-row > td { - background-color: #eff2f7; + background-color: var(--color-extra-light-gray); } tr.current-row > td { - background: #eff7ff; + background: color(var(--color-primary) tint(92%)); } } @@ -411,7 +411,7 @@ cursor: pointer; & i { - color: #99a9bf; + color: var(--color-light-silver); } } @@ -423,7 +423,7 @@ @modifier enable-row-hover { tr:hover > td { - background-color: #eff2f7; + background-color: var(--color-extra-light-gray); } } diff --git a/packages/theme-default/src/tabs.css b/packages/theme-default/src/tabs.css index 678c44465..985ba884b 100644 --- a/packages/theme-default/src/tabs.css +++ b/packages/theme-default/src/tabs.css @@ -4,7 +4,7 @@ @component-namespace el { @b tabs { @e header { - border-bottom: 1px solid #d3dce6; + border-bottom: 1px solid var(--color-base-gray); padding: 0; position: relative; margin: 0 0 15px; @@ -28,7 +28,7 @@ float: left; list-style: none; font-size: 14px; - color: #8492a6; + color: var(--color-base-silver); margin-bottom: -1px; position: relative; @@ -43,8 +43,8 @@ } &:hover { - background-color: #99a9bf; - color: #fff; + background-color: var(--color-light-silver); + color: var(--color-white); } } @@ -53,7 +53,7 @@ } &:hover { - color: #1f2d3d; + color: var(--color-base-black); cursor: pointer; } @@ -96,8 +96,8 @@ } } &.is-active { - border: 1px solid #d3dce6; - border-bottom-color: #fff; + border: 1px solid var(--color-base-gray); + border-bottom-color: var(--color-white); border-radius: 4px 4px 0 0; &.is-closable { @@ -111,15 +111,15 @@ } } @m border-card { - background: #fff; - border: 1px solid #d3dce6; + background: var(--color-white); + border: 1px solid var(--color-base-gray); box-shadow: 0px 2px 4px 0px rgba(0,0,0,0.12), 0px 0px 6px 0px rgba(0,0,0,0.04); &>.el-tabs__content { padding: 15px; } &>.el-tabs__header { - background-color: #eff2f7; + background-color: var(--color-extra-light-gray); margin: 0; } &>.el-tabs__header>.el-tabs__item { @@ -129,15 +129,15 @@ margin: * -1px; &.is-active { - background-color: #fff; - border-right-color: #d3dce6; - border-left-color: #d3dce6; + background-color: var(--color-white); + border-right-color: var(--color-base-gray); + border-left-color: var(--color-base-gray); &:first-child { - border-left-color: #d3dce6; + border-left-color: var(--color-base-gray); } &:last-child { - border-right-color: #d3dce6; + border-right-color: var(--color-base-gray); } } } diff --git a/packages/theme-default/src/tag.css b/packages/theme-default/src/tag.css index 3898e3f5e..1c29d1048 100644 --- a/packages/theme-default/src/tag.css +++ b/packages/theme-default/src/tag.css @@ -31,7 +31,7 @@ right: -2px; &:hover { - background-color: #fff; + background-color: var(--color-white); color: var(--tag-fill); } } @@ -46,7 +46,7 @@ & .el-tag__close:hover { background-color: var(--tag-gray-color); - color: #fff; + color: var(--color-white); } } @m primary { @@ -59,7 +59,7 @@ & .el-tag__close:hover { background-color: var(--tag-primary-color); - color: #fff; + color: var(--color-white); } } @m success { @@ -72,7 +72,7 @@ & .el-tag__close:hover { background-color: var(--tag-success-color); - color: #fff; + color: var(--color-white); } } @m warning { @@ -85,7 +85,7 @@ & .el-tag__close:hover { background-color: var(--tag-warning-color); - color: #fff; + color: var(--color-white); } } @m danger { @@ -98,7 +98,7 @@ & .el-tag__close:hover { background-color: var(--tag-danger-color); - color: #fff; + color: var(--color-white); } } } diff --git a/packages/theme-default/src/time-select.css b/packages/theme-default/src/time-select.css index f9bbdee81..d257f6110 100644 --- a/packages/theme-default/src/time-select.css +++ b/packages/theme-default/src/time-select.css @@ -19,7 +19,7 @@ .time-select-item.selected:not(.disabled) { background-color: var(--datepicker-active-color); - color: #fff; + color: var(--color-white); &:hover { background-color: var(--color-primary); diff --git a/packages/theme-default/src/tree.css b/packages/theme-default/src/tree.css index c3a0777c8..40003a592 100644 --- a/packages/theme-default/src/tree.css +++ b/packages/theme-default/src/tree.css @@ -4,8 +4,8 @@ @component-namespace el { @b tree { cursor: default; - background: #ffffff; - border: 1px solid #d3dce6; + background: var(--color-white); + border: 1px solid var(--color-base-gray); @e empty-block { position: relative; @@ -20,7 +20,7 @@ left: 50%; top: 50%; transform: translate(-50%, -50%); - color: #5e6d82; + color: color(var(--color-primary) s(16%) l(44%)); } } @@ -40,7 +40,7 @@ vertical-align: middle; } &:hover { - background: #e5e9f2; + background: var(--color-light-gray); } } @@ -53,7 +53,7 @@ margin-left: 10px; border: 6px solid transparent; border-right-width: 0; - border-left-color: #99a9bf; + border-left-color: var(--color-light-silver); border-left-width: 7px; transform: rotate(0deg); @@ -84,7 +84,7 @@ vertical-align: middle; margin-right: 4px; font-size: 14px; - color: #99a9bf; + color: var(--color-light-silver); } & > .el-tree-node__children { @@ -99,7 +99,7 @@ } .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content { - background-color: #eff7ff; + background-color: color(var(--color-primary) tint(92%)); } .collapse-transition { diff --git a/packages/theme-default/src/upload.css b/packages/theme-default/src/upload.css index 1c1b3ddc5..c49b530f2 100644 --- a/packages/theme-default/src/upload.css +++ b/packages/theme-default/src/upload.css @@ -31,7 +31,7 @@ @e file { transition: all .5s cubic-bezier(.55,0,.1,1); font-size: 14px; - color: #475669; + color: var(--color-extra-light-black); line-height: 32px; position: relative; box-sizing: border-box; @@ -40,7 +40,7 @@ position: relative; a { - color: #475669; + color: var(--color-extra-light-black); display: block; margin-right: 40px; overflow: hidden; @@ -50,7 +50,7 @@ white-space: nowrap; [class^="el-icon"] { - color: #99a9bf; + color: var(--color-light-silver); margin-right: 7px; height: 100%; line-height: inherit; @@ -72,7 +72,7 @@ padding-right: 0; } &:hover { - background-color: #eff2f7; + background-color: var(--color-extra-light-gray); } @when finished { & a:hover { @@ -89,7 +89,7 @@ } @e tip { font-size: 12px; - color: #8492a6; + color: var(--color-base-silver); margin-top: 7px; } @e btn-delete { @@ -102,8 +102,8 @@ } } @b dragger { - background-color: #f9fafc; - border: 1px solid #c0ccda; + background-color: var(--color-dark-white); + border: 1px solid var(--color-extra-light-silver); box-sizing: border-box; width: 360px; height: 180px; @@ -119,7 +119,7 @@ } & .el-icon-upload { font-size: 67px; - color: #99a9bf; + color: var(--color-light-silver); margin: 40px 0 16px; line-height: 50px; } @@ -130,7 +130,7 @@ & ~ .el-upload__files { margin-top: 7px; padding-top: 5px; - border-top: 1px solid rgba(#c0ccda, .2); + border-top: 1px solid rgba(var(--color-extra-light-silver), .2); } @e cover { @@ -180,7 +180,7 @@ & .btn { display: inline-block; - color: #fff; + color: var(--color-white); font-size: 14px; cursor: pointer; vertical-align: middle; @@ -209,7 +209,7 @@ } & i { - color: #fff; + color: var(--color-white); display: block; font-size: 24px; line-height: inherit; @@ -222,7 +222,7 @@ position: absolute; bottom: 0; left: 0; - background-color: #fff; + background-color: var(--color-white); height: 36px; width: 100%; overflow: hidden; @@ -234,7 +234,7 @@ margin: 0; line-height: 36px; font-size: 14px; - color: #475669; + color: var(--color-extra-light-black); } & + .el-upload__inner { @@ -245,7 +245,7 @@ } @e text { - color: #99a9bf; + color: var(--color-light-silver); font-size: 14px; text-align: center; diff --git a/yarn.lock b/yarn.lock index c87d98960..cecb2aeee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1,5 +1,7 @@ # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. # yarn lockfile v1 + + "2webpack2@^0.5.0": version "0.5.0" resolved "https://registry.yarnpkg.com/2webpack2/-/2webpack2-0.5.0.tgz#20c6818b9feb558381f457daeff039557e60d7d7" @@ -7,6 +9,17 @@ chalk "^1.1.3" object-set "^1.0.1" +CSSselect@~0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/CSSselect/-/CSSselect-0.4.1.tgz#f8ab7e1f8418ce63cda6eb7bd778a85d7ec492b2" + dependencies: + CSSwhat "0.4" + domutils "1.4" + +CSSwhat@0.4: + version "0.4.7" + resolved "https://registry.yarnpkg.com/CSSwhat/-/CSSwhat-0.4.7.tgz#867da0ff39f778613242c44cfea83f0aa4ebdf9b" + abab@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d" @@ -15,13 +28,6 @@ abbrev@1, abbrev@1.0.x: version "1.0.9" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135" -accepts@~1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca" - dependencies: - mime-types "~2.1.11" - negotiator "0.6.1" - accepts@1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.1.4.tgz#d71c96f7d41d0feda2c38cd14e8a27c04158df4a" @@ -29,6 +35,13 @@ accepts@1.1.4: mime-types "~2.0.4" negotiator "0.4.9" +accepts@~1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca" + dependencies: + mime-types "~2.1.11" + negotiator "0.6.1" + acorn-globals@^1.0.4: version "1.0.9" resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-1.0.9.tgz#55bb5e98691507b74579d0513413217c380c54cf" @@ -226,14 +239,14 @@ async-validator@^1.6.6: version "1.6.7" resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-1.6.7.tgz#345162bdb54f3d653f07cd1ac076bbb517e53a2e" +async@1.5.2, async@1.x, async@^1.3.0, async@^1.4.0, async@^1.5.0: + version "1.5.2" + resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" + async@^0.9.0, async@~0.9.0: version "0.9.2" resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" -async@^1.3.0, async@^1.4.0, async@^1.5.0, async@1.5.2, async@1.x: - version "1.5.2" - resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" - async@~0.2.6: version "0.2.10" resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1" @@ -723,7 +736,7 @@ backo2@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" -balanced-match@^0.1.0, balanced-match@~0.1.0, balanced-match@0.1.0: +balanced-match@0.1.0, balanced-match@^0.1.0, balanced-match@~0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.1.0.tgz#b504bd05869b39259dd0c5efc35d843176dccc4a" @@ -1062,7 +1075,7 @@ clap@^1.0.9: dependencies: chalk "^1.1.3" -clean-css@^3.1.9, clean-css@3.4.x: +clean-css@3.4.x, clean-css@^3.1.9: version "3.4.22" resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.22.tgz#db323064f752028778233b58c54cd8535f860892" dependencies: @@ -1179,18 +1192,18 @@ combined-stream@^1.0.5, combined-stream@~1.0.5: dependencies: delayed-stream "~1.0.0" -commander@^2.8.1, commander@^2.9.0, commander@2.9.0, commander@2.9.x: - version "2.9.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" - dependencies: - graceful-readlink ">= 1.0.0" - commander@2.8.x: version "2.8.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4" dependencies: graceful-readlink ">= 1.0.0" +commander@2.9.0, commander@2.9.x, commander@^2.8.1, commander@^2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" + dependencies: + graceful-readlink ">= 1.0.0" + commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" @@ -1232,17 +1245,17 @@ concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" -concat-stream@^1.4.6: - version "1.5.2" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266" +concat-stream@1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.0.tgz#53f7d43c51c5e43f81c8fdd03321c631be68d611" dependencies: inherits "~2.0.1" readable-stream "~2.0.0" typedarray "~0.0.5" -concat-stream@1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.0.tgz#53f7d43c51c5e43f81c8fdd03321c631be68d611" +concat-stream@^1.4.6: + version "1.5.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266" dependencies: inherits "~2.0.1" readable-stream "~2.0.0" @@ -1510,27 +1523,16 @@ csso@~2.2.1: clap "^1.0.9" source-map "^0.5.3" -"cssom@>= 0.3.0 < 0.4.0", cssom@0.3.x: +cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0": version "0.3.1" resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.1.tgz#c9e37ef2490e64f6d1baa10fda852257082c25d3" -CSSselect@~0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/CSSselect/-/CSSselect-0.4.1.tgz#f8ab7e1f8418ce63cda6eb7bd778a85d7ec492b2" - dependencies: - CSSwhat "0.4" - domutils "1.4" - "cssstyle@>= 0.2.29 < 0.3.0": version "0.2.37" resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54" dependencies: cssom "0.3.x" -CSSwhat@0.4: - version "0.4.7" - resolved "https://registry.yarnpkg.com/CSSwhat/-/CSSwhat-0.4.7.tgz#867da0ff39f778613242c44cfea83f0aa4ebdf9b" - currently-unhandled@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" @@ -1568,22 +1570,22 @@ de-indent@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" +debug@0.7.4, debug@~0.7.4: + version "0.7.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39" + +debug@2.2.0, debug@~2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da" + dependencies: + ms "0.7.1" + debug@^2.1.1, debug@^2.2.0: version "2.4.1" resolved "https://registry.yarnpkg.com/debug/-/debug-2.4.1.tgz#ef2532d2753d282045c13c82ce47a09e56b91d53" dependencies: ms "0.7.2" -debug@~0.7.4, debug@0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39" - -debug@~2.2.0, debug@2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da" - dependencies: - ms "0.7.1" - decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -1711,7 +1713,7 @@ dom-serialize@^2.2.0: extend "^3.0.0" void-elements "^2.0.0" -dom-serializer@^0.1.0, dom-serializer@~0.1.0, dom-serializer@0: +dom-serializer@0, dom-serializer@^0.1.0, dom-serializer@~0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82" dependencies: @@ -1733,19 +1735,13 @@ domain-browser@^1.1.1: version "1.1.7" resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc" -domelementtype@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2" - -domelementtype@~1.1.1, domelementtype@1: +domelementtype@1, domelementtype@~1.1.1: version "1.1.3" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b" -domhandler@^2.3.0, domhandler@2.3: - version "2.3.0" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.3.0.tgz#2de59a0822d5027fabff6f032c2b25a2a8abe738" - dependencies: - domelementtype "1" +domelementtype@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2" domhandler@2.1: version "2.1.0" @@ -1753,11 +1749,10 @@ domhandler@2.1: dependencies: domelementtype "1" -domutils@^1.5.1, domutils@1.5, domutils@1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" +domhandler@2.3, domhandler@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.3.0.tgz#2de59a0822d5027fabff6f032c2b25a2a8abe738" dependencies: - dom-serializer "0" domelementtype "1" domutils@1.1: @@ -1772,6 +1767,13 @@ domutils@1.4: dependencies: domelementtype "1" +domutils@1.5, domutils@1.5.1, domutils@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" + dependencies: + dom-serializer "0" + domelementtype "1" + duplexer2@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db" @@ -1861,14 +1863,14 @@ ent@~2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" -entities@^1.1.1, entities@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0" - entities@1.0: version "1.0.0" resolved "https://registry.yarnpkg.com/entities/-/entities-1.0.0.tgz#b2987aa3821347fcde642b24fdfc9e4fb712bf26" +entities@^1.1.1, entities@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0" + errno@^0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d" @@ -1929,7 +1931,7 @@ es6-set@~0.1.3: es6-symbol "3" event-emitter "~0.3.4" -es6-symbol@~3.1, es6-symbol@~3.1.0, es6-symbol@3: +es6-symbol@3, es6-symbol@~3.1, es6-symbol@~3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.0.tgz#94481c655e7a7cad82eba832d97d5433496d7ffa" dependencies: @@ -1956,11 +1958,11 @@ escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" -escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5, escape-string-regexp@1.0.5: +escape-string-regexp@1.0.5, escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" -escodegen@^1.6.1, escodegen@1.8.x: +escodegen@1.8.x, escodegen@^1.6.1: version "1.8.1" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018" dependencies: @@ -2072,7 +2074,7 @@ espree@^3.3.1: acorn "^4.0.1" acorn-jsx "^3.0.0" -esprima@^2.1.0, esprima@^2.6.0, esprima@^2.7.1, esprima@2.7.x: +esprima@2.7.x, esprima@^2.1.0, esprima@^2.6.0, esprima@^2.7.1: version "2.7.3" resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581" @@ -2627,6 +2629,23 @@ glob-watcher@^0.0.6: dependencies: gaze "^0.5.1" +glob2base@^0.0.12: + version "0.0.12" + resolved "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56" + dependencies: + find-index "^0.1.1" + +glob@7.0.5: + version "7.0.5" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.5.tgz#b4202a69099bbb4d292a7c1b95b6682b67ebdc95" + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.2" + once "^1.3.0" + path-is-absolute "^1.0.0" + glob@^4.3.1: version "4.5.3" resolved "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f" @@ -2675,23 +2694,6 @@ glob@~3.1.21: inherits "1" minimatch "~0.2.11" -glob@7.0.5: - version "7.0.5" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.5.tgz#b4202a69099bbb4d292a7c1b95b6682b67ebdc95" - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.2" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob2base@^0.0.12: - version "0.0.12" - resolved "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56" - dependencies: - find-index "^0.1.1" - global-modules@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d" @@ -2766,16 +2768,16 @@ glogg@^1.0.0: dependencies: sparkles "^1.0.0" +graceful-fs@4.1.2, graceful-fs@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.2.tgz#fe2239b7574972e67e41f808823f9bfa4a991e37" + graceful-fs@^3.0.0: version "3.0.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.11.tgz#7613c778a1afea62f25c630a086d7f3acbbdd818" dependencies: natives "^1.1.0" -graceful-fs@^4.1.2, graceful-fs@4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.2.tgz#fe2239b7574972e67e41f808823f9bfa4a991e37" - graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9: version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" @@ -2981,7 +2983,7 @@ hawk@~3.1.3: hoek "2.x.x" sntp "1.x.x" -he@^1.1.0, he@1.1.x: +he@1.1.x, he@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/he/-/he-1.1.0.tgz#29319d49beec13a9b1f3c4f9b2a6dde4859bb2a7" @@ -3173,14 +3175,14 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.1, inherits@2, inherits@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - inherits@1: version "1.0.2" resolved "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b" +inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.1: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + inherits@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" @@ -3445,14 +3447,14 @@ is-windows@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c" -isarray@^1.0.0, isarray@~1.0.0, isarray@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - isarray@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" +isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + isbinaryfile@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.1.tgz#6e99573675372e841a0520c036b41513d783e79e" @@ -3533,7 +3535,7 @@ js-tokens@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-2.0.0.tgz#79903f5563ee778cc1162e6dcf1a0027c97f9cb5" -js-yaml@^3.5.1, js-yaml@~3.6.1, js-yaml@3.6.1, js-yaml@3.x: +js-yaml@3.6.1, js-yaml@3.x, js-yaml@^3.5.1, js-yaml@~3.6.1: version "3.6.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30" dependencies: @@ -3594,14 +3596,14 @@ json-templater@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/json-templater/-/json-templater-1.0.4.tgz#f240a01e8854b5853a9ba4f87e196eeeaeefba33" -json3@^3.3.2, json3@3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1" - json3@3.2.6: version "3.2.6" resolved "https://registry.yarnpkg.com/json3/-/json3-3.2.6.tgz#f6efc93c06a04de9aec53053df2559bb19e2038b" +json3@3.3.2, json3@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1" + json5@^0.5.0: version "0.5.1" resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" @@ -3805,7 +3807,7 @@ load-json-file@^1.0.0: pinkie-promise "^2.0.0" strip-bom "^2.0.0" -loader-utils@^0.2.10, loader-utils@^0.2.11, loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@^0.2.3, loader-utils@^0.2.5, loader-utils@^0.2.7, loader-utils@~0.2.2, loader-utils@~0.2.5, loader-utils@0.2.x: +loader-utils@0.2.x, loader-utils@^0.2.10, loader-utils@^0.2.11, loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@^0.2.3, loader-utils@^0.2.5, loader-utils@^0.2.7, loader-utils@~0.2.2, loader-utils@~0.2.5: version "0.2.16" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d" dependencies: @@ -4122,14 +4124,14 @@ log4js@^0.6.31: readable-stream "~1.0.2" semver "~4.3.3" -lolex@^1.5.0, lolex@^1.5.1: - version "1.5.2" - resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.5.2.tgz#94a4ce41c61185a05e98b8660dc509423ac1c416" - lolex@1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.3.2.tgz#7c3da62ffcb30f0f5a80a2566ca24e45d8a01f31" +lolex@^1.5.0, lolex@^1.5.1: + version "1.5.2" + resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.5.2.tgz#94a4ce41c61185a05e98b8660dc509423ac1c416" + longest@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" @@ -4151,6 +4153,10 @@ lower-case@^1.1.1: version "1.1.3" resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.3.tgz#c92393d976793eee5ba4edb583cf8eae35bd9bfb" +lru-cache@2, lru-cache@2.2.x: + version "2.2.4" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d" + lru-cache@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-3.2.0.tgz#71789b3b7f5399bec8565dda38aa30d2a097efee" @@ -4164,10 +4170,6 @@ lru-cache@^4.0.1: pseudomap "^1.0.1" yallist "^2.0.0" -lru-cache@2, lru-cache@2.2.x: - version "2.2.4" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d" - macaddress@^0.2.8: version "0.2.8" resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12" @@ -4180,7 +4182,7 @@ map-obj@^1.0.0, map-obj@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" -map-stream@>=0.0.4, map-stream@0.0.4: +map-stream@0.0.4, map-stream@>=0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.4.tgz#5ec6de90213ef6c7b2eb9367e9ade8da4efdb68b" @@ -4290,14 +4292,14 @@ mime-types@~2.0.4: dependencies: mime-db "~1.12.0" -mime@^1.2.11, mime@^1.3.4, mime@1.3.4: - version "1.3.4" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53" - mime@1.2.x: version "1.2.11" resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10" +mime@1.3.4, mime@^1.2.11, mime@^1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53" + mimeparse@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/mimeparse/-/mimeparse-0.1.4.tgz#dafb02752370fd226093ae3152c271af01ac254a" @@ -4308,15 +4310,15 @@ min-document@^2.19.0: dependencies: dom-walk "^0.1.0" -minimatch@^2.0.1: - version "2.0.10" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7" +"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774" dependencies: brace-expansion "^1.0.0" -minimatch@^3.0.0, minimatch@^3.0.2, "minimatch@2 || 3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774" +minimatch@^2.0.1: + version "2.0.10" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7" dependencies: brace-expansion "^1.0.0" @@ -4327,30 +4329,30 @@ minimatch@~0.2.11: lru-cache "2" sigmund "~1.0.0" +minimist@0.0.8, minimist@~0.0.1: + version "0.0.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" + +minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" + minimist@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.0.tgz#4dffe525dae2b864c66c2e23c6271d7afdecefce" -minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0, minimist@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - -minimist@~0.0.1, minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - -mkdirp@^0.5.0, mkdirp@^0.5.1, "mkdirp@>=0.5 0", mkdirp@~0.5.0, mkdirp@~0.5.1, mkdirp@0.5.1, mkdirp@0.5.x: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - dependencies: - minimist "0.0.8" - mkdirp@0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12" dependencies: minimist "0.0.8" +mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" + dependencies: + minimist "0.0.8" + mocha@^3.1.1: version "3.2.0" resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.2.0.tgz#7dc4f45e5088075171a68896814e6ae9eb7a85e3" @@ -4488,7 +4490,7 @@ nomnomnomnom@^2.0.0: chalk "~0.4.0" underscore "~1.6.0" -nopt@~3.0.1, nopt@~3.0.6, nopt@3.x: +nopt@3.x, nopt@~3.0.1, nopt@~3.0.6: version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" dependencies: @@ -4612,7 +4614,7 @@ on-headers@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7" -once@^1.3.0, once@1.x: +once@1.x, once@^1.3.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" dependencies: @@ -4899,7 +4901,7 @@ postcss-calc@^5.0.0, postcss-calc@^5.2.0: postcss-message-helpers "^2.0.0" reduce-css-calc "^1.2.6" -postcss-color-function@^2.0.0: +postcss-color-function@^2.0.0, postcss-color-function@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/postcss-color-function/-/postcss-color-function-2.0.1.tgz#9ad226f550e8a7c7f8b8a77860545b6dd7f55241" dependencies: @@ -5224,9 +5226,9 @@ postcss-reduce-transforms@^1.0.3: postcss "^5.0.8" postcss-value-parser "^3.0.1" -postcss-salad@^1.0.5: - version "1.0.6" - resolved "https://registry.yarnpkg.com/postcss-salad/-/postcss-salad-1.0.6.tgz#f0073f1d3c7653a4f7b681d02206969431cbec0d" +postcss-salad@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/postcss-salad/-/postcss-salad-1.0.8.tgz#ffa87b5fa394821d9608f68da5a14d13ea4c5059" dependencies: autoprefixer "^6.0.2" caniuse-api "^1.3.2" @@ -5234,6 +5236,7 @@ postcss-salad@^1.0.5: pixrem "^3.0.0" postcss "^5.0.5" postcss-calc "^5.0.0" + postcss-color-function "^2.0.1" postcss-css-reset "^1.0.2" postcss-initial "^1.3.1" postcss-inline-svg "^1.4.0" @@ -5519,14 +5522,14 @@ pseudomap@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" -punycode@^1.2.4, punycode@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - punycode@1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" +punycode@^1.2.4, punycode@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" + q-io@1.13.2: version "1.13.2" resolved "https://registry.yarnpkg.com/q-io/-/q-io-1.13.2.tgz#eea130d481ddb5e1aa1bc5a66855f7391d06f003" @@ -5538,7 +5541,7 @@ q-io@1.13.2: qs "^1.2.1" url2 "^0.0.0" -q@^1.0.1, q@^1.1.2, q@1.4.1: +q@1.4.1, q@^1.0.1, q@^1.1.2: version "1.4.1" resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e" @@ -5546,6 +5549,10 @@ qjobs@^1.1.4: version "1.1.5" resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.1.5.tgz#659de9f2cf8dcc27a1481276f205377272382e73" +qs@6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.0.tgz#3b7848c03c2dece69a9522b0fae8c4126d745f3b" + qs@^1.2.1: version "1.2.2" resolved "https://registry.yarnpkg.com/qs/-/qs-1.2.2.tgz#19b57ff24dc2a99ce1f8bdf6afcda59f8ef61f88" @@ -5558,10 +5565,6 @@ qs@~6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442" -qs@6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.0.tgz#3b7848c03c2dece69a9522b0fae8c4126d745f3b" - query-string@^4.1.0: version "4.2.3" resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.2.3.tgz#9f27273d207a25a8ee4c7b8c74dcd45d556db822" @@ -5630,6 +5633,24 @@ read-pkg@^1.0.0: normalize-package-data "^2.3.2" path-type "^1.0.0" +readable-stream@1.0, "readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.17, readable-stream@~1.0.2: + version "1.0.34" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + +readable-stream@1.1, readable-stream@~1.1.9: + version "1.1.13" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.13.tgz#f6eef764f514c89e2b9e23146a75ba106756d23e" + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.1.0, readable-stream@^2.1.5: version "2.2.2" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e" @@ -5653,24 +5674,6 @@ readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable string_decoder "~0.10.x" util-deprecate "~1.0.1" -"readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.17, readable-stream@~1.0.2, readable-stream@1.0: - version "1.0.34" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - -readable-stream@~1.1.9, readable-stream@1.1: - version "1.1.13" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.13.tgz#f6eef764f514c89e2b9e23146a75ba106756d23e" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - readable-stream@~2.1.4: version "2.1.5" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0" @@ -5827,31 +5830,6 @@ request-progress@~2.0.1: dependencies: throttleit "^1.0.0" -request@^2.55.0, request@^2.79.0, request@~2.79.0: - version "2.79.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de" - dependencies: - aws-sign2 "~0.6.0" - aws4 "^1.2.1" - caseless "~0.11.0" - combined-stream "~1.0.5" - extend "~3.0.0" - forever-agent "~0.6.1" - form-data "~2.1.1" - har-validator "~2.0.6" - hawk "~3.1.3" - http-signature "~1.1.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.7" - oauth-sign "~0.8.1" - qs "~6.3.0" - stringstream "~0.0.4" - tough-cookie "~2.3.0" - tunnel-agent "~0.4.1" - uuid "^3.0.0" - request@2.75.0: version "2.75.0" resolved "https://registry.yarnpkg.com/request/-/request-2.75.0.tgz#d2b8268a286da13eaa5d01adf5d18cc90f657d93" @@ -5878,6 +5856,31 @@ request@2.75.0: tough-cookie "~2.3.0" tunnel-agent "~0.4.1" +request@^2.55.0, request@^2.79.0, request@~2.79.0: + version "2.79.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de" + dependencies: + aws-sign2 "~0.6.0" + aws4 "^1.2.1" + caseless "~0.11.0" + combined-stream "~1.0.5" + extend "~3.0.0" + forever-agent "~0.6.1" + form-data "~2.1.1" + har-validator "~2.0.6" + hawk "~3.1.3" + http-signature "~1.1.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.7" + oauth-sign "~0.8.1" + qs "~6.3.0" + stringstream "~0.0.4" + tough-cookie "~2.3.0" + tunnel-agent "~0.4.1" + uuid "^3.0.0" + require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" @@ -5908,14 +5911,14 @@ resolve-from@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226" -resolve@^1.1.6, resolve@^1.1.7: - version "1.2.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.2.0.tgz#9589c3f2f6149d1417a40becc1663db6ec6bc26c" - resolve@1.1.x: version "1.1.7" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" +resolve@^1.1.6, resolve@^1.1.7: + version "1.2.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.2.0.tgz#9589c3f2f6149d1417a40becc1663db6ec6bc26c" + restore-cursor@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541" @@ -5933,7 +5936,7 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.4.4, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@~2.5.1, rimraf@~2.5.4, rimraf@2: +rimraf@2, rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.4.4, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@~2.5.1, rimraf@~2.5.4: version "2.5.4" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04" dependencies: @@ -5959,7 +5962,7 @@ saladcss-bem@^0.0.1: dependencies: postcss "^5.0.8" -samsam@~1.1, samsam@1.1.2: +samsam@1.1.2, samsam@~1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.1.2.tgz#bec11fdc83a9fda063401210e40176c3024d1567" @@ -5967,14 +5970,14 @@ sax@^1.1.4, sax@~1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a" +"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@~5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" + semver@^4.1.0, semver@~4.3.3: version "4.3.6" resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" -semver@^5.1.0, semver@~5.3.0, "semver@2 || 3 || 4 || 5": - version "5.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" - send@0.14.1: version "0.14.1" resolved "https://registry.yarnpkg.com/send/-/send-0.14.1.tgz#a954984325392f51532a7760760e459598c89f7a" @@ -6177,15 +6180,15 @@ source-map-support@^0.4.2: dependencies: source-map "^0.5.3" -source-map@^0.1.41, source-map@~0.1.7: - version "0.1.43" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346" +source-map@0.4.x, source-map@^0.4.4, source-map@~0.4.1: + version "0.4.4" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" dependencies: amdefine ">=0.0.4" -source-map@^0.4.4, source-map@~0.4.1, source-map@0.4.x: - version "0.4.4" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" +source-map@^0.1.41, source-map@~0.1.7: + version "0.1.43" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346" dependencies: amdefine ">=0.0.4" @@ -6269,10 +6272,6 @@ strict-uri-encode@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" -string_decoder@^0.10.25, string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" - string-hash@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.1.tgz#8e85bed291e0763b8f6809d9c3368fea048db3dc" @@ -6300,6 +6299,10 @@ string@^3.0.1: version "3.3.3" resolved "https://registry.yarnpkg.com/string/-/string-3.3.3.tgz#5ea211cd92d228e184294990a6cc97b366a77cb0" +string_decoder@^0.10.25, string_decoder@~0.10.x: + version "0.10.31" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + stringstream@~0.0.4: version "0.0.5" resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" @@ -6353,6 +6356,12 @@ style-loader@^0.13.1: dependencies: loader-utils "^0.2.7" +supports-color@3.1.2, supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5" + dependencies: + has-flag "^1.0.0" + supports-color@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a" @@ -6361,12 +6370,6 @@ supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" -supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.1.2, supports-color@3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5" - dependencies: - has-flag "^1.0.0" - svgo@^0.7.0: version "0.7.1" resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.1.tgz#287320fed972cb097e72c2bb1685f96fe08f8034" @@ -6464,10 +6467,6 @@ throttleit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" -through@^2.3.6, through@~2.3.6: - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - through2@^0.5.0: version "0.5.1" resolved "https://registry.yarnpkg.com/through2/-/through2-0.5.1.tgz#dfdd012eb9c700e2323fd334f38ac622ab372da7" @@ -6489,6 +6488,10 @@ through2@^2.0.0: readable-stream "^2.1.5" xtend "~4.0.1" +through@^2.3.6, through@~2.3.6: + version "2.3.8" + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + tildify@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a" @@ -6587,14 +6590,14 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" -type-detect@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2" - type-detect@0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822" +type-detect@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2" + type-is@~1.6.13: version "1.6.14" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.14.tgz#e219639c17ded1ca0789092dd54a03826b817cb2" @@ -6610,7 +6613,7 @@ uc.micro@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192" -uglify-js@^2.6, uglify-js@~2.7.3, uglify-js@2.7.x: +uglify-js@2.7.x, uglify-js@^2.6, uglify-js@~2.7.3: version "2.7.5" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8" dependencies: @@ -6665,7 +6668,7 @@ unique-stream@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-1.0.0.tgz#d59a4a75427447d9aa6c91e70263f8d26a4b104b" -unpipe@~1.0.0, unpipe@1.0.0: +unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" @@ -6686,13 +6689,6 @@ url-loader@^0.5.7: loader-utils "0.2.x" mime "1.2.x" -url-parse@^1.1.1: - version "1.1.7" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.1.7.tgz#025cff999653a459ab34232147d89514cc87d74a" - dependencies: - querystringify "0.0.x" - requires-port "1.0.x" - url-parse@1.0.x: version "1.0.5" resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.0.5.tgz#0854860422afdcfefeb6c965c662d4800169927b" @@ -6700,6 +6696,17 @@ url-parse@1.0.x: querystringify "0.0.x" requires-port "1.0.x" +url-parse@^1.1.1: + version "1.1.7" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.1.7.tgz#025cff999653a459ab34232147d89514cc87d74a" + dependencies: + querystringify "0.0.x" + requires-port "1.0.x" + +url2@^0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/url2/-/url2-0.0.0.tgz#4eaabd1d5c3ac90d62ab4485c998422865a04b1a" + url@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" @@ -6707,10 +6714,6 @@ url@^0.11.0: punycode "1.3.2" querystring "0.2.0" -url2@^0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/url2/-/url2-0.0.0.tgz#4eaabd1d5c3ac90d62ab4485c998422865a04b1a" - user-home@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190" @@ -6735,7 +6738,7 @@ util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" -util@^0.10.3, "util@>=0.10.3 <1", util@0.10.3: +util@0.10.3, "util@>=0.10.3 <1", util@^0.10.3: version "0.10.3" resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" dependencies: @@ -6859,7 +6862,7 @@ vue-hot-reload-api@^2.0.1: version "2.0.6" resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.0.6.tgz#817d4bfb30f55428aa1012d029499e07f3147d21" -vue-loader@^10.0.2, vue-loader@>=9.4.2: +vue-loader@>=9.4.2, vue-loader@^10.0.2: version "10.0.2" resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-10.0.2.tgz#6fe7bcefb32c5439bd0338464aa22673ad62299c" dependencies: @@ -6903,11 +6906,7 @@ vue-template-compiler@*, vue-template-compiler@^2.1.8: de-indent "^1.0.2" he "^1.1.0" -vue-template-es2015-compiler@^1.2.2: - version "1.4.0" - resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.4.0.tgz#7b88853ca4bf8d84ae54ab9e56771de271e60198" - -vue-template-es2015-compiler@^1.4.2: +vue-template-es2015-compiler@^1.2.2, vue-template-es2015-compiler@^1.4.2: version "1.4.2" resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.4.2.tgz#0bc595cda68fc27779568926fcead13553a335df" @@ -7041,13 +7040,17 @@ wide-align@^1.1.0: dependencies: string-width "^1.0.1" +window-size@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" + window-size@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075" -window-size@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" +wordwrap@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" wordwrap@^1.0.0, wordwrap@~1.0.0: version "1.0.0" @@ -7057,10 +7060,6 @@ wordwrap@~0.0.2: version "0.0.3" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" -wordwrap@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" - wrap-ansi@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" @@ -7113,7 +7112,7 @@ xmlhttprequest-ssl@1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz#3b7741fea4a86675976e908d296d4445961faa67" -xtend@^4.0.0, "xtend@>=4.0.0 <4.1.0-0", xtend@~4.0.0, xtend@~4.0.1: +"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" @@ -7198,4 +7197,3 @@ yauzl@2.4.1: yeast@0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" -