From f079ed15afae8edbf63ff7ed6d8f028aed4ae62a Mon Sep 17 00:00:00 2001
From: Zimo <peter.zimon@gmail.com>
Date: Wed, 9 May 2018 16:27:21 +0200
Subject: [PATCH] Koenig - Refine card menu and fix toolbar tick color

refs https://github.com/TryGhost/Ghost/issues/9505
- card menu style refinements
- fix tick color and adding appear animation to toolbar
- bump Spirit dependency
---
 .../addon/templates/components/koenig-card.hbs              | 2 +-
 .../addon/templates/components/koenig-plus-menu.hbs         | 2 +-
 .../addon/templates/components/koenig-slash-menu.hbs        | 2 +-
 ghost/admin/package.json                                    | 2 +-
 ghost/admin/yarn.lock                                       | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card.hbs b/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card.hbs
index 10f1cf675a..3192449695 100644
--- a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card.hbs
+++ b/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card.hbs
@@ -7,7 +7,7 @@
 {{yield}}
 
 {{#if toolbar}}
-    <ul data-toolbar="true" class="kg-action-bar bg-darkgrey-d1 inline-flex pa0 ma0 pl1 pr1 nl1 list br3 shadow-2 items-center absolute white sans-serif f8 fw6 tracked-2 anim-fast-bezier z-999 {{if showToolbar "" "o-0 drop-down"}}" style={{toolbarStyle}}>
+    <ul data-toolbar="true" class="kg-action-bar bg-darkgrey-d1 inline-flex pa0 ma0 pl1 pr1 nl1 list br3 shadow-2 items-center absolute white sans-serif f8 fw6 tracked-2 anim-fast-bezier z-999 {{if showToolbar "" "o-0 pop-down"}}" style={{toolbarStyle}}>
         {{#each toolbar.items as |item|}}
             {{#if item.divider}}
                 <li class="ma0 kg-action-bar-divider bg-darkgrey-d2 h5"></li>
diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-plus-menu.hbs b/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-plus-menu.hbs
index 05c50486b6..50e56bee3c 100644
--- a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-plus-menu.hbs
+++ b/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-plus-menu.hbs
@@ -1,5 +1,5 @@
 {{#if showButton}}
-    <button class="koenig-plus-menu-button flex justify-center items-center relative w9 h9 ba b--midgrey bg-white br-100 kg-blue-hover" {{action "openMenu"}}>{{svg-jar "plus" class="w4 h4 stroke-midgrey i-strokew--2"}}</button>
+    <button class="koenig-plus-menu-button flex justify-center items-center relative w9 h9 ba b--midlightgrey-l2 bg-white br-100 anim-normal" {{action "openMenu"}}>{{svg-jar "plus" class="w4 h4 stroke-middarkgrey i-strokew--2"}}</button>
 {{/if}}
 
 {{#if showMenu}}
diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-slash-menu.hbs b/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-slash-menu.hbs
index 9392170bef..0ada8fa935 100644
--- a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-slash-menu.hbs
+++ b/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-slash-menu.hbs
@@ -1,7 +1,7 @@
 {{#if showMenu}}
     <div class="koenig-cardmenu {{kg-style "cardmenu"}}">
         {{#each items as |item|}}
-            <div class="{{if item.selected "kg-blue-selected"}} {{kg-style "cardmenu-card"}}" {{action "itemClicked" item on="click"}} data-kg="cardmenu-card">
+            <div class="{{if item.selected "kg-cardmenu-card-selected"}} {{kg-style "cardmenu-card"}}" {{action "itemClicked" item on="click"}} data-kg="cardmenu-card">
                 <div class="{{kg-style "cardmenu-icon"}}">{{svg-jar item.icon class="w8 h8 stroke-midgrey"}}</div>
                 <div class="{{kg-style "cardmenu-label"}}">{{item.label}}</div>
             </div>
diff --git a/ghost/admin/package.json b/ghost/admin/package.json
index ec870d3363..30e97ef42a 100644
--- a/ghost/admin/package.json
+++ b/ghost/admin/package.json
@@ -97,7 +97,7 @@
     "eslint": "4.19.1",
     "eslint-plugin-ghost": "0.0.24",
     "fs-extra": "4.0.3",
-    "ghost-spirit": "0.0.17",
+    "ghost-spirit": "0.0.18",
     "glob": "7.1.2",
     "google-caja-bower": "https://github.com/acburdine/google-caja-bower#ghost",
     "grunt": "1.0.2",
diff --git a/ghost/admin/yarn.lock b/ghost/admin/yarn.lock
index cf5166248f..0ca55c7e14 100644
--- a/ghost/admin/yarn.lock
+++ b/ghost/admin/yarn.lock
@@ -5253,9 +5253,9 @@ ghost-ignition@^2.7.0:
     prettyjson "^1.1.3"
     uuid "^3.0.0"
 
-ghost-spirit@0.0.17:
-  version "0.0.17"
-  resolved "https://registry.yarnpkg.com/ghost-spirit/-/ghost-spirit-0.0.17.tgz#f03f94dc98ed89e614c239664dc4a2fec1049bec"
+ghost-spirit@0.0.18:
+  version "0.0.18"
+  resolved "https://registry.yarnpkg.com/ghost-spirit/-/ghost-spirit-0.0.18.tgz#51f15e3cfa28d91fe8fe363ccb15e3eaf234cbf9"
   dependencies:
     autoprefixer "8.2.0"
     bluebird "^3.4.6"