Skip to content

Commit

Permalink
fix: formatting, license, css attributes
Browse files Browse the repository at this point in the history
  • Loading branch information
maribethb committed Jan 17, 2024
1 parent be36a30 commit 6f4e82f
Show file tree
Hide file tree
Showing 6 changed files with 90 additions and 91 deletions.
14 changes: 7 additions & 7 deletions examples/developer-tools/package-lock.json

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

44 changes: 22 additions & 22 deletions examples/developer-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,39 +5,39 @@
"private": true,
"main": "index.js",
"scripts": {
"start": "webpack serve --open --mode=development",
"build": "webpack --mode=production --node-env=production",
"build:dev": "webpack --mode=development",
"build:prod": "webpack --mode=production --node-env=production",
"watch": "webpack --watch",
"serve": "webpack serve"
"start": "webpack serve --open --mode=development",
"build": "webpack --mode=production --node-env=production",
"build:dev": "webpack --mode=development",
"build:prod": "webpack --mode=production --node-env=production",
"watch": "webpack --watch",
"serve": "webpack serve"
},
"repository": {
"type": "git",
"url": "git+https://github.com/google/blockly-samples.git"
"type": "git",
"url": "git+https://github.com/google/blockly-samples.git"
},
"keywords": [
"blockly"
"blockly"
],
"author": "Blockly Team",
"license": "Apache-2.0",
"bugs": {
"url": "https://github.com/google/blockly-samples/issues"
"url": "https://github.com/google/blockly-samples/issues"
},
"homepage": "https://github.com/google/blockly-samples#readme",
"devDependencies": {
"@webpack-cli/generators": "^3.0.7",
"css-loader": "^6.8.1",
"html-webpack-plugin": "^5.5.3",
"mini-css-extract-plugin": "^2.7.6",
"style-loader": "^3.3.3",
"ts-loader": "^9.4.4",
"typescript": "^5.1.6",
"webpack": "^5.88.2",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.15.1"
"@webpack-cli/generators": "^3.0.7",
"css-loader": "^6.8.1",
"html-webpack-plugin": "^5.5.3",
"mini-css-extract-plugin": "^2.7.6",
"style-loader": "^3.3.3",
"ts-loader": "^9.4.4",
"typescript": "^5.1.6",
"webpack": "^5.88.2",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.15.1"
},
"dependencies": {
"blockly": "^10.1.3"
"blockly": "^10.3.0"
}
}
}
98 changes: 49 additions & 49 deletions examples/developer-tools/src/index.css
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
body {
margin: 0;
}

#blockFactoryContainer {
display: flex;
height: 100vh;
box-sizing: border-box;
}

#mainWorkspace {
flex-basis: 0;
flex-grow: 1;
flex-shrink: 0;
margin: 8px;
min-width: 500px;
}

#outputPane {
display: flex;
flex-basis: 0;
margin: 0;
}

#block-factory-container {
display: flex;
height: 100vh;
box-sizing: border-box;
}

#main-workspace {
flex-basis: 0;
flex-grow: 1;
flex-shrink: 0;
margin: 8px;
min-width: 500px;
}

#output-pane {
display: flex;
flex-basis: 0;
flex-direction: column;
flex-grow: 1;
overflow-y: scroll;
}

#output-pane > * {
flex-basis: 20%;
margin: 8px;
min-height: 100px;
}

#block-preview {
min-height: 200px;
}

#block-definition {
overflow: scroll;
}

@media screen and (max-width: 800px) {
#block-factory-container {
flex-direction: column;
flex-grow: 1;
overflow-y: scroll;
}

#outputPane > * {
flex-basis: 20%;
margin: 8px;
min-height: 100px;
}

#preview {
min-height: 200px;
}

#definition {
overflow: scroll;

#main-workspace {
flex-grow: 2;
min-height: 400px;
}

@media screen and (max-width: 800px) {
#blockFactoryContainer {
flex-direction: column;
overflow-y: scroll;
}

#mainWorkspace {
flex-grow: 2;
min-height: 400px;
}

#outputDiv {
height: fit-content;
}

#outputDiv {
height: fit-content;
}
}
16 changes: 8 additions & 8 deletions examples/developer-tools/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
<title>Blockly Developer Tools</title>
</head>
<body>
<div id="blockFactoryContainer">
<div id="mainWorkspace"></div>
<div id="outputPane">
<div id="preview"></div>
<div id="outputConfig">config</div>
<div id="codeHeaders">code headers</div>
<pre id="definition">
<div id="block-factory-container">
<div id="main-workspace"></div>
<div id="output-pane">
<div id="block-preview"></div>
<div id="output-config">config</div>
<div id="code-headers">code headers</div>
<pre id="block-definition">
JSON Definition
<code></code>
</pre>
<div id="generatorStub">generator</div>
<div id="generator-stub">generator</div>
</div>
</div>
</body>
Expand Down
8 changes: 4 additions & 4 deletions examples/developer-tools/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license
* Copyright 2023 Google LLC
* Copyright 2024 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/

Expand All @@ -16,9 +16,9 @@ import './index.css';
// if you don't load it specifically, you'll get spurious message warnings.
Blockly.setLocale(En);

const mainWorkspaceDiv = document.getElementById('mainWorkspace');
const previewDiv = document.getElementById('preview');
const definitionDiv = document.getElementById('definition').firstChild;
const mainWorkspaceDiv = document.getElementById('main-workspace');
const previewDiv = document.getElementById('block-preview');
const definitionDiv = document.getElementById('block-definition').firstChild;

const previewWorkspace = Blockly.inject(previewDiv, {});
const mainWorkspace = Blockly.inject(mainWorkspaceDiv, {});
1 change: 0 additions & 1 deletion examples/developer-tools/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@
"moduleResolution": "node"
},
}

0 comments on commit 6f4e82f

Please sign in to comment.