Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Points icons #204

Merged
merged 3 commits into from
Apr 5, 2021
Merged

Points icons #204

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aef2165
Add leaf icons, compile them, update icon defs and rst replacements
nucleogenesis Mar 23, 2021
ef0b805
bump version - mostly to get checks to pass
nucleogenesis Mar 23, 2021
47bbaa9
inctive to inactive
nucleogenesis Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions custom-icons/pointsLeafActive.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions custom-icons/pointsLeafInactive.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 11 additions & 9 deletions docs/rstIconReplacements.txt
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions lib/KIcon/iconDefinitions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,16 @@ const KolibriIcons = {
},
collapseAll: { icon: require('./precompiled-icons/mdi/collapse-all.vue').default },
dragHorizontal: { icon: require('./precompiled-icons/le/drag_horizontal.vue').default },
// Setting a color for the points* icons - they don't use the color for their fill, but this ensures they're
// displayed alongside other icons with a defaultColor
pointsActive: {
icon: require('./precompiled-icons/le/pointsLeafActive.vue').default,
defaultColor: themeTokens().text,
},
pointsInctive: {
icon: require('./precompiled-icons/le/pointsLeafInactive.vue').default,
defaultColor: themeTokens().text,
},
classes: { icon: require('./precompiled-icons/le/class.vue').default },
email: { icon: require('./precompiled-icons/material-icons/mail_outline/baseline.vue').default },
sidebar: {
Expand Down
12 changes: 12 additions & 0 deletions lib/KIcon/precompiled-icons/le/pointsLeafActive.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<template>

<svg role="presentation" focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="270.8 117.7 84.7 84.8"><path fill="#83759E" d="M292.3 178.4l-21.5 13 11.2 11.1 13.2-21.2z"/><path fill="#9FD29D" d="M334.5 138.9l20.5-20.5c-.9-.9-7.2-.9-15.9.2l-4.6 20.3z"/><path fill="#BADBC4" d="M332.7 119.5c2.2-.3 4.4-.6 6.3-.9l-2.8 12.5-3.5-11.6z"/><path fill="#7CB6A2" d="M316.3 157l6.5-6.5-8.7-26.8c-6.9 2-13.9 4.7-19.5 7.9l21.7 25.4z"/><path fill="#717799" d="M277.9 152.6c.5-2.2 1.4-4.4 2.4-6.3l27.1 19.5-1.9 2.2-27.6-15.4z"/><path fill="#74658E" d="M305.3 167.9l-17.6 17.6c-9.1-9.1-12.3-21.9-9.8-32.9l27.4 15.3z"/><path fill="#749BB5" d="M307.5 165.9l8.9-8.9-6.3-7.4-26-9.4c-1.6 1.9-2.8 4.1-3.7 6.1l27.1 19.6z"/><path fill="#8FD4DC" d="M295.2 144.3l-11.2-4.1c.6-.8 1.2-1.6 1.9-2.2.8-.8 1.7-1.7 2.8-2.5l6.5 8.8z"/><path fill="#6F93A2" d="M288.8 135.5c1.7-1.4 3.6-2.5 5.8-3.8l15.4 18-14.8-5.4-6.4-8.8z"/><path fill="#5CB28F" d="M322.8 150.6l1.9-1.9-6.8-26c-1.3.3-2.5.6-3.8 1.1l8.7 26.8z"/><path fill="#8CBF94" d="M317.9 122.7c5-1.4 10.1-2.4 14.8-3.2l3.5 11.6-1.7 7.8-9.9 9.9-6.7-26.1z"/><path fill="#70B798" d="M351.6 151.2c1.6-6.8 2.7-13.4 3.3-18.7l-18.1 4.1-9.6 9.6 10.4 6.6 14-1.6z"/><path fill="#78CABC" d="M351.6 151.2c-.6 2.8-1.4 5.8-2.4 8.8l-11.7-7.2 14.1-1.6z"/><path fill="#5D7783" d="M313.5 196.2c5.7 0 11.2-1.6 16.1-4.6L317.3 156l-6.8 6.6-6.6 14.5 9.6 19.1z"/><path fill="#736586" d="M313.5 196.2c-5.5 0-11.3-1.3-16.5-3.9l6.9-15.1 9.6 19z"/><path fill="#9794B7" d="M310.5 162.7l-22.8 22.8c2.8 2.8 6 5 9.3 6.8l13.5-29.6z"/><path fill="#457584" d="M334.1 164.9l9.5 10.2c-2.4 4.9-5 9.1-8.2 12.3-.9.9-1.9 1.7-2.8 2.5l1.5-25z"/><path fill="#527D8E" d="M332.6 189.8c-.9.8-1.9 1.4-3 2L317.3 156l4.4-4.4 12.4 13.2-1.5 25z"/><path fill="#619986" d="M343.6 175.1c2.2-4.6 4.1-9.8 5.7-15.1l-22-13.9-5.5 5.5 21.8 23.5"/><path fill="#80C1A8" d="M338.4 135l16.5-16.5c.6.6.8 4.7.3 10.9l-16.8 5.6z"/><path fill="#83CCC0" d="M336.8 136.6l18.1-4.1c.2-1.1.2-2.2.3-3.2l-16.9 5.7-1.5 1.6"/></svg>

</template>


<script>

export default {"name":"icon-da7e76a39da32c9e20f28df2f93c6707"}

</script>
12 changes: 12 additions & 0 deletions lib/KIcon/precompiled-icons/le/pointsLeafInactive.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<template>

<svg role="presentation" focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="363.6 113 93.6 93.5"><path fill="#AAA" d="M455 115c-6.5-6.5-60.6 3.9-76.1 19.4-12.6 12.6-13.5 33.7-2.4 49.3l-12.9 9.6 13.2 13.2 9.9-12.8c16.1 11.7 36.5 10.1 49-2.5 15.9-16.1 26.2-69.3 19.3-76.2z"/></svg>

</template>


<script>

export default {"name":"icon-8c800a6d2a74a3997caa681d5eb90677"}

</script>
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kolibri-design-system",
"version": "0.2.2-beta4",
"version": "0.2.2-beta5",
"private": false,
"description": "The Kolibri Design System defines common design patterns and code for use in Kolibri applications",
"license": "MIT",
Expand Down