diff --git a/ghost/admin/app/styles/spirit/_koenig.css b/ghost/admin/app/styles/spirit/_koenig.css index 72f3d94468..2bf66afb8f 100644 --- a/ghost/admin/app/styles/spirit/_koenig.css +++ b/ghost/admin/app/styles/spirit/_koenig.css @@ -856,8 +856,9 @@ /* Chrome has a bug with its scrollbars on this element which has been reported here: https://bugs.chromium.org/p/chromium/issues/detail?id=697381 */ .koenig-cardmenu { - width: 272px; - max-height: 580px; + width: 312px; + max-height: 440px; + padding-top: 0; background-clip: padding-box; z-index: 9999999; /* have to compete with codemirror */ left: -16px; @@ -895,7 +896,6 @@ box-sizing: border-box; border: 1px solid var(--whitegrey); background: var(--white); - border-radius: 5px; } .koenig-editor__editor .kg-bookmark-container { diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-menu-content.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-menu-content.hbs index fad5e9ca7a..1390ab3f2c 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-menu-content.hbs +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-menu-content.hbs @@ -1,13 +1,13 @@ {{#each @itemSections as |section sectionIndex|}} {{#if section.items}} {{#if (or (not section.developerExperiment) (enable-developer-experiments))}} -
+
{{section.title}}
{{#each section.items as |item|}} {{#if (or (not item.developerExperiment) (enable-developer-experiments))}} {{/if}} diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-plus-menu.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-plus-menu.js index 987e191f2b..e42839ee01 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-plus-menu.js +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-plus-menu.js @@ -50,7 +50,7 @@ export default Component.extend({ snippets.forEach((snippet) => { snippetsSection.items.push({ label: snippet.name, - icon: 'koenig/kg-card-type-bookmark', + icon: 'koenig/kg-card-type-snippet-text', type: 'snippet', matches: [snippet.name.toLowerCase()] }); diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-slash-menu.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-slash-menu.js index 17e7edb1ee..2e34e5f675 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-slash-menu.js +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-slash-menu.js @@ -69,7 +69,7 @@ export default class KoenigSlashMenuComponent extends Component { snippets.forEach((snippet) => { snippetsSection.items.push({ label: snippet.name, - icon: 'koenig/kg-card-type-bookmark', + icon: 'koenig/kg-card-type-snippet-text', type: 'snippet', matches: [snippet.name.toLowerCase()] }); diff --git a/ghost/admin/lib/koenig-editor/addon/helpers/kg-style.js b/ghost/admin/lib/koenig-editor/addon/helpers/kg-style.js index 0fecba723a..803600eb75 100644 --- a/ghost/admin/lib/koenig-editor/addon/helpers/kg-style.js +++ b/ghost/admin/lib/koenig-editor/addon/helpers/kg-style.js @@ -9,11 +9,11 @@ export function kgStyle([style], options) { switch (style) { // Card menu case 'cardmenu': - cssClass = 'koenig-cardmenu absolute top-0 flex flex-column mt0 mr0 mb3 ml0 pa4 overflow-y-auto bg-white br3 shadow-3 ttn f7 normal'; + cssClass = 'koenig-cardmenu absolute top-0 flex flex-column mt0 mr0 mb3 ml0 pb4 overflow-y-auto bg-white br3 shadow-3 ttn f7 normal'; break; case 'cardmenu-card': - cssClass = 'flex items-center h19 br3 midgrey ba b--transparent hover-darkgrey kg-cardmenu-card-hover pt1 anim-fast'; + cssClass = 'flex items-center middarkgrey ba b--transparent hover-darkgrey kg-cardmenu-card-hover pl4 pr4 pt2 pb2 anim-fast'; break; case 'cardmenu-icon': @@ -21,7 +21,7 @@ export function kgStyle([style], options) { break; case 'cardmenu-label': - cssClass = 'f-supersmall tracked-1 fw3 ma0 ml2'; + cssClass = 'f-7 tracked-1 fw4 ma0 ml4'; break; // Container cards diff --git a/ghost/admin/lib/koenig-editor/public/icons/koenig/kg-card-type-snippet-block-hover.svg b/ghost/admin/lib/koenig-editor/public/icons/koenig/kg-card-type-snippet-block-hover.svg new file mode 100644 index 0000000000..392fd1bad9 --- /dev/null +++ b/ghost/admin/lib/koenig-editor/public/icons/koenig/kg-card-type-snippet-block-hover.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/ghost/admin/lib/koenig-editor/public/icons/koenig/kg-card-type-snippet-block.svg b/ghost/admin/lib/koenig-editor/public/icons/koenig/kg-card-type-snippet-block.svg new file mode 100644 index 0000000000..082d563c06 --- /dev/null +++ b/ghost/admin/lib/koenig-editor/public/icons/koenig/kg-card-type-snippet-block.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/ghost/admin/lib/koenig-editor/public/icons/koenig/kg-card-type-snippet-combination-hover.svg b/ghost/admin/lib/koenig-editor/public/icons/koenig/kg-card-type-snippet-combination-hover.svg new file mode 100644 index 0000000000..05dd945da3 --- /dev/null +++ b/ghost/admin/lib/koenig-editor/public/icons/koenig/kg-card-type-snippet-combination-hover.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/ghost/admin/lib/koenig-editor/public/icons/koenig/kg-card-type-snippet-combination.svg b/ghost/admin/lib/koenig-editor/public/icons/koenig/kg-card-type-snippet-combination.svg new file mode 100644 index 0000000000..267cc0b732 --- /dev/null +++ b/ghost/admin/lib/koenig-editor/public/icons/koenig/kg-card-type-snippet-combination.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/ghost/admin/lib/koenig-editor/public/icons/koenig/kg-card-type-snippet-text-hover.svg b/ghost/admin/lib/koenig-editor/public/icons/koenig/kg-card-type-snippet-text-hover.svg new file mode 100644 index 0000000000..9aa8ce477c --- /dev/null +++ b/ghost/admin/lib/koenig-editor/public/icons/koenig/kg-card-type-snippet-text-hover.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/ghost/admin/lib/koenig-editor/public/icons/koenig/kg-card-type-snippet-text.svg b/ghost/admin/lib/koenig-editor/public/icons/koenig/kg-card-type-snippet-text.svg new file mode 100644 index 0000000000..2b9d305c57 --- /dev/null +++ b/ghost/admin/lib/koenig-editor/public/icons/koenig/kg-card-type-snippet-text.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file