diff --git a/packages/plugin-theme/package.json b/packages/plugin-theme/package.json index 7d3d95a28bf..6cbf73fd29a 100644 --- a/packages/plugin-theme/package.json +++ b/packages/plugin-theme/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/plugin-theme", - "version": "0.14.0", + "version": "0.16.0", "description": "A freesewing plugin that provides a default theme", "author": "Joost De Cock (https://github.com/joostdecock)", "license": "MIT", @@ -26,7 +26,10 @@ "minor": "npm version minor -m ':bookmark: v%s' && npm run build", "major": "npm version major -m ':bookmark: v%s' && npm run build", "precommit": "npm run pretty && lint-staged", - "css": "uglifycss src/lib/base.css > src/lib/base.min.css && echo 'export default `'> src/lib/base.css.js && cat src/lib/base.min.css >> src/lib/base.css.js && echo '`;' >> src/lib/base.css.js", + "cssDraft": "uglifycss src/lib/draft.css > src/lib/draft.min.css && echo 'export default `'> src/lib/draft.css.js && cat src/lib/draft.min.css >> src/lib/draft.css.js && echo '`;' >> src/lib/draft.css.js", + "cssSample": "uglifycss src/lib/sample.css > src/lib/sample.min.css && echo 'export default `'> src/lib/sample.css.js && cat src/lib/sample.min.css >> src/lib/sample.css.js && echo '`;' >> src/lib/sample.css.js", + "cssPaperless": "uglifycss src/lib/paperless.css > src/lib/paperless.min.css && echo 'export default `'> src/lib/paperless.css.js && cat src/lib/paperless.min.css >> src/lib/paperless.css.js && echo '`;' >> src/lib/paperless.css.js", + "css": "npm run cssDraft && npm run cssSample && npm run cssPaperless", "test": "nyc mocha --require @babel/register tests/*.test.js", "report": "nyc report --reporter=html mocha --require @babel/register tests/*.test.js", "coverage": "nyc npm test && nyc report --reporter=text-lcov > coverage.lcov && ./node_modules/.bin/codecov", diff --git a/packages/plugin-theme/src/lib/base.css b/packages/plugin-theme/src/lib/draft.css similarity index 76% rename from packages/plugin-theme/src/lib/base.css rename to packages/plugin-theme/src/lib/draft.css index af30390037d..0ebd94af9af 100644 --- a/packages/plugin-theme/src/lib/base.css +++ b/packages/plugin-theme/src/lib/draft.css @@ -89,33 +89,3 @@ text{ .center{ text-anchor:middle; } .right{ text-anchor:end; } - -/* Paperless grid */ -path.grid { - fill: none; - stroke: #555; - stroke-width: 0.3; -} -path.gridline { - stroke: #555; - stroke-width: 0.2; -} -path.gridline-lg { - stroke: #777; - stroke-width: 0.2; - stroke-dasharray: 1.5,1.5; -} -path.gridline-sm { - stroke: #999; - stroke-width: 0.1; -} -path.gridline-xs { - stroke: #999; - stroke-width: 0.1; - stroke-dasharray: 0.5,0.5; -} -path.gridbox{ fill: url(#grid); } - -/* Sample classes */ -path.sample {stroke-width: 0.75} -path.sample-focus {stroke-width: 1.5; fill: rgba(0,0,0,0.1)} diff --git a/packages/plugin-theme/src/lib/base.css.js b/packages/plugin-theme/src/lib/draft.css.js similarity index 77% rename from packages/plugin-theme/src/lib/base.css.js rename to packages/plugin-theme/src/lib/draft.css.js index e0c76bc7437..010578f7e6e 100644 --- a/packages/plugin-theme/src/lib/base.css.js +++ b/packages/plugin-theme/src/lib/draft.css.js @@ -1,3 +1,3 @@ export default ` -path,circle,rect{fill:none;stroke:none}path,circle{stroke:#000;stroke-opacity:1;stroke-width:.3;stroke-linecap:round;stroke-linejoin:round}.fabric{stroke-width:.6;stroke:#212121}.lining{stroke-width:.6;stroke:#ff5b77}.interfacing{stroke-width:.6;stroke:#64b5f6}.canvas{stroke-width:.6;stroke:#ff9000}.various{stroke-width:.6;stroke:#4caf50}.note{stroke-width:.4;stroke:#dd60dd}.mark{stroke-width:.4;stroke:blue}.contrast{stroke-width:.8;stroke:red}.stroke-xs{stroke-width:.1}.stroke-sm{stroke-width:.2}.stroke-lg{stroke-width:.6}.stroke-xl{stroke-width:1}.stroke-xxl{stroke-width:2}.sa{stroke-dasharray:.4,0.8}.help{stroke-width:.2;stroke-dasharray:15,1.5,1,1.5}.dotted{stroke-dasharray:.4,0.8}.dashed{stroke-dasharray:1,1.5}.lashed{stroke-dasharray:6,6}.hidden{stroke:none;fill:none}.fill-fabric{fill:#212121}.fill-lining{fill:#ff5b77}.fill-interfacing{fill:#64b5f6}.fill-canvas{fill:#ff9000}.fill-various{fill:#4caf50}.fill-note{fill:#dd69dd}.fill-mark{fill:blue}.fill-contrast{fill:red}text{font-size:5px;font-family:-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;fill:#000;text-anchor:start;font-weight:200;dominant-baseline:ideographic}.text-xs{font-size:3px}.text-sm{font-size:4px}.text-lg{font-size:7px}.text-xl{font-size:9px}.text-xxl{font-size:12px}.center{text-anchor:middle}.right{text-anchor:end}path.grid{fill:none;stroke:#555;stroke-width:.3}path.gridline{stroke:#555;stroke-width:.2}path.gridline-lg{stroke:#777;stroke-width:.2;stroke-dasharray:1.5,1.5}path.gridline-sm{stroke:#999;stroke-width:.1}path.gridline-xs{stroke:#999;stroke-width:.1;stroke-dasharray:.5,0.5}path.gridbox{fill:url(#grid)}path.sample{stroke-width:.75}path.sample-focus{stroke-width:1.5;fill:rgba(0,0,0,0.1)} +path,circle,rect{fill:none;stroke:none}path,circle{stroke:#000;stroke-opacity:1;stroke-width:.3;stroke-linecap:round;stroke-linejoin:round}.fabric{stroke-width:.6;stroke:#212121}.lining{stroke-width:.6;stroke:#ff5b77}.interfacing{stroke-width:.6;stroke:#64b5f6}.canvas{stroke-width:.6;stroke:#ff9000}.various{stroke-width:.6;stroke:#4caf50}.note{stroke-width:.4;stroke:#dd60dd}.mark{stroke-width:.4;stroke:blue}.contrast{stroke-width:.8;stroke:red}.stroke-xs{stroke-width:.1}.stroke-sm{stroke-width:.2}.stroke-lg{stroke-width:.6}.stroke-xl{stroke-width:1}.stroke-xxl{stroke-width:2}.sa{stroke-dasharray:.4,0.8}.help{stroke-width:.2;stroke-dasharray:15,1.5,1,1.5}.dotted{stroke-dasharray:.4,0.8}.dashed{stroke-dasharray:1,1.5}.lashed{stroke-dasharray:6,6}.hidden{stroke:none;fill:none}.fill-fabric{fill:#212121}.fill-lining{fill:#ff5b77}.fill-interfacing{fill:#64b5f6}.fill-canvas{fill:#ff9000}.fill-various{fill:#4caf50}.fill-note{fill:#dd69dd}.fill-mark{fill:blue}.fill-contrast{fill:red}text{font-size:5px;font-family:-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;fill:#000;text-anchor:start;font-weight:200;dominant-baseline:ideographic}.text-xs{font-size:3px}.text-sm{font-size:4px}.text-lg{font-size:7px}.text-xl{font-size:9px}.text-xxl{font-size:12px}.center{text-anchor:middle}.right{text-anchor:end} `; diff --git a/packages/plugin-theme/src/lib/base.min.css b/packages/plugin-theme/src/lib/draft.min.css similarity index 77% rename from packages/plugin-theme/src/lib/base.min.css rename to packages/plugin-theme/src/lib/draft.min.css index dfeb8553418..eaaa12c0ac1 100644 --- a/packages/plugin-theme/src/lib/base.min.css +++ b/packages/plugin-theme/src/lib/draft.min.css @@ -1 +1 @@ -path,circle,rect{fill:none;stroke:none}path,circle{stroke:#000;stroke-opacity:1;stroke-width:.3;stroke-linecap:round;stroke-linejoin:round}.fabric{stroke-width:.6;stroke:#212121}.lining{stroke-width:.6;stroke:#ff5b77}.interfacing{stroke-width:.6;stroke:#64b5f6}.canvas{stroke-width:.6;stroke:#ff9000}.various{stroke-width:.6;stroke:#4caf50}.note{stroke-width:.4;stroke:#dd60dd}.mark{stroke-width:.4;stroke:blue}.contrast{stroke-width:.8;stroke:red}.stroke-xs{stroke-width:.1}.stroke-sm{stroke-width:.2}.stroke-lg{stroke-width:.6}.stroke-xl{stroke-width:1}.stroke-xxl{stroke-width:2}.sa{stroke-dasharray:.4,0.8}.help{stroke-width:.2;stroke-dasharray:15,1.5,1,1.5}.dotted{stroke-dasharray:.4,0.8}.dashed{stroke-dasharray:1,1.5}.lashed{stroke-dasharray:6,6}.hidden{stroke:none;fill:none}.fill-fabric{fill:#212121}.fill-lining{fill:#ff5b77}.fill-interfacing{fill:#64b5f6}.fill-canvas{fill:#ff9000}.fill-various{fill:#4caf50}.fill-note{fill:#dd69dd}.fill-mark{fill:blue}.fill-contrast{fill:red}text{font-size:5px;font-family:-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;fill:#000;text-anchor:start;font-weight:200;dominant-baseline:ideographic}.text-xs{font-size:3px}.text-sm{font-size:4px}.text-lg{font-size:7px}.text-xl{font-size:9px}.text-xxl{font-size:12px}.center{text-anchor:middle}.right{text-anchor:end}path.grid{fill:none;stroke:#555;stroke-width:.3}path.gridline{stroke:#555;stroke-width:.2}path.gridline-lg{stroke:#777;stroke-width:.2;stroke-dasharray:1.5,1.5}path.gridline-sm{stroke:#999;stroke-width:.1}path.gridline-xs{stroke:#999;stroke-width:.1;stroke-dasharray:.5,0.5}path.gridbox{fill:url(#grid)}path.sample{stroke-width:.75}path.sample-focus{stroke-width:1.5;fill:rgba(0,0,0,0.1)} +path,circle,rect{fill:none;stroke:none}path,circle{stroke:#000;stroke-opacity:1;stroke-width:.3;stroke-linecap:round;stroke-linejoin:round}.fabric{stroke-width:.6;stroke:#212121}.lining{stroke-width:.6;stroke:#ff5b77}.interfacing{stroke-width:.6;stroke:#64b5f6}.canvas{stroke-width:.6;stroke:#ff9000}.various{stroke-width:.6;stroke:#4caf50}.note{stroke-width:.4;stroke:#dd60dd}.mark{stroke-width:.4;stroke:blue}.contrast{stroke-width:.8;stroke:red}.stroke-xs{stroke-width:.1}.stroke-sm{stroke-width:.2}.stroke-lg{stroke-width:.6}.stroke-xl{stroke-width:1}.stroke-xxl{stroke-width:2}.sa{stroke-dasharray:.4,0.8}.help{stroke-width:.2;stroke-dasharray:15,1.5,1,1.5}.dotted{stroke-dasharray:.4,0.8}.dashed{stroke-dasharray:1,1.5}.lashed{stroke-dasharray:6,6}.hidden{stroke:none;fill:none}.fill-fabric{fill:#212121}.fill-lining{fill:#ff5b77}.fill-interfacing{fill:#64b5f6}.fill-canvas{fill:#ff9000}.fill-various{fill:#4caf50}.fill-note{fill:#dd69dd}.fill-mark{fill:blue}.fill-contrast{fill:red}text{font-size:5px;font-family:-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;fill:#000;text-anchor:start;font-weight:200;dominant-baseline:ideographic}.text-xs{font-size:3px}.text-sm{font-size:4px}.text-lg{font-size:7px}.text-xl{font-size:9px}.text-xxl{font-size:12px}.center{text-anchor:middle}.right{text-anchor:end} diff --git a/packages/plugin-theme/src/lib/paperless.css b/packages/plugin-theme/src/lib/paperless.css new file mode 100644 index 00000000000..c2688252c77 --- /dev/null +++ b/packages/plugin-theme/src/lib/paperless.css @@ -0,0 +1,25 @@ +/* Paperless grid */ +path.grid { + fill: none; + stroke: #555; + stroke-width: 0.3; +} +path.gridline { + stroke: #555; + stroke-width: 0.2; +} +path.gridline-lg { + stroke: #777; + stroke-width: 0.2; + stroke-dasharray: 1.5,1.5; +} +path.gridline-sm { + stroke: #999; + stroke-width: 0.1; +} +path.gridline-xs { + stroke: #999; + stroke-width: 0.1; + stroke-dasharray: 0.5,0.5; +} +path.gridbox{ fill: url(#grid); } diff --git a/packages/plugin-theme/src/lib/paperless.css.js b/packages/plugin-theme/src/lib/paperless.css.js new file mode 100644 index 00000000000..76f1ee8369e --- /dev/null +++ b/packages/plugin-theme/src/lib/paperless.css.js @@ -0,0 +1,3 @@ +export default ` +path.grid{fill:none;stroke:#555;stroke-width:.3}path.gridline{stroke:#555;stroke-width:.2}path.gridline-lg{stroke:#777;stroke-width:.2;stroke-dasharray:1.5,1.5}path.gridline-sm{stroke:#999;stroke-width:.1}path.gridline-xs{stroke:#999;stroke-width:.1;stroke-dasharray:.5,0.5}path.gridbox{fill:url(#grid)} +`; diff --git a/packages/plugin-theme/src/lib/paperless.min.css b/packages/plugin-theme/src/lib/paperless.min.css new file mode 100644 index 00000000000..d19f0bfe9ae --- /dev/null +++ b/packages/plugin-theme/src/lib/paperless.min.css @@ -0,0 +1 @@ +path.grid{fill:none;stroke:#555;stroke-width:.3}path.gridline{stroke:#555;stroke-width:.2}path.gridline-lg{stroke:#777;stroke-width:.2;stroke-dasharray:1.5,1.5}path.gridline-sm{stroke:#999;stroke-width:.1}path.gridline-xs{stroke:#999;stroke-width:.1;stroke-dasharray:.5,0.5}path.gridbox{fill:url(#grid)} diff --git a/packages/plugin-theme/src/lib/sample.css b/packages/plugin-theme/src/lib/sample.css new file mode 100644 index 00000000000..1e1832e2876 --- /dev/null +++ b/packages/plugin-theme/src/lib/sample.css @@ -0,0 +1,3 @@ +/* Sample classes */ +path.sample {stroke-width: 0.75} +path.sample-focus {stroke-width: 1.5; fill: rgba(0,0,0,0.1)} diff --git a/packages/plugin-theme/src/lib/sample.css.js b/packages/plugin-theme/src/lib/sample.css.js new file mode 100644 index 00000000000..7058f5d1074 --- /dev/null +++ b/packages/plugin-theme/src/lib/sample.css.js @@ -0,0 +1,3 @@ +export default ` +path.sample{stroke-width:.75}path.sample-focus{stroke-width:1.5;fill:rgba(0,0,0,0.1)} +`; diff --git a/packages/plugin-theme/src/lib/sample.min.css b/packages/plugin-theme/src/lib/sample.min.css new file mode 100644 index 00000000000..038532a199a --- /dev/null +++ b/packages/plugin-theme/src/lib/sample.min.css @@ -0,0 +1 @@ +path.sample{stroke-width:.75}path.sample-focus{stroke-width:1.5;fill:rgba(0,0,0,0.1)}