diff --git a/app/components/search-field.js b/app/components/search-field.js new file mode 100644 index 0000000000..9f8c31755c --- /dev/null +++ b/app/components/search-field.js @@ -0,0 +1,11 @@ +import Component from '@ember/component'; + +export default Component.extend({ + tagName: '', + + actions: { + clear() { + this.set('value', ''); + } + } +}); diff --git a/app/controllers/container-type.js b/app/controllers/container-type.js index bd7c1b96c0..fcef33fd2b 100644 --- a/app/controllers/container-type.js +++ b/app/controllers/container-type.js @@ -9,7 +9,7 @@ export default Controller.extend({ sortProperties: ['name'], - searchVal: debounceComputed('search', 300), + searchValue: debounceComputed('search', 300), search: null, diff --git a/app/controllers/deprecations.js b/app/controllers/deprecations.js index 3294947180..5611fc11f3 100644 --- a/app/controllers/deprecations.js +++ b/app/controllers/deprecations.js @@ -13,10 +13,12 @@ export default Controller.extend({ */ application: controller(), search: null, - searchVal: debounceComputed('search', 300), + searchValue: debounceComputed('search', 300), + filtered: filter('model', function(item) { return searchMatch(get(item, 'message'), this.get('search')); }).property('model.@each.message', 'search'), + actions: { openResource(item) { this.get('adapter').openResource(item.fullSource, item.line); diff --git a/app/controllers/promise-tree.js b/app/controllers/promise-tree.js index 31a7f3921f..207de41325 100644 --- a/app/controllers/promise-tree.js +++ b/app/controllers/promise-tree.js @@ -70,15 +70,15 @@ export default Controller.extend({ isPendingFilter: equal('filter', 'pending'), isFulfilledFilter: equal('filter', 'fulfilled'), - search: null, + searchValue: null, effectiveSearch: null, - searchChanged: observer('search', function() { + searchChanged: observer('searchValue', function() { debounce(this, this.notifyChange, 500); }), notifyChange() { - this.set('effectiveSearch', this.get('search')); + this.set('effectiveSearch', this.get('searchValue')); next(() => { this.notifyPropertyChange('model'); }); diff --git a/app/controllers/records.js b/app/controllers/records.js index 55c87a5a37..64db0a8089 100644 --- a/app/controllers/records.js +++ b/app/controllers/records.js @@ -8,11 +8,11 @@ import { dasherize } from '@ember/string'; export default Controller.extend({ application: controller(), - queryParams: ['filterValue', 'search'], + queryParams: ['filterValue', 'searchValue'], columns: readOnly('modelType.columns'), - search: '', + searchValue: '', filters: computed(() => []), @@ -21,7 +21,7 @@ export default Controller.extend({ noFilterValue: none('filterValue'), modelChanged: observer('model', function() { - this.set('search', ''); + this.set('searchValue', ''); }), recordToString(record) { @@ -72,8 +72,8 @@ export default Controller.extend({ return { columns }; }), - filtered: computed('search', 'model.@each.columnValues', 'model.@each.filterValues', 'filterValue', function() { - let search = this.get('search'); + filtered: computed('searchValue', 'model.@each.columnValues', 'model.@each.filterValues', 'filterValue', function() { + let search = this.get('searchValue'); let filter = this.get('filterValue'); return this.get('model').filter(item => { // check filters diff --git a/app/controllers/render-tree.js b/app/controllers/render-tree.js index bfcc43100d..cc551bbc0f 100644 --- a/app/controllers/render-tree.js +++ b/app/controllers/render-tree.js @@ -68,7 +68,7 @@ export default Controller.extend({ // bound to the input field, updates the `search` property // 300ms after changing - searchField: debounceComputed('search', 300), + searchValue: debounceComputed('search', 300), // model filtered based on this value search: '', diff --git a/app/controllers/view-tree.js b/app/controllers/view-tree.js index 6e9885ea12..a6232c5812 100644 --- a/app/controllers/view-tree.js +++ b/app/controllers/view-tree.js @@ -17,11 +17,11 @@ export default Controller.extend({ /** * Bound to the search field to filter the component list. * - * @property searchText + * @property searchValue * @type {String} * @default '' */ - searchText: '', + searchValue: '', /** * The filtered view list. @@ -30,8 +30,8 @@ export default Controller.extend({ * @type {Array} */ filteredList: filter('model', function(item) { - return searchMatch(get(item, 'value.name'), this.get('searchText')); - }).property('model.[]', 'searchText'), + return searchMatch(get(item, 'value.name'), this.get('searchValue')); + }).property('model.[]', 'searchValue'), optionsChanged: on('init', observer('options.components', function() { this.port.send('view:setOptions', { options: this.get('options') }); diff --git a/app/styles/drag_handle.scss b/app/styles/drag_handle.scss index 275e89318c..eb337f79e4 100644 --- a/app/styles/drag_handle.scss +++ b/app/styles/drag_handle.scss @@ -25,7 +25,7 @@ height: 100%; margin-left: 3px; width: 1px; - border-left: 1px solid #A3A3A3; + border-left: 1px solid #bcbcbc; pointer-events: none; } diff --git a/app/styles/dropdown.scss b/app/styles/dropdown.scss index a9e1e79131..adf7a19741 100644 --- a/app/styles/dropdown.scss +++ b/app/styles/dropdown.scss @@ -6,20 +6,22 @@ .dropdown { position: relative; flex: auto; + height: 28px; } .dropdown__select { - -webkit-appearance: none; box-sizing: border-box; display: block; width: 100%; - height: 18px; - padding: 0 15px 0 5px; - font-size: 12px; - color: rgb(48, 48, 48); - text-shadow: rgba(255, 255, 255, 0.75) 0 1px 0; + height: 100%; + margin: 0; border: 0; + padding: 0 16px 0 5px; + font-size: 12px; + color: rgb(70, 70, 70); background-color: transparent; + -moz-appearance: none; + -webkit-appearance: none; } .dropdown__select:focus { @@ -28,13 +30,9 @@ .dropdown__arrow { position: absolute; - right: 4px; - top: 7px; - background-image: url(images/arrow_down.svg); - background-size: 100%; + right: 5px; + top: 9px; opacity: 0.7; - width: 7px; - height: 7px; - display: inline-block; + width: 6px; pointer-events: none; } diff --git a/app/styles/error_page.scss b/app/styles/error_page.scss index 1a3d225680..b6a9d1e9e3 100644 --- a/app/styles/error_page.scss +++ b/app/styles/error_page.scss @@ -58,6 +58,7 @@ width: 128px; height: 89px; background: url("images/fishy_tomster.png") left center no-repeat; + background-size: 128px 89px; position: absolute; right: 0px; bottom: 0px; diff --git a/app/styles/external_link.scss b/app/styles/external_link.scss index 82b74a4075..2931736172 100644 --- a/app/styles/external_link.scss +++ b/app/styles/external_link.scss @@ -9,7 +9,7 @@ position: absolute; right: -12px; bottom: 10px; - background-image: url('images/external_link.svg'); + background-image: url('svg/external_link.svg'); background-size: 100%; } } diff --git a/app/styles/mixin.scss b/app/styles/mixin.scss index aa87925e0a..278ae08d1d 100644 --- a/app/styles/mixin.scss +++ b/app/styles/mixin.scss @@ -6,69 +6,54 @@ or a mixin the object extends */ +$mixin-left-padding: 22px; + .mixin__name { - margin-top: -1px; - padding: 2px 2px 2px 5px; - border-top: 1px solid #bdbdbd; - border-bottom: 1px solid #bdbdbd; - background-color: #f0f0f0; + position: relative; + padding: 4px 2px 4px $mixin-left-padding; + border-bottom: 1px solid #cecece; + background-color: #f5f5f5; cursor: default; user-select: none; + color: #222; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } .mixin__name:active { - background-color: #ccc; - border-top: 1px solid #b2b2b2; - border-bottom: 1px solid #b2b2b2; + background-color: #e7e7e7; +} + +.mixin__name--no-props { + color: #777; } .mixin_props_no .mixin__name:before { opacity: 0; } - .mixin.ember-mixin .mixin__name { - color: #888; - } - .mixin__name:before { + position: absolute; + top: 5px; + left: 7px; content: "\25B6"; color: #737373; - margin-right: 4px; - position: relative; - top: -1px; - font-size: 75%; + margin-right: 5px; + font-size: 90%; } - .mixin_state_expanded .mixin__name { - border-bottom: 1px solid #bdbdbd; - } - .mixin_state_expanded .mixin__name:before { content: "\25BC"; } - .mixin.ember-mixin .mixin__name:before { - color: #aaa; - } - -.mixin__name_errors { - background-color: #fff; - - &:active{ - background-color: #fff; - } -} - - .mixin__properties { - margin: 5px; list-style-type: none; - padding: 0; + border-bottom: 1px solid #cecece; + margin: 0; + padding: 3px 0 5px 0; font-size: 12px; - font-family: Menlo, Monaco, monospace; + font-family: 'SF Mono', Menlo, Monaco, monospace; } .mixin__property { @@ -79,24 +64,52 @@ display: flex; flex-direction: row; align-items: center; + min-height: 19px; } +/* Errors */ + .mixin__error { margin-right: 3px; padding: 0px 20px; color: red; } -.mixin__property button { - border: none; - background: none; - margin: 0; - padding: 0; +.mixin__name--errors { + background-color: #fff; + + &:active{ + background-color: #fff; + } } -.mixin__property button img, .mixin__property span.pad { - margin-right: 3px; - width: 20px; +/* Buttons */ + +.mixin__property { + button { + border: none; + background: none; + margin: 0; + padding: 0; + } + + .pad { width: $mixin-left-padding; } + .mixin__calc-btn { + width: $mixin-left-padding; + + img { + max-height: 16px; + } + } + + .mixin__calc-btn--calculated { + opacity: 0.4; + } + + .mixin__send-btn { + opacity: 0; + padding-right: 6px; + } } .mixin__property-overridden-by { @@ -124,15 +137,6 @@ outline: none; } -.mixin__calc-btn_calculated { - opacity: 0.4; -} - -.mixin__send-btn { - width: 20px; - opacity: 0; -} - .mixin__property-value-separator { margin-right: 5px; @@ -173,7 +177,7 @@ .mixin__property:not(.mixin__property_state_overridden):hover { - background-color: #ffe; + background-color: #f3f3f3; } @@ -186,9 +190,10 @@ } .mixin__property:not(.mixin__property_state_overridden):hover .mixin__send-btn { - opacity: 1; -} + opacity: 1; -.mixin__property:not(.mixin__property_state_overridden):hover .mixin__send-btn:active { - opacity: 0.5; + &:active { + opacity: 0.5; + } } + diff --git a/app/styles/nav.scss b/app/styles/nav.scss index c51efefbd8..92ce5e35c1 100644 --- a/app/styles/nav.scss +++ b/app/styles/nav.scss @@ -3,22 +3,17 @@ === Navigation lists and links */ -.nav__title { - padding: 3px 5px; - line-height: 11px; - height: 15px; -} -.nav__title h3 { +.nav__title h1 { white-space: nowrap; - display: inline-block; + height: 22px; text-overflow: ellipsis; overflow: hidden; color: #6e6e6e; + line-height: 22px; text-shadow: rgba(255, 255, 255, 0.75) 0 1px 0; - float: left; - padding: 0; - margin: 0; + padding: 0 5px; + margin: 2px 0 0 0; } /* List */ @@ -33,24 +28,22 @@ .nav li { display: block; - margin-top: 2px; } .nav li svg { - position: absolute; - top: 50%; - left: 14px; - margin-top: -10px; + flex-shrink: 0; + margin-right: 7px; + width: 22px; + height: 22px; } /* List anchor */ .nav li > a { display: block; - height: 18px; - line-height: 18px; - margin-top: 1px; - padding: 2px 5px; + height: 22px; + line-height: 22px; + padding: 0 5px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; @@ -75,8 +68,7 @@ .nav li > a.active { color: #fff; - text-shadow: 0 1px 0 rgba(0,0,0, 0.33); - background: #3879D9; + background: #3F81EE; } .nav li > a.active polygon, @@ -93,19 +85,26 @@ /* Custom navs */ .nav--main li > a { - position: relative; - height: 33px; - padding-left: 40px; + display: flex; + align-items: center; + height: 38px; + padding-left: 12px; color: #333; - line-height: 33px; + line-height: 38px; } -.nav.nav--main .nav__title { - padding-left: 15px; +.nav--main .pill { + margin-left: 5px; } -/* Custom nav title */ +.nav.nav--main .nav__title h1 { + padding-left: 14px; +} + +/* Flip path on Promises icon */ -.nav__title--middle { - line-height: 21px; +.promises-icon-circle { + transform: scaleX(-1); + transform-origin: 18px; } + diff --git a/app/styles/object_inspector.scss b/app/styles/object_inspector.scss index ef97da814f..5e889bd960 100644 --- a/app/styles/object_inspector.scss +++ b/app/styles/object_inspector.scss @@ -6,6 +6,7 @@ */ .object-trail { + margin-bottom: 4px; margin-left: 39px; word-break: break-all; } diff --git a/app/styles/pill.scss b/app/styles/pill.scss index 392feac8f3..c9a867190d 100644 --- a/app/styles/pill.scss +++ b/app/styles/pill.scss @@ -12,24 +12,20 @@ padding: 2px 6px; line-height: 12px; background: transparent; - text-shadow: rgba(255, 255, 255, 0.5) 0 1px 0; border-radius: 8px; vertical-align: middle; - background: rgba(0, 0, 0, 0.3); + background: rgba(0, 0, 0, 0.2); } -.pill_text_clear { - text-shadow: none; - font-weight: bold; -} - -.pill_not-clickable { +.pill--not-clickable { cursor: inherit; } -/** MODIFIER: SIZE = SMALL **/ -.pill_size_small { +.pill--small { + padding: 2px 4px; font-size: 10px; +} - padding: 2px 4px; +.pill--bold { + font-weight: bold; } diff --git a/app/styles/sidebar_toggle.scss b/app/styles/sidebar_toggle.scss index e3ec844b13..59fb136308 100644 --- a/app/styles/sidebar_toggle.scss +++ b/app/styles/sidebar_toggle.scss @@ -6,11 +6,18 @@ .sidebar-toggle { position: absolute; - top: 2px; + top: 0; + max-height: 27px; } + .toolbar__icon-button.sidebar-toggle { + margin-right: 0; + padding-right: 6px; + background: #fff; + } + .sidebar-toggle--right { - right: -6px; + right: 0; } .sidebar-toggle--left { diff --git a/app/styles/split.scss b/app/styles/split.scss index c7307d7d59..c83f005e85 100644 --- a/app/styles/split.scss +++ b/app/styles/split.scss @@ -39,13 +39,11 @@ flex: none; flex-direction: column; box-sizing: border-box; - padding: 1px 2px; - min-height: 23px; - line-height: 20px; - border-color: #cacaca; + border-color: #d6d6d6; } .split__panel__hd { + min-height: 29px; border-bottom-width: 1px; border-bottom-style: solid; background: #fff; @@ -58,6 +56,8 @@ } .split__panel__ft { + justify-content: center; + height: 23px; border-top-width: 1px; border-top-style: solid; background: #F3F3F3; diff --git a/app/styles/toolbar.scss b/app/styles/toolbar.scss index 11e95750d4..aabd437b2d 100644 --- a/app/styles/toolbar.scss +++ b/app/styles/toolbar.scss @@ -1,23 +1,23 @@ +$toolbar-height: 28px; + .toolbar { - display: -webkit-flex; display: flex; - -webkit-flex-direction: row; flex-direction: row; align-items: center; + min-height: $toolbar-height; } .toolbar > * { - -webkit-flex: none; flex: none; } + /** Toolbar Title ============= */ .toolbar__title { - -webkit-flex: auto; flex: auto; font-weight: 700; white-space: nowrap; @@ -31,19 +31,21 @@ */ .toolbar__icon-button { - display: inline-block; - width: 32px; - height: 20px; - margin-left: 0; - padding: 0; - vertical-align: top; + display: flex; + align-items: center; + height: $toolbar-height; + margin-right: 2px; + margin-left: 2px; + padding: 0 2px; border: 0 transparent none; - background-color: rgba(0, 0, 0, 0); - background: white; + vertical-align: top; + background: transparent; } +/* if first item in toolbar, create extra clickable space */ .toolbar__icon-button:first-child { - margin-left: -2px; + margin-left: 0; + padding-left: 10px; } .toolbar__icon-button:focus { @@ -96,17 +98,40 @@ fill: #cacaca; } + + /** Toolbar Checkboxes ================== */ .toolbar__checkbox { - margin: auto 6px auto 0; - height: auto; - line-height: 20px; + height: 100%; white-space: nowrap; overflow: hidden; + margin-right: 4px; + margin-left: 4px; +} + +.toolbar__checkbox label { + display: block; + height: 100%; + line-height: $toolbar-height; +} + +.toolbar__checkbox input { + margin: 0; +} + +/* if first item in toolbar, create extra clickable space */ + +.toolbar__checkbox:first-child { + margin-left: 0; +} + +.toolbar__checkbox:first-child label { + margin-left: 0; + padding-left: 8px; } /** @@ -120,13 +145,12 @@ position: relative; cursor: default; display: inline-block; - margin-right: 6px; - padding: 2px 6px; - line-height: 12px; - background: transparent; - text-shadow: rgba(255, 255, 255, 0.5) 0 1px 0; + margin-left: 2px; + margin-right: 2px; + padding: 0 6px; + background: rgba(0, 0, 0, 0.04); border: none; - border-radius: 8px; + border-radius: 2px; vertical-align: middle; } @@ -135,21 +159,27 @@ .toolbar__radio:focus, .toolbar__radio.active { outline: none; - color: white; - text-shadow: rgba(0, 0, 0, 0.4) 0 1px 0; } +.toolbar__radio--first { + margin-left: 4px; +} + +.toolbar__radio--last { + margin-right: 4px; +} .toolbar__radio:hover { - background: rgba(0, 0, 0, 0.2); + background: rgba(0, 0, 0, 0.1); } .toolbar__radio:active { - background: rgba(0, 0, 0, 0.5); + background: rgba(0, 0, 0, 0.2); } .toolbar__radio.active { - background: rgba(0, 0, 0, 0.3); + color: #fff; + background: #3F81EE; } /** @@ -158,23 +188,22 @@ */ .toolbar__search { - margin-right: 6px; + position: relative; + margin-right: 4px; + margin-left: 4px; } .toolbar__search input { - -moz-box-sizing: border-box; box-sizing: border-box; - border: 1px solid #b3b3b3; - border-radius: 2px; - margin: auto 0; - padding: 0 3px; + width: 175px; + height: $toolbar-height - 7; margin: 0; - -webkit-appearance: none; + border: 1px solid #ccc; + border-radius: 3px; + padding: 0 15px 0 4px; font-size: 12px; - background-color: #FFF; - height: 20px; line-height: normal; - width: 179px; + background-color: #FFF; } .toolbar__search input:focus { @@ -185,6 +214,18 @@ width: 150px; } +.toolbar__search-clear-button { + position: absolute; + top: 3px; + right: 0; + width: auto; + height: auto; + + svg { + path { fill: #666; } + } +} + /** Toolbar Divider =============== @@ -193,8 +234,9 @@ .toolbar .divider { display: inline-block; width: 1px; - height: 16px; + height: $toolbar-height - 10px; position: relative; - margin-right: 6px; + margin-right: 4px; + margin-left: 4px; background-color: #cacaca; } diff --git a/app/templates/components/clear-button.hbs b/app/templates/components/clear-button.hbs index 30f5f14ec7..bfa28c192f 100644 --- a/app/templates/components/clear-button.hbs +++ b/app/templates/components/clear-button.hbs @@ -1,6 +1 @@ - - - - - - +{{svg-jar "clear-2" width="13px" height="13px"}} \ No newline at end of file diff --git a/app/templates/components/deprecation-item.hbs b/app/templates/components/deprecation-item.hbs index ad72a754fb..fb81d8e2c7 100644 --- a/app/templates/components/deprecation-item.hbs +++ b/app/templates/components/deprecation-item.hbs @@ -1,7 +1,7 @@ {{#list.cell class="list__cell_main js-deprecation-main-cell" title=model.message}}
- {{model.count}} + {{model.count}} {{model.message}} {{#if model.url}} diff --git a/app/templates/components/iframe-picker.hbs b/app/templates/components/iframe-picker.hbs index a2903d3ce5..ab66cf21ee 100644 --- a/app/templates/components/iframe-picker.hbs +++ b/app/templates/components/iframe-picker.hbs @@ -4,5 +4,5 @@ {{/each}} -
+ {{svg-jar "dropdown-arrow" class="dropdown__arrow"}} diff --git a/app/templates/components/mixin-details.hbs b/app/templates/components/mixin-details.hbs index 55be88564b..071b97619a 100644 --- a/app/templates/components/mixin-details.hbs +++ b/app/templates/components/mixin-details.hbs @@ -1,6 +1,6 @@ {{#if model.errors.length}}
-

+

Errors Trace in the console @@ -21,7 +21,7 @@ {{#if mixin.model.properties.length}}

{{mixin.model.name}}

{{else}} -

{{mixin.model.name}}

+

{{mixin.model.name}}

{{/if}} {{#if mixin.isExpanded}}
    @@ -29,13 +29,13 @@ {{#mixin-property model=prop mixin=mixin as |property|}}
  • {{#if property.model.value.computed}} - + {{else}} - + {{/if}} {{property.model.name}}: {{#unless property.isEdit}} - {{property.model.value.inspect}} + {{property.model.value.inspect}} {{else}} {{#unless property.isDate}} {{property-field value=property.txtValue finished-editing="finishedEditing" save-property="saveProperty" propertyComponent=property @@ -45,8 +45,8 @@ class="mixin__property-value-txt js-object-property-value-date" onSelection=(action "dateSelected" target=property) cancel=(action "finishedEditing" target=property)}} {{/unless}} {{/unless}} - (Overridden by {{property.model.overridden}}) - + (Overridden by {{property.model.overridden}}) +
    • {{/mixin-property}} {{else}} diff --git a/app/templates/components/object-inspector.hbs b/app/templates/components/object-inspector.hbs index 99208a8a14..c2ef2c0348 100644 --- a/app/templates/components/object-inspector.hbs +++ b/app/templates/components/object-inspector.hbs @@ -4,14 +4,10 @@ isExpanded=true class="toolbar__icon-button sidebar-toggle--far-left"}}
    -
    + {{model.firstObject.name}} diff --git a/app/templates/components/promise-item.hbs b/app/templates/components/promise-item.hbs index 98aa7e352b..22f1b5eb01 100644 --- a/app/templates/components/promise-item.hbs +++ b/app/templates/components/promise-item.hbs @@ -13,7 +13,7 @@
    {{/list.cell}} {{#list.cell}} -
    {{state}}
    +
    {{state}}
    {{/list.cell}} {{#list.cell class="js-promise-value"}} {{#if hasValue}} diff --git a/app/templates/components/reload-button.hbs b/app/templates/components/reload-button.hbs index f67ffeb417..3905c01ab4 100644 --- a/app/templates/components/reload-button.hbs +++ b/app/templates/components/reload-button.hbs @@ -1,7 +1 @@ - - - +{{svg-jar "reload" width="13px" height="13px"}} \ No newline at end of file diff --git a/app/templates/components/render-item.hbs b/app/templates/components/render-item.hbs index d766e667a0..0560d1bb00 100644 --- a/app/templates/components/render-item.hbs +++ b/app/templates/components/render-item.hbs @@ -6,7 +6,7 @@ {{/list.cell}} {{#list.cell class="list__cell_value_numeric"}} - {{ms-to-time model.duration}} + {{ms-to-time model.duration}} {{/list.cell}} {{#list.cell class="list__cell_value_numeric js-render-profile-timestamp"}} {{readableTime}} diff --git a/app/templates/components/search-field.hbs b/app/templates/components/search-field.hbs new file mode 100644 index 0000000000..9cab104a46 --- /dev/null +++ b/app/templates/components/search-field.hbs @@ -0,0 +1,6 @@ +{{input value=value type="text" placeholder="Search"}} +{{#if search}} + +{{/if}} \ No newline at end of file diff --git a/app/templates/components/view-item.hbs b/app/templates/components/view-item.hbs index 62fc6db6d3..4e6bc79bbc 100644 --- a/app/templates/components/view-item.hbs +++ b/app/templates/components/view-item.hbs @@ -45,5 +45,5 @@ {{/list.cell}} {{#list.cell class="list__cell_size_small list__cell_value_numeric"}} - {{ms-to-time model.value.duration}} + {{ms-to-time model.value.duration}} {{/list.cell}} diff --git a/app/templates/container-type-toolbar.hbs b/app/templates/container-type-toolbar.hbs index 046ac69ffb..461d0844b6 100644 --- a/app/templates/container-type-toolbar.hbs +++ b/app/templates/container-type-toolbar.hbs @@ -1,7 +1,9 @@
    {{reload-button action="reload" classNames="toolbar__icon-button js-reload-container-btn"}} + +
    - {{input value=searchVal placeholder="Search"}} + {{search-field value=searchValue}}
    diff --git a/app/templates/container-types.hbs b/app/templates/container-types.hbs index 943e5cdebf..3607391366 100644 --- a/app/templates/container-types.hbs +++ b/app/templates/container-types.hbs @@ -6,7 +6,7 @@
    -

    Types

    +

    Types

      diff --git a/app/templates/deprecations-toolbar.hbs b/app/templates/deprecations-toolbar.hbs index ca835ab49b..c925521ea5 100644 --- a/app/templates/deprecations-toolbar.hbs +++ b/app/templates/deprecations-toolbar.hbs @@ -1,7 +1,9 @@
      {{clear-button action="clear" classNames="toolbar__icon-button js-clear-deprecations-btn"}} + +
      - {{input value=searchVal placeholder="Search"}} + {{search-field value=searchValue}}
      diff --git a/app/templates/model-types-toolbar.hbs b/app/templates/model-types-toolbar.hbs index fe77c73762..b414522d1c 100644 --- a/app/templates/model-types-toolbar.hbs +++ b/app/templates/model-types-toolbar.hbs @@ -1,5 +1,8 @@
      - {{input type="checkbox" checked=hideEmptyModelTypes id="options-hideEmptyModelTypes"}} +
      diff --git a/app/templates/model-types.hbs b/app/templates/model-types.hbs index 44b7c9e62a..9e3a8f7083 100644 --- a/app/templates/model-types.hbs +++ b/app/templates/model-types.hbs @@ -1,7 +1,7 @@
      {{#draggable-column width=navWidth classes="split__panel split__panel--sidebar-2 nav"}}
      -

      Model Types

      +

      Model Types

        {{#each sorted as |modelType|}}
      • diff --git a/app/templates/nav.hbs b/app/templates/nav.hbs index 1cf373ea9a..0a2127aa4c 100644 --- a/app/templates/nav.hbs +++ b/app/templates/nav.hbs @@ -2,115 +2,54 @@
        • {{#link-to "view-tree"}} + {{svg-jar "nav-view-tree" width="20px" height="20px"}} View Tree - - - {{/link-to}}
        • {{#link-to "route-tree"}} + {{svg-jar "nav-route-tree" width="20px" height="20px"}} Routes - - - - {{/link-to}}
        • {{#link-to "data"}} + {{svg-jar "nav-data" width="20px" height="20px"}} Data - - - {{/link-to}}
        • {{#link-to "deprecations"}} + {{svg-jar "nav-deprecations" width="20px" height="20px"}} Deprecations - - - - - - - - - - - {{deprecationCount}} + {{deprecationCount}} {{/link-to}}
        • {{#link-to "info"}} - Info - - - - - + {{svg-jar "nav-info" width="20px" height="20px"}} + Info {{/link-to}}
        -
        -

        Advanced

        -
        +

        Advanced

        • {{#link-to "promise-tree"}} + {{svg-jar "nav-promises" width="20px" height="20px"}} Promises - - - - {{/link-to}}
        • {{#link-to "container-types"}} - Container - - - - - - - - - + {{svg-jar "nav-container" width="20px" height="20px"}} + Container {{/link-to}}
        • {{#link-to "render-tree"}} - Render Performance - - - - - - - - - + {{svg-jar "nav-render-performance" width="20px" height="20px"}} + Render Performance {{/link-to}}
        diff --git a/app/templates/promise-tree-toolbar.hbs b/app/templates/promise-tree-toolbar.hbs index 31c14ce8a7..c64d50240a 100644 --- a/app/templates/promise-tree-toolbar.hbs +++ b/app/templates/promise-tree-toolbar.hbs @@ -1,31 +1,34 @@
        {{clear-button action="clear" classNames="toolbar__icon-button js-clear-promises-btn"}} + {{! if should refresh the refresh button will be in the middle of the of the tab }} + {{#unless shouldRefresh}} + + {{reload-button action="refreshPage" classNames="toolbar__icon-button js-toolbar-page-refresh-btn"}} + {{/unless}} + + +
        - {{input value=search placeholder="Search"}} + {{search-field value=searchValue}}
        - -
        - - + -
        +
        - {{action-checkbox on-update="updateInstrumentWithStack" checked=instrumentWithStack id="instrument-with-stack"}} +
        - - - {{! if should refresh the refresh button will be in the middle of the of the tab }} - {{#unless shouldRefresh}} -
        - - {{/unless}} -
        diff --git a/app/templates/records-toolbar.hbs b/app/templates/records-toolbar.hbs index 191c2e1ee0..6a82e69ebc 100644 --- a/app/templates/records-toolbar.hbs +++ b/app/templates/records-toolbar.hbs @@ -1,13 +1,14 @@
        - {{input value=search placeholder="Search"}} + {{search-field value=searchValue}}
        + + -
        {{#each filters as |item|}} {{#record-filter model=item filterValue=filterValue as |filter|}} + + {{reload-button action="refreshPage" classNames="toolbar__icon-button js-toolbar-page-refresh-btn"}} {{/unless}} + + +
        + {{search-field value=searchValue}} +
        diff --git a/app/templates/route-tree-toolbar.hbs b/app/templates/route-tree-toolbar.hbs index a907f74acc..0f4c733a3f 100644 --- a/app/templates/route-tree-toolbar.hbs +++ b/app/templates/route-tree-toolbar.hbs @@ -1,5 +1,8 @@
        - {{input type="checkbox" checked=options.hideRoutes id="options-hideRoutes"}} +
        diff --git a/app/templates/view-tree-toolbar.hbs b/app/templates/view-tree-toolbar.hbs index c72e5d2165..a24b6a2cca 100644 --- a/app/templates/view-tree-toolbar.hbs +++ b/app/templates/view-tree-toolbar.hbs @@ -1,22 +1,25 @@
        -
        +
        - {{input type="checkbox" checked=options.components id="options-components"}} +
        - {{input type="text" id="options-views" placeholder="Search Views" value=searchText}} + {{search-field value=searchValue}}
        diff --git a/ember-cli-build.js b/ember-cli-build.js index 27cce09f64..5d37b3e854 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -22,6 +22,12 @@ const map = stew.map; const options = { fingerprint: { enabled: false + }, + + svgJar: { + sourceDirs: [ + 'public/assets/svg' + ] } }; diff --git a/package.json b/package.json index 285b4ffdee..d0eb402b0f 100644 --- a/package.json +++ b/package.json @@ -69,6 +69,7 @@ "ember-resolver": "^4.0.0", "ember-source": "~3.0.0", "ember-source-channel-url": "^1.0.1", + "ember-svg-jar": "^1.1.1", "ember-truth-helpers": "2.0.0", "ember-try": "^1.0.0-beta.1", "eslint-plugin-ember": "^5.0.0", diff --git a/public/assets/images/arrow_down.svg b/public/assets/images/arrow_down.svg deleted file mode 100644 index 46da0494a1..0000000000 --- a/public/assets/images/arrow_down.svg +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - diff --git a/public/assets/images/calculate.svg b/public/assets/images/calculate.svg deleted file mode 100755 index 7fe298b836..0000000000 --- a/public/assets/images/calculate.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/assets/images/external_link.svg b/public/assets/images/external_link.svg deleted file mode 100644 index 8e05e1b374..0000000000 --- a/public/assets/images/external_link.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - diff --git a/public/assets/images/fishy_tomster.png b/public/assets/images/fishy_tomster.png index bd16ea8818..fd4b7d4192 100644 Binary files a/public/assets/images/fishy_tomster.png and b/public/assets/images/fishy_tomster.png differ diff --git a/public/assets/svg/arrow-back.svg b/public/assets/svg/arrow-back.svg new file mode 100644 index 0000000000..58ff40f2e4 --- /dev/null +++ b/public/assets/svg/arrow-back.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/public/assets/svg/calculate.svg b/public/assets/svg/calculate.svg new file mode 100755 index 0000000000..1958000a85 --- /dev/null +++ b/public/assets/svg/calculate.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/public/assets/svg/clear-2.svg b/public/assets/svg/clear-2.svg new file mode 100644 index 0000000000..004e8de23a --- /dev/null +++ b/public/assets/svg/clear-2.svg @@ -0,0 +1,4 @@ + + + + diff --git a/public/assets/svg/clear.svg b/public/assets/svg/clear.svg new file mode 100644 index 0000000000..1a64a5a254 --- /dev/null +++ b/public/assets/svg/clear.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/public/assets/svg/dropdown-arrow.svg b/public/assets/svg/dropdown-arrow.svg new file mode 100644 index 0000000000..15562a27ce --- /dev/null +++ b/public/assets/svg/dropdown-arrow.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/public/assets/svg/external_link.svg b/public/assets/svg/external_link.svg new file mode 100644 index 0000000000..aa605f396e --- /dev/null +++ b/public/assets/svg/external_link.svg @@ -0,0 +1,4 @@ + + + + diff --git a/public/assets/svg/nav-container.svg b/public/assets/svg/nav-container.svg new file mode 100644 index 0000000000..16006bcbc1 --- /dev/null +++ b/public/assets/svg/nav-container.svg @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/public/assets/svg/nav-data.svg b/public/assets/svg/nav-data.svg new file mode 100644 index 0000000000..3c45889742 --- /dev/null +++ b/public/assets/svg/nav-data.svg @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/public/assets/svg/nav-deprecations.svg b/public/assets/svg/nav-deprecations.svg new file mode 100644 index 0000000000..912242c038 --- /dev/null +++ b/public/assets/svg/nav-deprecations.svg @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/public/assets/svg/nav-info.svg b/public/assets/svg/nav-info.svg new file mode 100644 index 0000000000..9258bf96d7 --- /dev/null +++ b/public/assets/svg/nav-info.svg @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/public/assets/svg/nav-promises.svg b/public/assets/svg/nav-promises.svg new file mode 100644 index 0000000000..c39637295b --- /dev/null +++ b/public/assets/svg/nav-promises.svg @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/public/assets/svg/nav-render-performance.svg b/public/assets/svg/nav-render-performance.svg new file mode 100644 index 0000000000..badc9e1c03 --- /dev/null +++ b/public/assets/svg/nav-render-performance.svg @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/public/assets/svg/nav-route-tree.svg b/public/assets/svg/nav-route-tree.svg new file mode 100644 index 0000000000..78f4326ff8 --- /dev/null +++ b/public/assets/svg/nav-route-tree.svg @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/public/assets/svg/nav-view-tree.svg b/public/assets/svg/nav-view-tree.svg new file mode 100644 index 0000000000..7936b51a1e --- /dev/null +++ b/public/assets/svg/nav-view-tree.svg @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/public/assets/svg/reload.svg b/public/assets/svg/reload.svg new file mode 100644 index 0000000000..b9724a1640 --- /dev/null +++ b/public/assets/svg/reload.svg @@ -0,0 +1,3 @@ + + + diff --git a/yarn.lock b/yarn.lock index 9b02c3fb04..df05843f65 100644 --- a/yarn.lock +++ b/yarn.lock @@ -129,6 +129,10 @@ "@types/acorn" "*" source-map "^0.6.1" +abab@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e" + abbrev@1: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" @@ -147,12 +151,22 @@ accepts@~1.3.4: mime-types "~2.1.16" 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" + dependencies: + acorn "^2.1.0" + acorn-jsx@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b" dependencies: acorn "^3.0.4" +acorn@^2.1.0, acorn@^2.4.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-2.7.0.tgz#ab6e7d9d886aaca8b085bc3312b79a198433f0e7" + acorn@^3.0.4: version "3.3.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" @@ -1288,6 +1302,10 @@ body@^5.1.0: raw-body "~1.1.0" safe-json-parse "~1.0.1" +boolbase@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" + boom@2.x.x: version "2.10.1" resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f" @@ -1436,6 +1454,17 @@ broccoli-builder@^0.18.8: rsvp "^3.0.17" silent-error "^1.0.1" +broccoli-caching-writer@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-2.3.1.tgz#b93cf58f9264f003075868db05774f4e7f25bd07" + dependencies: + broccoli-kitchen-sink-helpers "^0.2.5" + broccoli-plugin "1.1.0" + debug "^2.1.1" + rimraf "^2.2.8" + rsvp "^3.0.17" + walk-sync "^0.2.5" + broccoli-caching-writer@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-3.0.3.tgz#0bd2c96a9738d6a6ab590f07ba35c5157d7db476" @@ -1456,6 +1485,19 @@ broccoli-clean-css@^1.1.0: inline-source-map-comment "^1.0.5" json-stable-stringify "^1.0.0" +broccoli-concat@^2.2.0: + version "2.3.8" + resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-2.3.8.tgz#590cdcc021bb905b6c121d87c2d1d57df44a2a48" + dependencies: + broccoli-caching-writer "^2.3.1" + broccoli-kitchen-sink-helpers "^0.3.1" + broccoli-stew "^1.3.3" + fast-sourcemap-concat "^1.0.1" + fs-extra "^0.30.0" + lodash.merge "^4.3.0" + lodash.omit "^4.1.0" + lodash.uniq "^4.2.0" + broccoli-concat@^3.0.1, broccoli-concat@^3.2.2: version "3.2.2" resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-3.2.2.tgz#86ffdc52606eb590ba9f6b894c5ec7a016f5b7b9" @@ -1565,16 +1607,16 @@ broccoli-funnel@^2.0.0, broccoli-funnel@^2.0.1: symlink-or-copy "^1.0.0" walk-sync "^0.3.1" -broccoli-kitchen-sink-helpers@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.3.1.tgz#77c7c18194b9664163ec4fcee2793444926e0c06" +broccoli-kitchen-sink-helpers@^0.2.5, broccoli-kitchen-sink-helpers@~0.2.0: + version "0.2.9" + resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc" dependencies: glob "^5.0.10" mkdirp "^0.5.1" -broccoli-kitchen-sink-helpers@~0.2.0: - version "0.2.9" - resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc" +broccoli-kitchen-sink-helpers@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.3.1.tgz#77c7c18194b9664163ec4fcee2793444926e0c06" dependencies: glob "^5.0.10" mkdirp "^0.5.1" @@ -1625,7 +1667,7 @@ broccoli-middleware@^1.0.0: handlebars "^4.0.4" mime "^1.2.11" -broccoli-persistent-filter@^1.0.3, broccoli-persistent-filter@^1.1.5, broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.4.0, broccoli-persistent-filter@^1.4.2, broccoli-persistent-filter@^1.4.3: +broccoli-persistent-filter@^1.0.3, broccoli-persistent-filter@^1.1.5, broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.2.0, broccoli-persistent-filter@^1.4.0, broccoli-persistent-filter@^1.4.2, broccoli-persistent-filter@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.4.3.tgz#3511bc52fc53740cda51621f58a28152d9911bc1" dependencies: @@ -1643,6 +1685,15 @@ broccoli-persistent-filter@^1.0.3, broccoli-persistent-filter@^1.1.5, broccoli-p symlink-or-copy "^1.0.1" walk-sync "^0.3.1" +broccoli-plugin@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-1.1.0.tgz#73e2cfa05f8ea1e3fc1420c40c3d9e7dc724bf02" + dependencies: + promise-map-series "^0.2.1" + quick-temp "^0.1.3" + rimraf "^2.3.4" + symlink-or-copy "^1.0.1" + broccoli-plugin@^1.0.0, broccoli-plugin@^1.1.0, broccoli-plugin@^1.2.0, broccoli-plugin@^1.2.1, broccoli-plugin@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-1.3.0.tgz#bee704a8e42da08cb58e513aaa436efb7f0ef1ee" @@ -1707,13 +1758,32 @@ broccoli-stew@^1.2.0, broccoli-stew@^1.3.2, broccoli-stew@^1.3.3, broccoli-stew@ symlink-or-copy "^1.1.8" walk-sync "^0.3.0" -broccoli-string-replace@^0.1.1: +broccoli-string-replace@^0.1.1, broccoli-string-replace@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/broccoli-string-replace/-/broccoli-string-replace-0.1.2.tgz#1ed92f85680af8d503023925e754e4e33676b91f" dependencies: broccoli-persistent-filter "^1.1.5" minimatch "^3.0.3" +broccoli-svg-optimizer@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/broccoli-svg-optimizer/-/broccoli-svg-optimizer-1.0.2.tgz#b12e84e65912f3134939cbf766c3fa0b4d0d92d9" + dependencies: + broccoli-persistent-filter "^1.2.0" + json-stable-stringify "^1.0.1" + rsvp "^3.2.1" + svgo "^0.6.6" + +broccoli-symbolizer@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/broccoli-symbolizer/-/broccoli-symbolizer-0.5.0.tgz#c666d4158ff4484263daaee9a6284d684b6eb3a2" + dependencies: + broccoli-concat "^2.2.0" + broccoli-persistent-filter "^1.2.0" + cheerio "^0.20.0" + json-stable-stringify "^1.0.1" + lodash "^4.13.1" + broccoli-uglify-sourcemap@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-2.0.2.tgz#f4a73112f1f56b46043e2e89cba5ce7762cddeb3" @@ -1955,6 +2025,18 @@ charm@^1.0.0: dependencies: inherits "^2.0.1" +cheerio@^0.20.0: + version "0.20.0" + resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.20.0.tgz#5c710f2bab95653272842ba01c6ea61b3545ec35" + dependencies: + css-select "~1.2.0" + dom-serializer "~0.1.0" + entities "~1.1.1" + htmlparser2 "~3.8.1" + lodash "^4.1.0" + optionalDependencies: + jsdom "^7.0.2" + chokidar@1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" @@ -1974,6 +2056,12 @@ circular-json@^0.3.1: version "0.3.3" resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66" +clap@^1.0.9: + version "1.2.3" + resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.3.tgz#4f36745b32008492557f46412d66d50cb99bce51" + dependencies: + chalk "^1.1.3" + class-utils@^0.3.5: version "0.3.6" resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" @@ -2079,6 +2167,12 @@ co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" +coa@~1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd" + dependencies: + q "^1.1.2" + code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" @@ -2108,7 +2202,7 @@ colors@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" -colors@^1.1.2: +colors@^1.1.2, colors@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63" @@ -2355,6 +2449,36 @@ crypto-random-string@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e" +css-select@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" + dependencies: + boolbase "~1.0.0" + css-what "2.1" + domutils "1.5.1" + nth-check "~1.0.1" + +css-what@2.1: + version "2.1.0" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd" + +csso@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/csso/-/csso-2.0.0.tgz#178b43a44621221c27756086f531e02f42900ee8" + dependencies: + clap "^1.0.9" + source-map "^0.5.3" + +cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0": + version "0.3.2" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b" + +"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" + currently-unhandled@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" @@ -2560,6 +2684,34 @@ doctrine@^2.1.0: dependencies: esutils "^2.0.2" +dom-serializer@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: + domelementtype "~1.1.1" + entities "~1.1.1" + +domelementtype@1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2" + +domelementtype@~1.1.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b" + +domhandler@2.3: + version "2.3.0" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.3.0.tgz#2de59a0822d5027fabff6f032c2b25a2a8abe738" + dependencies: + domelementtype "1" + +domutils@1.5, 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" + dot-prop@^4.1.0: version "4.2.0" resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57" @@ -3059,6 +3211,22 @@ ember-source@~3.0.0: jquery "^3.2.1" resolve "^1.3.3" +ember-svg-jar@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ember-svg-jar/-/ember-svg-jar-1.1.1.tgz#d95d4c335ed98984ba4c5808280404a5968b78b3" + dependencies: + broccoli-caching-writer "^2.3.1" + broccoli-funnel "^1.0.1" + broccoli-merge-trees "^1.1.1" + broccoli-string-replace "^0.1.2" + broccoli-svg-optimizer "^1.0.2" + broccoli-symbolizer "^0.5.0" + cheerio "^0.20.0" + ember-cli-babel "^6.6.0" + lodash "^4.13.1" + mkdirp "^0.5.1" + path-posix "^1.0.0" + ember-truth-helpers@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ember-truth-helpers/-/ember-truth-helpers-2.0.0.tgz#f3e2eef667859197f1328bb4f83b0b35b661c1ac" @@ -3149,6 +3317,10 @@ ensure-posix-path@^1.0.0, ensure-posix-path@^1.0.1, ensure-posix-path@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/ensure-posix-path/-/ensure-posix-path-1.0.2.tgz#a65b3e42d0b71cfc585eb774f9943c8d9b91b0c2" +entities@1.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-1.0.0.tgz#b2987aa3821347fcde642b24fdfc9e4fb712bf26" + entities@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0" @@ -3174,6 +3346,17 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.0, escape-string-regexp@^1 version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" +escodegen@^1.6.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2" + dependencies: + esprima "^3.1.3" + estraverse "^4.2.0" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.6.1" + eslint-plugin-ember@^5.0.0: version "5.0.3" resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-5.0.3.tgz#9f5e2048ab3ddc1548d4d17bf318cf1bb5cf37f1" @@ -3250,6 +3433,10 @@ esprima@^2.6.0: version "2.7.3" resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581" +esprima@^3.1.3, esprima@~3.1.0: + version "3.1.3" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" + esprima@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804" @@ -3262,10 +3449,6 @@ esprima@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.0.0.tgz#53cf247acda77313e551c3aa2e73342d3fb4f7d9" -esprima@~3.1.0: - version "3.1.3" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" - esquery@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa" @@ -3279,7 +3462,7 @@ esrecurse@^4.1.0: estraverse "^4.1.0" object-assign "^4.0.1" -estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1: +estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" @@ -4467,6 +4650,16 @@ hosted-git-info@^2.1.4, hosted-git-info@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c" +htmlparser2@~3.8.1: + version "3.8.3" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.8.3.tgz#996c28b191516a8be86501a7d79757e5c70c1068" + dependencies: + domelementtype "1" + domhandler "2.3" + domutils "1.5" + entities "1.0" + readable-stream "1.1" + http-cache-semantics@3.8.1: version "3.8.1" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2" @@ -5030,10 +5223,37 @@ js-yaml@~2.0.5: argparse "~ 0.1.11" esprima "~ 1.0.2" +js-yaml@~3.6.0: + version "3.6.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30" + dependencies: + argparse "^1.0.7" + esprima "^2.6.0" + jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" +jsdom@^7.0.2: + version "7.2.2" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-7.2.2.tgz#40b402770c2bda23469096bee91ab675e3b1fc6e" + dependencies: + abab "^1.0.0" + acorn "^2.4.0" + acorn-globals "^1.0.4" + cssom ">= 0.3.0 < 0.4.0" + cssstyle ">= 0.2.29 < 0.3.0" + escodegen "^1.6.1" + nwmatcher ">= 1.3.7 < 2.0.0" + parse5 "^1.5.1" + request "^2.55.0" + sax "^1.1.4" + symbol-tree ">= 3.1.0 < 4.0.0" + tough-cookie "^2.2.0" + webidl-conversions "^2.0.0" + whatwg-url-compat "~0.6.5" + xml-name-validator ">= 2.0.1 < 3.0.0" + jsesc@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" @@ -5693,7 +5913,7 @@ lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.5.1, lod version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" -lodash@^4.2.0, lodash@^4.6.1: +lodash@^4.1.0, lodash@^4.13.1, lodash@^4.2.0, lodash@^4.6.1: version "4.17.5" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" @@ -6036,7 +6256,7 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@0.5, mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1: +mkdirp@0.5, mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" dependencies: @@ -6335,10 +6555,20 @@ npm-run-path@^2.0.0: gauge "~2.7.3" set-blocking "~2.0.0" +nth-check@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4" + dependencies: + boolbase "~1.0.0" + number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" +"nwmatcher@>= 1.3.7 < 2.0.0": + version "1.4.4" + resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.4.tgz#2285631f34a95f0d0395cd900c96ed39b58f346e" + oauth-sign@~0.8.0, oauth-sign@~0.8.1, oauth-sign@~0.8.2: version "0.8.2" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" @@ -6423,7 +6653,7 @@ optimist@^0.6.1: minimist "~0.0.1" wordwrap "~0.0.2" -optionator@^0.8.2: +optionator@^0.8.1, optionator@^0.8.2: version "0.8.2" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64" dependencies: @@ -6560,6 +6790,10 @@ parse-passwd@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" +parse5@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94" + parsejson@0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/parsejson/-/parsejson-0.0.3.tgz#ab7e3759f209ece99437973f7d0f1f64ae0e64ab" @@ -6895,6 +7129,15 @@ read@1, read@1.0.7: dependencies: mute-stream "~0.0.4" +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@^1.0.27-1: version "1.1.14" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" @@ -7195,6 +7438,33 @@ request@2.81.0: tunnel-agent "^0.6.0" uuid "^3.0.0" +request@^2.55.0: + version "2.85.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa" + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.6.0" + caseless "~0.12.0" + combined-stream "~1.0.5" + extend "~3.0.1" + forever-agent "~0.6.1" + form-data "~2.3.1" + har-validator "~5.0.3" + hawk "~6.0.2" + http-signature "~1.2.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.17" + oauth-sign "~0.8.2" + performance-now "^2.1.0" + qs "~6.5.1" + safe-buffer "^5.1.1" + stringstream "~0.0.5" + tough-cookie "~2.3.3" + tunnel-agent "^0.6.0" + uuid "^3.1.0" + request@~2.79.0: version "2.79.0" resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de" @@ -7314,7 +7584,7 @@ rollup@^0.51.6: version "0.51.8" resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.51.8.tgz#58bd0b642885f4770b5f93cc64f14e4233c2236d" -rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.3.3, rsvp@^3.5.0: +rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.2.1, rsvp@^3.3.3, rsvp@^3.5.0: version "3.6.2" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a" @@ -7401,7 +7671,7 @@ sax@1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a" -sax@>=0.6.0: +sax@>=0.6.0, sax@^1.1.4, sax@~1.2.1: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" @@ -7702,7 +7972,7 @@ source-map@0.4.x, source-map@^0.4.2, source-map@^0.4.4: dependencies: amdefine ">=0.0.4" -source-map@^0.5.0, source-map@^0.5.6, source-map@~0.5.0, source-map@~0.5.1: +source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.0, source-map@~0.5.1: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" @@ -7932,6 +8202,22 @@ supports-color@^5.2.0: dependencies: has-flag "^3.0.0" +svgo@^0.6.6: + version "0.6.6" + resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.6.6.tgz#b340889036f20f9b447543077d0f5573ed044c08" + dependencies: + coa "~1.0.1" + colors "~1.1.2" + csso "~2.0.0" + js-yaml "~3.6.0" + mkdirp "~0.5.1" + sax "~1.2.1" + whet.extend "~0.9.9" + +"symbol-tree@>= 3.1.0 < 4.0.0": + version "3.2.2" + resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6" + symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8: version "1.1.8" resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.1.8.tgz#cabe61e0010c1c023c173b25ee5108b37f4b4aa3" @@ -8130,6 +8416,12 @@ to-utf8@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/to-utf8/-/to-utf8-0.0.1.tgz#d17aea72ff2fba39b9e43601be7b3ff72e089852" +tough-cookie@^2.2.0: + version "2.3.4" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655" + dependencies: + punycode "^1.4.1" + tough-cookie@~2.2.0: version "2.2.2" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.2.2.tgz#c83a1830f4e5ef0b93ef2a3488e724f8de016ac7" @@ -8140,6 +8432,10 @@ tough-cookie@~2.3.0, tough-cookie@~2.3.3: dependencies: punycode "^1.4.1" +tr46@~0.0.1: + version "0.0.3" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + "traverse@>=0.3.0 <0.4": version "0.3.9" resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9" @@ -8434,7 +8730,7 @@ walk-sync@0.3.2, walk-sync@^0.3.0, walk-sync@^0.3.1, walk-sync@^0.3.2: ensure-posix-path "^1.0.0" matcher-collection "^1.0.0" -walk-sync@^0.2.7: +walk-sync@^0.2.5, walk-sync@^0.2.7: version "0.2.7" resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.2.7.tgz#b49be4ee6867657aeb736978b56a29d10fa39969" dependencies: @@ -8474,6 +8770,10 @@ wcwidth@^1.0.1: dependencies: defaults "^1.0.3" +webidl-conversions@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-2.0.1.tgz#3bf8258f7d318c7443c36f2e169402a1a6703506" + websocket-driver@>=0.5.1: version "0.7.0" resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb" @@ -8485,6 +8785,12 @@ websocket-extensions@>=0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29" +whatwg-url-compat@~0.6.5: + version "0.6.5" + resolved "https://registry.yarnpkg.com/whatwg-url-compat/-/whatwg-url-compat-0.6.5.tgz#00898111af689bb097541cd5a45ca6c8798445bf" + dependencies: + tr46 "~0.0.1" + when@3.6.4: version "3.6.4" resolved "https://registry.yarnpkg.com/when/-/when-3.6.4.tgz#473b517ec159e2b85005497a13983f095412e34e" @@ -8493,6 +8799,10 @@ when@3.7.2: version "3.7.2" resolved "https://registry.yarnpkg.com/when/-/when-3.7.2.tgz#06bed1296df3a0bfd83f7f31c5e1d779bd97eae8" +whet.extend@~0.9.9: + version "0.9.9" + resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1" + which-module@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" @@ -8587,6 +8897,10 @@ xdg-basedir@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4" +"xml-name-validator@>= 2.0.1 < 3.0.0": + version "2.0.1" + resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635" + xml2js@0.2.x: version "0.2.8" resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.2.8.tgz#9b81690931631ff09d1957549faf54f4f980b3c2"