diff --git a/app/templates/editor.hbs b/app/templates/editor.hbs index a4c5554b2..3a36c70d8 100644 --- a/app/templates/editor.hbs +++ b/app/templates/editor.hbs @@ -5,17 +5,17 @@ navIsClosed=navIsClosed as |editor| }} -
+
{{#if ui.isFullScreen}} -
+
{{#link-to "posts" classNames="blue link fw4 flex items-center"}} {{svg-jar "arrow-left" class="w3 fill-blue mr1 nudge-right--2"}} Stories {{/link-to}}
{{/if}} -
+
{{gh-editor-post-status post=post @@ -32,7 +32,7 @@ {{#if infoMessage}}
-
+
{{svg-jar "idea" class="w7 h7 fill-blue"}}

{{infoMessage}} @@ -42,7 +42,7 @@

{{/if}} -
+
{{#unless post.isNew}} {{#if session.user.isContributor}} {{gh-task-button "Save" @@ -189,7 +189,7 @@ {{/if}} {{!-- end Koenig conditional --}} {{#if wordCount}} -
+
{{pluralize wordCount.wordCount "word"}} @@ -228,4 +228,4 @@ {{/liquid-wormhole}} {{/if}} -{{outlet}} \ No newline at end of file +{{outlet}} diff --git a/lib/koenig-editor/addon/components/koenig-card-code.js b/lib/koenig-editor/addon/components/koenig-card-code.js index c62b812e2..e31f2c1b8 100644 --- a/lib/koenig-editor/addon/components/koenig-card-code.js +++ b/lib/koenig-editor/addon/components/koenig-card-code.js @@ -36,8 +36,8 @@ export default Component.extend({ return { items: [{ buttonClass: 'fw4 flex items-center white', - icon: 'koenig/kg-edit-v2', - iconClass: 'stroke-white', + icon: 'koenig/kg-edit', + iconClass: 'fill-white', title: 'Edit', text: '', action: run.bind(this, this.editCard) diff --git a/lib/koenig-editor/addon/components/koenig-card-html.js b/lib/koenig-editor/addon/components/koenig-card-html.js index c67d69003..58456a041 100644 --- a/lib/koenig-editor/addon/components/koenig-card-html.js +++ b/lib/koenig-editor/addon/components/koenig-card-html.js @@ -35,8 +35,8 @@ export default Component.extend({ return { items: [{ buttonClass: 'fw4 flex items-center white', - icon: 'koenig/kg-edit-v2', - iconClass: 'stroke-white', + icon: 'koenig/kg-edit', + iconClass: 'fill-white', title: 'Edit', text: '', action: run.bind(this, this.editCard) diff --git a/lib/koenig-editor/addon/components/koenig-card-image.js b/lib/koenig-editor/addon/components/koenig-card-image.js index 2a8682a6b..63eebcb55 100644 --- a/lib/koenig-editor/addon/components/koenig-card-image.js +++ b/lib/koenig-editor/addon/components/koenig-card-image.js @@ -74,21 +74,21 @@ export default Component.extend({ items.push({ title: 'Regular', icon: 'koenig/kg-img-regular', - iconClass: `${!cardWidth ? 'stroke-blue-l2' : 'stroke-white'}`, + iconClass: `${!cardWidth ? 'fill-blue-l2' : 'fill-white'}`, action: run.bind(this, this._changeCardWidth, '') }); items.push({ title: 'Wide', icon: 'koenig/kg-img-wide', - iconClass: `${cardWidth === 'wide' ? 'stroke-blue-l2' : 'stroke-white'}`, + iconClass: `${cardWidth === 'wide' ? 'fill-blue-l2' : 'fill-white'}`, action: run.bind(this, this._changeCardWidth, 'wide') }); items.push({ title: 'Full', icon: 'koenig/kg-img-full', - iconClass: `${cardWidth === 'full' ? 'stroke-blue-l2' : 'stroke-white'}`, + iconClass: `${cardWidth === 'full' ? 'fill-blue-l2' : 'fill-white'}`, action: run.bind(this, this._changeCardWidth, 'full') }); @@ -97,7 +97,7 @@ export default Component.extend({ items.push({ title: 'Replace image', icon: 'koenig/kg-replace', - iconClass: '', + iconClass: 'fill-white', action: run.bind(this, this._triggerFileDialog) }); } diff --git a/lib/koenig-editor/addon/components/koenig-card-markdown.js b/lib/koenig-editor/addon/components/koenig-card-markdown.js index 680fc30ec..43d187fc3 100644 --- a/lib/koenig-editor/addon/components/koenig-card-markdown.js +++ b/lib/koenig-editor/addon/components/koenig-card-markdown.js @@ -48,8 +48,8 @@ export default Component.extend({ return { items: [{ buttonClass: 'fw4 flex items-center white', - icon: 'koenig/kg-edit-v2', - iconClass: 'stroke-white', + icon: 'koenig/kg-edit', + iconClass: 'fill-white', title: 'Edit', text: '', action: run.bind(this, this.editCard) diff --git a/lib/koenig-editor/addon/templates/components/koenig-card-image.hbs b/lib/koenig-editor/addon/templates/components/koenig-card-image.hbs index 9ef1ce0a1..b83bfb337 100644 --- a/lib/koenig-editor/addon/templates/components/koenig-card-image.hbs +++ b/lib/koenig-editor/addon/templates/components/koenig-card-image.hbs @@ -51,7 +51,7 @@ {{uploader.progressBar}} {{else if (not previewSrc payload.src)}} {{/if}} diff --git a/lib/koenig-editor/addon/templates/components/koenig-link-toolbar.hbs b/lib/koenig-editor/addon/templates/components/koenig-link-toolbar.hbs index 62579b138..a165b4c34 100644 --- a/lib/koenig-editor/addon/templates/components/koenig-link-toolbar.hbs +++ b/lib/koenig-editor/addon/templates/components/koenig-link-toolbar.hbs @@ -11,7 +11,7 @@ {{action "edit"}} > {{!-- TODO: get correct icon --}} - {{svg-jar "koenig/kg-thin-edit" class="stroke-white w4 h4 nudge-top--1"}} + {{svg-jar "koenig/kg-edit" class="fill-white w4 h4 nudge-top--1"}}
  • @@ -22,7 +22,7 @@ {{action "remove"}} > {{!-- TODO: get correct icon --}} - {{svg-jar "koenig/kg-thin-delete" class="stroke-white w4 h4 nudge-top--1"}} + {{svg-jar "koenig/kg-trash" class="fill-white w4 h4 nudge-top--1"}}
    • diff --git a/lib/koenig-editor/addon/templates/components/koenig-toolbar.hbs b/lib/koenig-editor/addon/templates/components/koenig-toolbar.hbs index debf0b366..c182e7a29 100644 --- a/lib/koenig-editor/addon/templates/components/koenig-toolbar.hbs +++ b/lib/koenig-editor/addon/templates/components/koenig-toolbar.hbs @@ -6,7 +6,7 @@ class="dib dim-lite link h10 w9 nudge-top--1" {{action "toggleMarkup" "strong"}} > - {{svg-jar "koenig/kg-bold" class=(concat (if activeMarkupTagNames.isStrong "stroke-blue-l2" "stroke-white") " w4 h4")}} + {{svg-jar "koenig/kg-bold" class=(concat (if activeMarkupTagNames.isStrong "fill-blue-l2" "fill-white") " w4 h4")}}
  • @@ -16,7 +16,7 @@ class="dib dim-lite link h10 w9 nudge-top--1" {{action "toggleMarkup" "em"}} > - {{svg-jar "koenig/kg-italic" class=(concat (if (or activeMarkupTagNames.isEm activeMarkupTagNames.isI) "stroke-blue-l2" "stroke-white") " w4 h4")}} + {{svg-jar "koenig/kg-italic" class=(concat (if (or activeMarkupTagNames.isEm activeMarkupTagNames.isI) "fill-blue-l2" "fill-white") " w4 h4")}}
  • @@ -26,7 +26,7 @@ class="dib dim-lite link h10 w9 nudge-top--1" {{action "toggleHeaderSection" "h1"}} > - {{svg-jar "koenig/kg-heading-1" class=(concat (if activeSectionTagNames.isH1 "stroke-blue-l2" "stroke-white") " w4 h4")}} + {{svg-jar "koenig/kg-heading-1" class=(concat (if activeSectionTagNames.isH1 "fill-blue-l2" "fill-white") " w4 h4")}}
  • @@ -36,7 +36,7 @@ class="dib dim-lite link h10 w9 nudge-top--1" {{action "toggleHeaderSection" "h2"}} > - {{svg-jar "koenig/kg-heading-2" class=(concat (if activeSectionTagNames.isH2 "stroke-blue-l2" "stroke-white") " w4 h4")}} + {{svg-jar "koenig/kg-heading-2" class=(concat (if activeSectionTagNames.isH2 "fill-blue-l2" "fill-white") " w4 h4")}}
    • @@ -49,7 +49,7 @@ class="dib dim-lite link h10 w9 nudge-top--1" {{action "toggleSection" "blockquote"}} > - {{svg-jar "koenig/kg-quote" class=(concat (if activeSectionTagNames.isBlockquote "stroke-blue-l2" "stroke-white") " w4 h4")}} + {{svg-jar "koenig/kg-quote" class=(concat (if activeSectionTagNames.isBlockquote "fill-blue-l2" "fill-white") " w4 h4")}}
  • @@ -59,7 +59,7 @@ class="dib dim-lite link h10 w9 nudge-top--1" {{action "editLink"}} > - {{svg-jar "koenig/kg-link" class=(concat (if activeMarkupTagNames.isA "stroke-blue-l2" "stroke-white") " w4 h4")}} + {{svg-jar "koenig/kg-link" class=(concat (if activeMarkupTagNames.isA "fill-blue-l2" "fill-white") " w4 h4")}}
    • diff --git a/lib/koenig-editor/public/icons/koenig/kg-bold.svg b/lib/koenig-editor/public/icons/koenig/kg-bold.svg index a4d029639..9b6b764d3 100644 --- a/lib/koenig-editor/public/icons/koenig/kg-bold.svg +++ b/lib/koenig-editor/public/icons/koenig/kg-bold.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/lib/koenig-editor/public/icons/koenig/kg-bullet-list.svg b/lib/koenig-editor/public/icons/koenig/kg-bullet-list.svg deleted file mode 100644 index 46e1d8486..000000000 --- a/lib/koenig-editor/public/icons/koenig/kg-bullet-list.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/lib/koenig-editor/public/icons/koenig/kg-edit-v2.svg b/lib/koenig-editor/public/icons/koenig/kg-edit-v2.svg deleted file mode 100644 index 082572327..000000000 --- a/lib/koenig-editor/public/icons/koenig/kg-edit-v2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/lib/koenig-editor/public/icons/koenig/kg-edit.svg b/lib/koenig-editor/public/icons/koenig/kg-edit.svg new file mode 100644 index 000000000..e24cd4d49 --- /dev/null +++ b/lib/koenig-editor/public/icons/koenig/kg-edit.svg @@ -0,0 +1 @@ + diff --git a/lib/koenig-editor/public/icons/koenig/kg-heading-1.svg b/lib/koenig-editor/public/icons/koenig/kg-heading-1.svg index 1c7c17651..b297fba1c 100644 --- a/lib/koenig-editor/public/icons/koenig/kg-heading-1.svg +++ b/lib/koenig-editor/public/icons/koenig/kg-heading-1.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/lib/koenig-editor/public/icons/koenig/kg-heading-2.svg b/lib/koenig-editor/public/icons/koenig/kg-heading-2.svg index 7316d81ef..d4887f50f 100644 --- a/lib/koenig-editor/public/icons/koenig/kg-heading-2.svg +++ b/lib/koenig-editor/public/icons/koenig/kg-heading-2.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/lib/koenig-editor/public/icons/koenig/kg-img-float.svg b/lib/koenig-editor/public/icons/koenig/kg-img-float.svg deleted file mode 100644 index 0512721dd..000000000 --- a/lib/koenig-editor/public/icons/koenig/kg-img-float.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/lib/koenig-editor/public/icons/koenig/kg-img-full.svg b/lib/koenig-editor/public/icons/koenig/kg-img-full.svg index ee6d5807d..5ebde9623 100644 --- a/lib/koenig-editor/public/icons/koenig/kg-img-full.svg +++ b/lib/koenig-editor/public/icons/koenig/kg-img-full.svg @@ -1,9 +1 @@ - - - kg-img-full - - - - - - + diff --git a/lib/koenig-editor/public/icons/koenig/kg-img-regular.svg b/lib/koenig-editor/public/icons/koenig/kg-img-regular.svg index 350545d77..d2aaecc24 100644 --- a/lib/koenig-editor/public/icons/koenig/kg-img-regular.svg +++ b/lib/koenig-editor/public/icons/koenig/kg-img-regular.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/lib/koenig-editor/public/icons/koenig/kg-img-wide.svg b/lib/koenig-editor/public/icons/koenig/kg-img-wide.svg index a11e074db..3a42971ae 100644 --- a/lib/koenig-editor/public/icons/koenig/kg-img-wide.svg +++ b/lib/koenig-editor/public/icons/koenig/kg-img-wide.svg @@ -1,9 +1 @@ - - - kg-img-full - - - - - - + diff --git a/lib/koenig-editor/public/icons/koenig/kg-italic.svg b/lib/koenig-editor/public/icons/koenig/kg-italic.svg index 71042af58..5cda492ee 100644 --- a/lib/koenig-editor/public/icons/koenig/kg-italic.svg +++ b/lib/koenig-editor/public/icons/koenig/kg-italic.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/lib/koenig-editor/public/icons/koenig/kg-link.svg b/lib/koenig-editor/public/icons/koenig/kg-link.svg index 7bb78f277..754dfb992 100644 --- a/lib/koenig-editor/public/icons/koenig/kg-link.svg +++ b/lib/koenig-editor/public/icons/koenig/kg-link.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/lib/koenig-editor/public/icons/koenig/kg-numbered-list.svg b/lib/koenig-editor/public/icons/koenig/kg-numbered-list.svg deleted file mode 100644 index 0444d88b6..000000000 --- a/lib/koenig-editor/public/icons/koenig/kg-numbered-list.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/lib/koenig-editor/public/icons/koenig/kg-quote.svg b/lib/koenig-editor/public/icons/koenig/kg-quote.svg index f4063e2fd..687cd7b76 100644 --- a/lib/koenig-editor/public/icons/koenig/kg-quote.svg +++ b/lib/koenig-editor/public/icons/koenig/kg-quote.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/lib/koenig-editor/public/icons/koenig/kg-replace.svg b/lib/koenig-editor/public/icons/koenig/kg-replace.svg index 1bce412a3..a018e0e32 100644 --- a/lib/koenig-editor/public/icons/koenig/kg-replace.svg +++ b/lib/koenig-editor/public/icons/koenig/kg-replace.svg @@ -1,11 +1 @@ - - - kg-replace - - - - - - - - + diff --git a/lib/koenig-editor/public/icons/koenig/kg-settings.svg b/lib/koenig-editor/public/icons/koenig/kg-settings.svg deleted file mode 100644 index de1e5556c..000000000 --- a/lib/koenig-editor/public/icons/koenig/kg-settings.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - kg-settings - - - - - - diff --git a/lib/koenig-editor/public/icons/koenig/kg-trash.svg b/lib/koenig-editor/public/icons/koenig/kg-trash.svg new file mode 100644 index 000000000..2c16a4fb2 --- /dev/null +++ b/lib/koenig-editor/public/icons/koenig/kg-trash.svg @@ -0,0 +1 @@ + diff --git a/package.json b/package.json index f13beceff..c6d8ea663 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "eslint": "4.19.1", "eslint-plugin-ghost": "0.0.25", "fs-extra": "4.0.3", - "ghost-spirit": "0.0.29", + "ghost-spirit": "0.0.30", "glob": "7.1.2", "google-caja-bower": "https://github.com/acburdine/google-caja-bower#ghost", "grunt": "1.0.3", diff --git a/yarn.lock b/yarn.lock index dd0e2af25..58360918b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5241,9 +5241,9 @@ ghost-ignition@^2.7.0: prettyjson "^1.1.3" uuid "^3.0.0" -ghost-spirit@0.0.29: - version "0.0.29" - resolved "https://registry.yarnpkg.com/ghost-spirit/-/ghost-spirit-0.0.29.tgz#9a3aaf412eb00233ad19b699dc82279f44ed45c6" +ghost-spirit@0.0.30: + version "0.0.30" + resolved "https://registry.yarnpkg.com/ghost-spirit/-/ghost-spirit-0.0.30.tgz#73f520363fbb0a4ac63483072bec9f01cc84d3a7" dependencies: autoprefixer "8.2.0" bluebird "^3.4.6"