Merge pull request #25 from calliope-edu/dev_touchpin

Fix Touch Pins
calliope-edu · Feb 27, 2025 · fd3ac97 · fd3ac97
2 parents f23a380 + 05f7817
commit fd3ac97
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/src/components/connection-modal/connected-step.jsx b/src/components/connection-modal/connected-step.jsx
@@ -49,7 +49,7 @@ const ConnectedStep = props => (
                     />
                 </button>
                 <button
-                    className={styles.connectionButton}
+                    className={classNames(styles.greenButton, styles.connectionButton)}
                     onClick={props.onCancel}
                 >
                     <FormattedMessage

diff --git a/src/components/connection-modal/connection-modal.css b/src/components/connection-modal/connection-modal.css
@@ -357,6 +357,10 @@
     background: $red-primary;
 }
 
+.green-button {
+    background: $pen-primary;
+}
+
 .corner-buttons {
     display: flex;
     justify-content: space-between;

diff --git a/src/css/colors.css b/src/css/colors.css
@@ -32,9 +32,9 @@ $control-primary: hsla(38, 100%, 55%, 1); /* #FFAB19 */
 
 $data-primary: hsla(30, 100%, 55%, 1); /* #FF8C1A */
 
-$pen-primary: hsla(163, 85%, 40%, 1); /* #0FBD8C */
-$pen-transparent: hsla(163, 85%, 40%, 0.25); /* #0FBD8C */
-$pen-tertiary: hsla(163, 86%, 30%, 1); /* #0B8E69 */
+$pen-primary: hsla(125, 45%, 60%, 1); /* #69C46F */
+$pen-transparent: hsla(125, 45%, 60%, 0.25); /* #69C46F */
+$pen-tertiary: hsla(166, 100%, 33%, 1); /* #00AA85 */
 
 $error-primary: hsla(30, 100%, 55%, 1); /* #FF8C1A */
 $error-light: hsla(30, 100%, 70%, 1); /* #FFB366 */

diff --git a/webpack.config.js b/webpack.config.js
@@ -175,7 +175,8 @@ module.exports = [
         optimization: {
             splitChunks: {
                 chunks: 'all',
-                name: 'lib.min'
+                name: 'lib.min',
+                minSize: 20 * 1024 * 1024,
             },
             runtimeChunk: {
                 name: 'lib.min'
@@ -300,6 +301,16 @@ module.exports = [
                       }
                   ])
               },
+              optimization: {
+                splitChunks: {
+                    chunks: 'all',
+                    name: 'lib.min',
+                    minSize: 20 * 1024 * 1024,
+                },
+                runtimeChunk: {
+                    name: 'lib.min'
+                }
+            },
               plugins: base.plugins.concat([
                   new CopyWebpackPlugin({
                       patterns: [