Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions packages/gui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,11 @@
"url": "https://github.com/Clipteam/clipcc.git"
},
"exports": {
"types": "./dist/types/index.d.ts",
"default": "./dist/scratch-gui.js"
".": {
"types": "./dist/types/index.d.ts",
"default": "./dist/scratch-gui.js"
},
"./styles/*": "./dist/styles/*"
},
"scripts": {
"build:types": "tsc --project ./tsconfig.dts.json",
Expand Down
4 changes: 0 additions & 4 deletions packages/gui/src/components/gui/gui.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
@import "../../css/colors.css";
@import "../../css/units.css";
@import "../../css/z-index.css";

.page-wrapper {
height: 100%;
}
Comment on lines 1 to 3
Expand Down
2 changes: 2 additions & 0 deletions packages/gui/src/containers/paint-editor-wrapper.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import React from 'react';
import bindAll from 'lodash.bindall';
import VM from 'clipcc-vm';
import PaintEditor from 'clipcc-paint';
import 'clipcc-paint/styles/colors.css';
import 'clipcc-paint/styles/units.css';
import {inlineSvgFonts} from 'clipcc-svg-renderer';

import {connect} from 'react-redux';
Expand Down
6 changes: 5 additions & 1 deletion packages/gui/src/playground/index.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
@import "../css/colors.css";
@import "../css/units.css";
@import "../css/z-index.css";

Comment on lines +1 to +4
html,
body,
.app {
/* probably unecessary, transitional until layout is refactored */
width: 100%;
width: 100%;
height: 100%;
margin: 0;

Expand Down
9 changes: 9 additions & 0 deletions packages/gui/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,15 @@ module.exports = [
to: 'libraries/[name][ext]'
}
]
}),
// Export necessary CSS files for external use.
new CopyWebpackPlugin({
patterns: [
{
from: 'src/css/*.css',
to: 'styles/[name][ext]'
}
]
})
Comment on lines +293 to 301
])
})) : []
Expand Down
8 changes: 6 additions & 2 deletions packages/paint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@
"version": "3.2.0",
"description": "Graphical User Interface for the Scratch 3.0 paint editor, which is used to make and edit sprites for use in projects.",
"exports": {
"webpack": "./src/index.js",
"default": "./dist/scratch-paint.js"
".": {
"webpack": "./src/index.js",
"default": "./dist/scratch-paint.js"
},
"./styles/*": "./dist/styles/*"
},
"scripts": {
"build": "pnpm run clean && webpack --progress --color --bail",
Expand Down Expand Up @@ -59,6 +62,7 @@
"babel-jest": "23.6.0",
"babel-loader": "^10.1.1",
"babel-plugin-react-intl": "3.0.1",
"copy-webpack-plugin": "^14.0.0",
"css-loader": "^6.7.3",
"enzyme": "3.11.0",
"enzyme-adapter-react-16": "1.15.6",
Expand Down
3 changes: 0 additions & 3 deletions packages/paint/src/components/paint-editor/paint-editor.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
@import "../../css/colors.css";
@import "../../css/units.css";

.editor-container {
width: 100%;
height: 100%;
Expand Down
2 changes: 1 addition & 1 deletion packages/paint/src/css/units.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ALSO EDITED ON 11/13/2017 TO ADD IN CONTANTS FOR LAYOUT FROM `layout-contents.js
--clipcc-sprite-info-height: 6rem;
--clipcc-stage-menu-height: 2.75rem;

--clipcc-library-header-height: 4.375rem;
--clipcc-library-header-height: 3.125rem;

--clipcc-form-radius: calc(var(--clipcc-space) / 2);

Expand Down
2 changes: 2 additions & 0 deletions packages/paint/src/playground/playground.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "../css/colors.css";
@import "../css/units.css";

body {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
Expand Down
14 changes: 13 additions & 1 deletion packages/paint/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ const path = require('path');

// Plugins
const HtmlWebpackPlugin = require('html-webpack-plugin');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const TerserPlugin = require('terser-webpack-plugin');

const base = {
Expand Down Expand Up @@ -105,6 +106,17 @@ module.exports = [
library: {
type: 'commonjs2'
}
}
},
plugins: base.plugins.concat([
// Export necessary CSS files for external use.
new CopyWebpackPlugin({
patterns: [
{
from: 'src/css/*.css',
to: 'styles/[name][ext]'
}
]
})
])
Comment on lines +110 to +120
})
];
4 changes: 4 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading