diff --git a/addons/rose/.template-lintrc.js b/addons/rose/.template-lintrc.js index 5399c1736..cf69ffde1 100644 --- a/addons/rose/.template-lintrc.js +++ b/addons/rose/.template-lintrc.js @@ -1,7 +1,8 @@ 'use strict'; module.exports = { - extends: 'octane', + plugins: ['ember-template-lint-plugin-prettier'], + extends: ['octane', 'ember-template-lint-plugin-prettier:recommended'], overrides: [ { files: [ diff --git a/addons/rose/addon/components/rose/badge/index.hbs b/addons/rose/addon/components/rose/badge/index.hbs index 6ef77906f..8111a0eac 100644 --- a/addons/rose/addon/components/rose/badge/index.hbs +++ b/addons/rose/addon/components/rose/badge/index.hbs @@ -1,14 +1,12 @@ - {{#if @icon}} - + {{/if}} - + {{yield}} - + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/button/index.hbs b/addons/rose/addon/components/rose/button/index.hbs index cd87dd8d8..7dc30c066 100644 --- a/addons/rose/addon/components/rose/button/index.hbs +++ b/addons/rose/addon/components/rose/button/index.hbs @@ -1,34 +1,29 @@ + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/card/link/index.hbs b/addons/rose/addon/components/rose/card/link/index.hbs index ead6f0ee9..610185779 100644 --- a/addons/rose/addon/components/rose/card/link/index.hbs +++ b/addons/rose/addon/components/rose/card/link/index.hbs @@ -1,34 +1,32 @@ - \ No newline at end of file diff --git a/addons/rose/addon/components/rose/cards/index.hbs b/addons/rose/addon/components/rose/cards/index.hbs index eafcba07d..1df7ccb51 100644 --- a/addons/rose/addon/components/rose/cards/index.hbs +++ b/addons/rose/addon/components/rose/cards/index.hbs @@ -1,8 +1,3 @@ -
- {{yield (hash - link=(component "rose/card/link") - )}} -
+
+ {{yield (hash link=(component 'rose/card/link'))}} +
\ No newline at end of file diff --git a/addons/rose/addon/components/rose/dialog/body/index.hbs b/addons/rose/addon/components/rose/dialog/body/index.hbs index 143d0758f..e77e9c6b0 100644 --- a/addons/rose/addon/components/rose/dialog/body/index.hbs +++ b/addons/rose/addon/components/rose/dialog/body/index.hbs @@ -1,3 +1,3 @@ -
+
{{yield}} -
+
\ No newline at end of file diff --git a/addons/rose/addon/components/rose/dialog/cover/index.hbs b/addons/rose/addon/components/rose/dialog/cover/index.hbs index 4d56b0d2d..4a75cd737 100644 --- a/addons/rose/addon/components/rose/dialog/cover/index.hbs +++ b/addons/rose/addon/components/rose/dialog/cover/index.hbs @@ -1,21 +1,21 @@ -
+
+ \ No newline at end of file diff --git a/addons/rose/addon/components/rose/dialog/index.hbs b/addons/rose/addon/components/rose/dialog/index.hbs index 927faa072..4a47238a9 100644 --- a/addons/rose/addon/components/rose/dialog/index.hbs +++ b/addons/rose/addon/components/rose/dialog/index.hbs @@ -1,41 +1,44 @@ {{#if @modal}} -
+
@@ -43,36 +46,42 @@ -{{/if}} +{{/if}} \ No newline at end of file diff --git a/addons/rose/addon/components/rose/dropdown/button/index.hbs b/addons/rose/addon/components/rose/dropdown/button/index.hbs index 364a2ef18..835937e70 100644 --- a/addons/rose/addon/components/rose/dropdown/button/index.hbs +++ b/addons/rose/addon/components/rose/dropdown/button/index.hbs @@ -1,19 +1,18 @@ + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/dropdown/index.hbs b/addons/rose/addon/components/rose/dropdown/index.hbs index d3679b3a6..1b272e92c 100644 --- a/addons/rose/addon/components/rose/dropdown/index.hbs +++ b/addons/rose/addon/components/rose/dropdown/index.hbs @@ -1,22 +1,23 @@
{{#if @icon}} - + {{/if}} - + {{@text}} {{#if @count}} {{@count}} @@ -26,27 +27,35 @@ {{#if @ignoreClickInside}} -
- {{yield (hash - link=(component "rose/dropdown/link" style=this.style) - button=(component "rose/dropdown/button" style=this.style) - item=(component "rose/anonymous" class="rose-dropdown-item") - separator=(component "rose/anonymous" tagName="hr" class="rose-dropdown-separator") - section=(component "rose/dropdown/section" style=this.style) - key-value=(component "rose/dropdown/key-value") - )}} +
+ {{yield + (hash + link=(component 'rose/dropdown/link' style=this.style) + button=(component 'rose/dropdown/button' style=this.style) + item=(component 'rose/anonymous' class='rose-dropdown-item') + separator=(component + 'rose/anonymous' tagName='hr' class='rose-dropdown-separator' + ) + section=(component 'rose/dropdown/section' style=this.style) + key-value=(component 'rose/dropdown/key-value') + ) + }}
{{else}} -
- {{yield (hash - link=(component "rose/dropdown/link" style=this.style) - button=(component "rose/dropdown/button" style=this.style) - item=(component "rose/anonymous" class="rose-dropdown-item") - separator=(component "rose/anonymous" tagName="hr" class="rose-dropdown-separator") - section=(component "rose/dropdown/section" style=this.style) - key-value=(component "rose/dropdown/key-value") - )}} +
+ {{yield + (hash + link=(component 'rose/dropdown/link' style=this.style) + button=(component 'rose/dropdown/button' style=this.style) + item=(component 'rose/anonymous' class='rose-dropdown-item') + separator=(component + 'rose/anonymous' tagName='hr' class='rose-dropdown-separator' + ) + section=(component 'rose/dropdown/section' style=this.style) + key-value=(component 'rose/dropdown/key-value') + ) + }}
{{/if}} -
+ \ No newline at end of file diff --git a/addons/rose/addon/components/rose/dropdown/key-value/index.hbs b/addons/rose/addon/components/rose/dropdown/key-value/index.hbs index a160906c5..b6494bb26 100644 --- a/addons/rose/addon/components/rose/dropdown/key-value/index.hbs +++ b/addons/rose/addon/components/rose/dropdown/key-value/index.hbs @@ -4,6 +4,6 @@
- {{yield to='value'}} + {{yield to='value'}}
- + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/dropdown/link/index.hbs b/addons/rose/addon/components/rose/dropdown/link/index.hbs index a7593fe8d..c3a8e0baf 100644 --- a/addons/rose/addon/components/rose/dropdown/link/index.hbs +++ b/addons/rose/addon/components/rose/dropdown/link/index.hbs @@ -10,7 +10,8 @@ @route={{@route}} @query={{@query}} @model={{@model}} - class="rose-dropdown-link {{if @style (concat "rose-dropdown-link-" @style)}}" + class='rose-dropdown-link + {{if @style (concat 'rose-dropdown-link-' @style)}}' > {{yield}} @@ -19,7 +20,8 @@ ...attributes @route={{@route}} @model={{@model}} - class="rose-dropdown-link {{if @style (concat "rose-dropdown-link-" @style)}}" + class='rose-dropdown-link + {{if @style (concat 'rose-dropdown-link-' @style)}}' > {{yield}} @@ -30,7 +32,8 @@ ...attributes @route={{@route}} @query={{@query}} - class="rose-dropdown-link {{if @style (concat "rose-dropdown-link-" @style)}}" + class='rose-dropdown-link + {{if @style (concat 'rose-dropdown-link-' @style)}}' > {{yield}} @@ -38,9 +41,10 @@ {{yield}} {{/if}} -{{/if}} +{{/if}} \ No newline at end of file diff --git a/addons/rose/addon/components/rose/dropdown/section/index.hbs b/addons/rose/addon/components/rose/dropdown/section/index.hbs index 10476dd8c..d5d700b6d 100644 --- a/addons/rose/addon/components/rose/dropdown/section/index.hbs +++ b/addons/rose/addon/components/rose/dropdown/section/index.hbs @@ -1,12 +1,15 @@ -
+
{{#if @title}}

{{@title}}

{{/if}} {{yield}} -
+
\ No newline at end of file diff --git a/addons/rose/addon/components/rose/footer/brand/index.hbs b/addons/rose/addon/components/rose/footer/brand/index.hbs index 27b91417f..0f8da67fd 100644 --- a/addons/rose/addon/components/rose/footer/brand/index.hbs +++ b/addons/rose/addon/components/rose/footer/brand/index.hbs @@ -1,12 +1,12 @@ {{#if @logo}} {{inline-svg @logo}} {{/if}} - + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/footer/copyright/index.hbs b/addons/rose/addon/components/rose/footer/copyright/index.hbs index 47e582dcb..9925a930f 100644 --- a/addons/rose/addon/components/rose/footer/copyright/index.hbs +++ b/addons/rose/addon/components/rose/footer/copyright/index.hbs @@ -1,11 +1,11 @@ - - + + © - + {{this.currentYear}} - + {{@text}} - + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/footer/index.hbs b/addons/rose/addon/components/rose/footer/index.hbs index bbe5ecc72..aa755b113 100644 --- a/addons/rose/addon/components/rose/footer/index.hbs +++ b/addons/rose/addon/components/rose/footer/index.hbs @@ -1,10 +1,9 @@ -
- {{yield (hash - nav=(component 'rose/footer/nav') - brand=(component 'rose/footer/brand') - text=(component "rose/anonymous" class="rose-footer-text") - )}} -
+
+ {{yield + (hash + nav=(component 'rose/footer/nav') + brand=(component 'rose/footer/brand') + text=(component 'rose/anonymous' class='rose-footer-text') + ) + }} +
\ No newline at end of file diff --git a/addons/rose/addon/components/rose/footer/nav/index.hbs b/addons/rose/addon/components/rose/footer/nav/index.hbs index c03ac88c9..7c3cd491d 100644 --- a/addons/rose/addon/components/rose/footer/nav/index.hbs +++ b/addons/rose/addon/components/rose/footer/nav/index.hbs @@ -1,5 +1,3 @@ -