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.

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

Icon updates #32

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
3974db3
icon swaps
zslabs Nov 25, 2020
9d0729f
updates
zslabs Nov 25, 2020
e60365f
inline
zslabs Nov 25, 2020
123bd84
Auto space button children with grid wrapper
zslabs Nov 25, 2020
07f1941
update svg paths
zslabs Nov 25, 2020
aa1127a
cleanup story
zslabs Nov 25, 2020
8de13a2
replace anchor with hash, update stories
zslabs Nov 25, 2020
b7caee8
Adding more icons
zslabs Nov 26, 2020
777e14d
add close circle outline
zslabs Nov 26, 2020
de5646c
more icons
zslabs Nov 30, 2020
0f1c0dd
move back table styles to reduce scope
zslabs Nov 30, 2020
10fa098
Merge branch 'master' of github.com:gremlin/chaoskit into feature/icons
zslabs Nov 30, 2020
019fbdd
svgr
zslabs Nov 30, 2020
6b6a494
Merge branch 'master' of github.com:gremlin/chaoskit into feature/icons
zslabs Dec 2, 2020
fe66a0a
cleanup icons
zslabs Dec 2, 2020
7bd529f
achive, copy-check
zslabs Dec 3, 2020
6a6e2cd
Merge branch 'master' of github.com:gremlin/chaoskit into feature/icons
zslabs Dec 9, 2020
c3332f6
Merge branch 'master' of github.com:gremlin/chaoskit into feature/icons
zslabs Dec 9, 2020
a7444be
lock
zslabs Dec 9, 2020
73dccdb
optical fixes, additional icons
zslabs Dec 9, 2020
e0be164
check circle, check square
zslabs Dec 9, 2020
2de03b3
Merge branch 'master' of github.com:gremlin/chaoskit into feature/icons
zslabs Dec 16, 2020
00ee9ec
update svg rendering + default stroke width
zslabs Dec 16, 2020
0e8d665
Merge branch 'master' of github.com:gremlin/chaoskit into feature/icons
zslabs Jan 11, 2021
cbb431d
update with master
zslabs Jan 11, 2021
fcd1d37
Merge branch 'master' of github.com:gremlin/chaoskit into feature/icons
zslabs Jan 29, 2021
6abf4cb
Update Dropdown.js
zslabs Jan 29, 2021
d77c491
Merge branch 'master' of github.com:gremlin/chaoskit into feature/icons
zslabs Feb 15, 2021
95ddb42
Merge branch 'master' of github.com:gremlin/chaoskit into feature/icons
zslabs Mar 15, 2021
43be420
updates icons
zslabs Mar 15, 2021
b6683a6
increase close icon for modal/offcanvas
zslabs Mar 15, 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: 0 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
node_modules/
.storybook/
!.eslintrc.js
29 changes: 27 additions & 2 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
const webpack = require('webpack')
const ESLintPlugin = require('eslint-webpack-plugin')

const prettierConfig = require('../prettier.config.js');

module.exports = {
stories: ['../src/components/*.stories.@(js|mdx)'],
addons: [
Expand All @@ -25,6 +23,33 @@ module.exports = {
require.resolve('@emotion/babel-preset-css-prop')
)

//
// SVGR
//

// Remove .svgs from default loader
const fileLoaderRule = config.module.rules.find(
(rule) => rule.test && rule.test.test('.svg')
)

fileLoaderRule.exclude = /\.svg$/

// Target svgs with fallback to file-loader
config.module.rules.push({
test: /\.svg$/,
enforce: 'pre',
use: [
{
loader: '@svgr/webpack',
options: {
ref: true,
icon: true,
},
},
'file-loader',
],
})

// Enable eslint
config.plugins.push(
new ESLintPlugin({
Expand Down
12 changes: 5 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,14 @@
"eslint-plugin-prettier": "3.3.1",
"eslint-plugin-react": "7.22.0",
"eslint-plugin-react-hooks": "4.2.0",
"framer-motion": "3.3.0",
"eslint-webpack-plugin": "2.5.2",
"fstream": "1.0.12",
"lodash": "4.17.21",
"parse5": "6.0.1",
"prettier": "2.2.1",
"prismjs": "1.23.0",
"react-textarea-autosize": "8.3.2",
"react-use": "17.2.1",
"recursive-readdir-sync": "1.0.6",
"rsvp": "4.8.5",
"svgo": "1.3.2",
"what-input": "5.2.10",
"zustand": "3.3.3"
},
Expand All @@ -54,6 +51,7 @@
"@storybook/addons": "6.1.21",
"@storybook/react": "6.1.21",
"@storybook/theming": "6.1.21",
"@svgr/webpack": "5.5.0",
"babel-eslint": "10.1.0",
"babel-loader": "8.2.2",
"formik": "2.2.6",
Expand All @@ -71,6 +69,7 @@
"@emotion/react": "11.1.5",
"@reach/portal": "0.13.2",
"@reach/tabs": "0.13.2",
"@svgr/webpack": ">=5.5.0",
"framer-motion": "3.10.2",
"react": ">=17.0.1",
"react-dom": ">=17.0.1"
Expand All @@ -79,9 +78,8 @@
"scripts": {
"version": "git pull --tags && git add -A",
"postversion": "git push --tags && git push",
"icons": "node utils/build-icons.js",
"build": "yarn && yarn run icons && build-storybook -c .storybook",
"develop": "yarn && yarn run icons && start-storybook -p 9001 -c .storybook",
"build": "yarn && build-storybook -c .storybook",
"develop": "yarn && start-storybook -p 9001 -c .storybook",
"test": "echo \"Error: no test specified\" && exit 1",
"lint": "eslint ./src ./utils",
"lint:fix": "eslint ./src ./utils --fix"
Expand Down
3 changes: 3 additions & 0 deletions src/assets/icons/adjustments.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 2 additions & 6 deletions src/assets/icons/alert-circle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icons/anchor.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icons/archive.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 2 additions & 5 deletions src/assets/icons/arrow-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 2 additions & 5 deletions src/assets/icons/arrow-left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 2 additions & 5 deletions src/assets/icons/arrow-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 2 additions & 5 deletions src/assets/icons/arrow-up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 1 addition & 3 deletions src/assets/icons/asterisk.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icons/ban.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icons/building.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icons/calendar.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icons/caret-double.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/assets/icons/caret-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/assets/icons/caret-left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/assets/icons/caret-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/assets/icons/caret-up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icons/chat.svg
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 src/assets/icons/check-circle.svg
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 src/assets/icons/check-square.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 1 addition & 3 deletions src/assets/icons/check.svg
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 src/assets/icons/close-circle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icons/close.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icons/code.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/icons/cog.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icons/collection.svg
3 changes: 3 additions & 0 deletions src/assets/icons/copy-check.svg
8 changes: 2 additions & 6 deletions src/assets/icons/copy.svg
1 change: 1 addition & 0 deletions src/assets/icons/delete.svg
3 changes: 3 additions & 0 deletions src/assets/icons/dots-horizontal.svg
3 changes: 3 additions & 0 deletions src/assets/icons/dots-vertical.svg
7 changes: 2 additions & 5 deletions src/assets/icons/download.svg
7 changes: 2 additions & 5 deletions src/assets/icons/email.svg
8 changes: 2 additions & 6 deletions src/assets/icons/external.svg
4 changes: 1 addition & 3 deletions src/assets/icons/facebook.svg
Loading