From 30c27155d390c495d4d5dc0cca941661291dafd5 Mon Sep 17 00:00:00 2001 From: Jacob Pierce Date: Tue, 22 Sep 2020 06:30:25 -0700 Subject: [PATCH 1/7] adds `add` icon `add_circle_outline` --- lib/KIcon/iconDefinitions.js | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/KIcon/iconDefinitions.js b/lib/KIcon/iconDefinitions.js index e3c404892..17e7027cc 100644 --- a/lib/KIcon/iconDefinitions.js +++ b/lib/KIcon/iconDefinitions.js @@ -242,6 +242,7 @@ const KolibriIcons = { rtlFlip: true, }, systemUpdate: { icon: require('./precompiled-icons/material-icons/build/baseline.vue').default }, + add: { icon: require('./precompiled-icons/material-icons/add_circle_outline/baseline.vue').default }, remove: { icon: require('./precompiled-icons/mdi/minus-circle-outline.vue').default }, emptyTopic: { icon: require('./precompiled-icons/material-icons/folder_open/baseline.vue').default, From db21de49aa02ae2f21e8c436adff30bcda82efc5 Mon Sep 17 00:00:00 2001 From: Jacob Pierce Date: Tue, 22 Sep 2020 08:49:11 -0700 Subject: [PATCH 2/7] adds `email` icon mail_outline --- lib/KIcon/iconDefinitions.js | 1 + lib/buttons-and-links/KIconButton.vue | 1 + yarn.lock | 7 +------ 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/KIcon/iconDefinitions.js b/lib/KIcon/iconDefinitions.js index 17e7027cc..446a91cd9 100644 --- a/lib/KIcon/iconDefinitions.js +++ b/lib/KIcon/iconDefinitions.js @@ -276,6 +276,7 @@ const KolibriIcons = { collapseAll: { icon: require('./precompiled-icons/mdi/collapse-all.vue').default }, dragHorizontal: { icon: require('./precompiled-icons/le/drag_horizontal.vue').default }, classes: { icon: require('./precompiled-icons/le/class.vue').default }, + email: { icon: require('./precompiled-icons/material-icons/mail_outline/baseline.vue').default }, }; export { KolibriIcons }; diff --git a/lib/buttons-and-links/KIconButton.vue b/lib/buttons-and-links/KIconButton.vue index dd3eb698b..c35e58ba5 100644 --- a/lib/buttons-and-links/KIconButton.vue +++ b/lib/buttons-and-links/KIconButton.vue @@ -13,6 +13,7 @@ v-if="tooltip" open-on="hover" position="bottom" + style="z-index: 24;" > {{ tooltip }} diff --git a/yarn.lock b/yarn.lock index 04003fff2..5a6639cad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3930,12 +3930,7 @@ caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001027.tgz#45dce6c61128324c4534e18ceff6e58e8de76694" integrity sha512-Ublzr9IN2X91lTvJzehRUlK+hREae1Hi+0TIh7rH5fAcsuPWycwBAszhRGF22gf5xbDXXUdYQ6fSfPSQEqQhkw== -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001016, caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001023: - version "1.0.30001122" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001122.tgz" - integrity sha512-pxjw28CThdrqfz06nJkpAc5SXM404TXB/h5f4UJX+rrXJKE/1bu/KAILc2AY+O6cQIFtRjV9qOR2vaEp9LDGUA== - -caniuse-lite@^1.0.30001043: +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001016, caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001023, caniuse-lite@^1.0.30001043: version "1.0.30001122" resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001122.tgz" integrity sha512-pxjw28CThdrqfz06nJkpAc5SXM404TXB/h5f4UJX+rrXJKE/1bu/KAILc2AY+O6cQIFtRjV9qOR2vaEp9LDGUA== From 6b98c03dddbb23170e98d7d11afa942e36be2bd8 Mon Sep 17 00:00:00 2001 From: Jacob Pierce Date: Tue, 22 Sep 2020 08:54:46 -0700 Subject: [PATCH 3/7] useful errors on missing icons --- lib/KIcon/index.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/KIcon/index.vue b/lib/KIcon/index.vue index 0895ea2b8..e063616b7 100644 --- a/lib/KIcon/index.vue +++ b/lib/KIcon/index.vue @@ -23,7 +23,12 @@ type: String, required: true, validator(value) { - return Object.keys(KolibriIcons).includes(value); + if(Object.keys(KolibriIcons).includes(value)) { + return true; + } else { + console.error(`KIcon: No icon defined for token: ${value}`); + return false; + } }, }, /** From ac4e5f60777e224d06209b55b2ff49cf61b65524 Mon Sep 17 00:00:00 2001 From: Jacob Pierce Date: Tue, 22 Sep 2020 09:14:20 -0700 Subject: [PATCH 4/7] bump to 0.2.2-beta --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b32531687..253558510 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "kolibri-design-system", - "version": "0.2.1", + "version": "0.2.2-beta", "private": false, "description": "The Kolibri Design System defines common design patterns and code for use in Kolibri applications", "license": "MIT", From dd4c43f3e70c3b35990806390c3d6806cba31089 Mon Sep 17 00:00:00 2001 From: Jacob Pierce Date: Tue, 22 Sep 2020 09:20:15 -0700 Subject: [PATCH 5/7] adds `sidebar` icon vertical_split --- lib/KIcon/iconDefinitions.js | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/KIcon/iconDefinitions.js b/lib/KIcon/iconDefinitions.js index 446a91cd9..395cc7b27 100644 --- a/lib/KIcon/iconDefinitions.js +++ b/lib/KIcon/iconDefinitions.js @@ -277,6 +277,7 @@ const KolibriIcons = { dragHorizontal: { icon: require('./precompiled-icons/le/drag_horizontal.vue').default }, classes: { icon: require('./precompiled-icons/le/class.vue').default }, email: { icon: require('./precompiled-icons/material-icons/mail_outline/baseline.vue').default }, + sidebar: { icon: require('./precompiled-icons/material-icons/vertical_split/baseline.vue').default }, }; export { KolibriIcons }; From 78ee92257bb6369e708e9e9ed9f0f0ca25438bc5 Mon Sep 17 00:00:00 2001 From: Jacob Pierce Date: Tue, 22 Sep 2020 14:47:38 -0700 Subject: [PATCH 6/7] lint --- lib/KIcon/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/KIcon/index.vue b/lib/KIcon/index.vue index e063616b7..3834435ea 100644 --- a/lib/KIcon/index.vue +++ b/lib/KIcon/index.vue @@ -26,6 +26,7 @@ if(Object.keys(KolibriIcons).includes(value)) { return true; } else { + /* eslint-disable-next-line no-console */ console.error(`KIcon: No icon defined for token: ${value}`); return false; } From 10e8c968882c4d0b7890e5365c421f68e7460c86 Mon Sep 17 00:00:00 2001 From: Jacob Pierce Date: Tue, 22 Sep 2020 14:50:44 -0700 Subject: [PATCH 7/7] morelint --- lib/KIcon/iconDefinitions.js | 8 ++++++-- lib/KIcon/index.vue | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/KIcon/iconDefinitions.js b/lib/KIcon/iconDefinitions.js index 395cc7b27..0f474c417 100644 --- a/lib/KIcon/iconDefinitions.js +++ b/lib/KIcon/iconDefinitions.js @@ -242,7 +242,9 @@ const KolibriIcons = { rtlFlip: true, }, systemUpdate: { icon: require('./precompiled-icons/material-icons/build/baseline.vue').default }, - add: { icon: require('./precompiled-icons/material-icons/add_circle_outline/baseline.vue').default }, + add: { + icon: require('./precompiled-icons/material-icons/add_circle_outline/baseline.vue').default, + }, remove: { icon: require('./precompiled-icons/mdi/minus-circle-outline.vue').default }, emptyTopic: { icon: require('./precompiled-icons/material-icons/folder_open/baseline.vue').default, @@ -277,7 +279,9 @@ const KolibriIcons = { dragHorizontal: { icon: require('./precompiled-icons/le/drag_horizontal.vue').default }, classes: { icon: require('./precompiled-icons/le/class.vue').default }, email: { icon: require('./precompiled-icons/material-icons/mail_outline/baseline.vue').default }, - sidebar: { icon: require('./precompiled-icons/material-icons/vertical_split/baseline.vue').default }, + sidebar: { + icon: require('./precompiled-icons/material-icons/vertical_split/baseline.vue').default, + }, }; export { KolibriIcons }; diff --git a/lib/KIcon/index.vue b/lib/KIcon/index.vue index 3834435ea..dc6eefb4a 100644 --- a/lib/KIcon/index.vue +++ b/lib/KIcon/index.vue @@ -23,7 +23,7 @@ type: String, required: true, validator(value) { - if(Object.keys(KolibriIcons).includes(value)) { + if (Object.keys(KolibriIcons).includes(value)) { return true; } else { /* eslint-disable-next-line no-console */