Merge branch 'protocol_designer-migrate-webpack-to-vite' of https://g…

…ithub.com/Opentrons/opentrons into protocol_designer-migrate-webpack-to-vite
Opentrons · Mar 7, 2024 · e0bb082 · e0bb082
2 parents 72b5eba + 9ba70bf
commit e0bb082
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 9 deletions.
diff --git a/app/src/atoms/SoftwareKeyboard/CustomKeyboard/CustomKeyboard.stories.tsx b/app/src/atoms/SoftwareKeyboard/CustomKeyboard/CustomKeyboard.stories.tsx
@@ -8,7 +8,8 @@ import {
 import { touchScreenViewport } from '../../../DesignTokens/constants'
 import { InputField } from '../../InputField'
 import { CustomKeyboard } from './'
-import '../../../styles.global.module.css'
+import '../index.css'
+import './index.css'
 
 import type { Story, Meta } from '@storybook/react'
 

diff --git a/...eKeyboard/CustomKeyboard/index.module.css → ...SoftwareKeyboard/CustomKeyboard/index.css b/...eKeyboard/CustomKeyboard/index.module.css → ...SoftwareKeyboard/CustomKeyboard/index.css
diff --git a/app/src/atoms/SoftwareKeyboard/NormalKeyboard/NormalKeyboard.stories.tsx b/app/src/atoms/SoftwareKeyboard/NormalKeyboard/NormalKeyboard.stories.tsx
@@ -8,7 +8,9 @@ import {
 import { touchScreenViewport } from '../../../DesignTokens/constants'
 import { InputField } from '../../InputField'
 import { NormalKeyboard } from '.'
-import '../../../styles.global.module.css'
+
+import '../index.css'
+import './index.css'
 
 import type { Story, Meta } from '@storybook/react'
 

diff --git a/...eKeyboard/NormalKeyboard/index.module.css → ...SoftwareKeyboard/NormalKeyboard/index.css b/...eKeyboard/NormalKeyboard/index.module.css → ...SoftwareKeyboard/NormalKeyboard/index.css
diff --git a/app/src/atoms/SoftwareKeyboard/Numpad/Numpad.stories.tsx b/app/src/atoms/SoftwareKeyboard/Numpad/Numpad.stories.tsx
@@ -8,7 +8,8 @@ import {
 import { touchScreenViewport } from '../../../DesignTokens/constants'
 import { InputField } from '../../InputField'
 import { Numpad } from './'
-import '../../../styles.global.module.css'
+import '../index.css'
+import './index.css'
 
 import type { Story, Meta } from '@storybook/react'
 

diff --git a/.../SoftwareKeyboard/Numpad/index.module.css → ...c/atoms/SoftwareKeyboard/Numpad/index.css b/.../SoftwareKeyboard/Numpad/index.module.css → ...c/atoms/SoftwareKeyboard/Numpad/index.css
diff --git a/app/src/atoms/SoftwareKeyboard/index.css b/app/src/atoms/SoftwareKeyboard/index.css
diff --git a/app/src/index.tsx b/app/src/index.tsx
@@ -15,7 +15,10 @@ import { uiInitialized } from './redux/shell'
 import { history } from './redux/reducer'
 import { store } from './redux/store'
 
-import './styles.global.module.css'
+import '../src/atoms/SoftwareKeyboard/index.css'
+import '../src/atoms/SoftwareKeyboard/CustomKeyboard/index.css'
+import '../src/atoms/SoftwareKeyboard/NormalKeyboard/index.css'
+import '../src/atoms/SoftwareKeyboard/Numpad/index.css'
 
 // component tree
 import { App } from './App'

diff --git a/app/src/organisms/RunTimeControl/utils.ts b/app/src/organisms/RunTimeControl/utils.ts
@@ -26,8 +26,6 @@ export function formatDuration(duration: Duration): string {
  * @returns string in format hh:mm:ss, e.g. 03:15:45
  */
 export function formatInterval(start: string, end: string): string {
-  console.log(start)
-  console.log(new Date(start))
   const duration = intervalToDuration({
     start: new Date(start),
     end: new Date(end),

diff --git a/app/src/styles.global.module.css b/app/src/styles.global.module.css
@@ -3,6 +3,6 @@
 */
 
 @import '../../node_modules/react-simple-keyboard/build/css/index.css';
-@import './atoms/SoftwareKeyboard/CustomKeyboard/index.module.css';
-@import './atoms/SoftwareKeyboard/NormalKeyboard/index.module.css';
-@import './atoms/SoftwareKeyboard/Numpad/index.module.css';
+@import './atoms/SoftwareKeyboard/CustomKeyboard/index.css';
+@import './atoms/SoftwareKeyboard/NormalKeyboard/index.css';
+@import './atoms/SoftwareKeyboard/Numpad/index.css';