fix(tailwind): Missed some changes when upgrading to tailwind 2.x

This commit is contained in:
Erik Ziegler committed 2021-07-29 15:51:53 +02:00
1 parent 3220af737c
commit 9b013dd38d
12 files changed
+34 -20

No files matched your search

+15
View File
@@ -0,0 +1,15 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "pwa-chrome",
"request": "launch",
"name": "Launch Chrome against localhost",
"url": "http://localhost:3000",
"webRoot": "${workspaceFolder}"
}
]
}
@@ -189,7 +189,7 @@ function ViewerLayout({
</ErrorBoundary> </ErrorBoundary>
</Header> </Header>
<div <div
className="flex flex-row flex-no-wrap items-stretch w-full overflow-hidden" className="flex flex-row flex-nowrap items-stretch w-full overflow-hidden"
style={{ height: 'calc(100vh - 52px' }} style={{ height: 'calc(100vh - 52px' }}
> >
{/* LEFT SIDEPANELS */} {/* LEFT SIDEPANELS */}
@@ -18,7 +18,7 @@ import { SidePanel } from '@ohif/ui';
```jsx live ```jsx live
<div <div
className="flex flex-row flex-no-wrap flex-1 items-stretch overflow-hidden w-full" className="flex flex-row flex-nowrap flex-1 items-stretch overflow-hidden w-full"
style={{ height: '500px' }} style={{ height: '500px' }}
> >
<SidePanel <SidePanel
@@ -43,7 +43,7 @@ import { SidePanel } from '@ohif/ui';
```jsx live ```jsx live
<div <div
className="flex flex-row flex-no-wrap flex-1 items-stretch overflow-hidden w-full" className="flex flex-row flex-nowrap flex-1 items-stretch overflow-hidden w-full"
style={{ height: '500px' }} style={{ height: '500px' }}
> >
<SidePanel <SidePanel
@@ -81,4 +81,4 @@ import { SidePanel } from '@ohif/ui';
## Properties ## Properties
(<ComponentPropsTable componentName={'SidePanel'} />)```` (<ComponentPropsTable componentName={'SidePanel'} />)``
@@ -56,7 +56,7 @@ import { tabs } from './studyBrowserMockData';
<DragAndDropProvider> <DragAndDropProvider>
<Header /> <Header />
<div <div
className="flex flex-row flex-no-wrap items-stretch overflow-hidden w-full" className="flex flex-row flex-nowrap items-stretch overflow-hidden w-full"
style={{ height: 'calc(100vh - 52px' }} style={{ height: 'calc(100vh - 52px' }}
> >
{/* LEFT SIDEPANELS */} {/* LEFT SIDEPANELS */}
+2 -2
View File
@@ -24,8 +24,8 @@ module.exports = (env, argv) => {
warnings: true, warnings: true,
}, },
optimization: { optimization: {
minimize: false, minimize: true,
sideEffects: false, sideEffects: true,
}, },
output: { output: {
path: ROOT_DIR, path: ROOT_DIR,
-1
View File
@@ -45,7 +45,6 @@
}, },
"devDependencies": { "devDependencies": {
"autoprefixer": "9.7.4", "autoprefixer": "9.7.4",
"mini-css-extract-plugin": "^2.1.0",
"postcss": "^8.3.5", "postcss": "^8.3.5",
"postcss-loader": "^6.1.1", "postcss-loader": "^6.1.1",
"prop-types": "15.7.2", "prop-types": "15.7.2",
@@ -1,6 +1,3 @@
/*@tailwind base;
@tailwind utilities;*/
/** CONTAINER STYLES **/ /** CONTAINER STYLES **/
.DateRangePickerInput { .DateRangePickerInput {
@@ -66,7 +66,7 @@ const HotkeysPreferences = ({ disabled, hotkeyDefinitions, errors: controlledErr
</Typography> </Typography>
<Typography <Typography
variant='subtitle' variant='subtitle'
className={classNames('pr-6 h-full flex flex-row items-center whitespace-no-wrap', isFirst && 'mt-5')}> className={classNames('pr-6 h-full flex flex-row items-center whitespace-nowrap', isFirst && 'mt-5')}>
{definition.label} {definition.label}
</Typography> </Typography>
</div> </div>
@@ -9,13 +9,13 @@ const WindowLevelMenuItem = ({ title, subtitle, isSelected, index }) => (
isSelected && 'bg-primary-dark' isSelected && 'bg-primary-dark'
)} )}
> >
<span className='text-common-bright mr-2 text-base whitespace-no-wrap'> <span className='text-common-bright mr-2 text-base whitespace-nowrap'>
{title} {title}
</span> </span>
<span className='flex-1 text-aqua-pale font-light text-sm whitespace-no-wrap'> <span className='flex-1 text-aqua-pale font-light text-sm whitespace-nowrap'>
{subtitle} {subtitle}
</span> </span>
<span className='text-primary-active ml-5 text-sm whitespace-no-wrap'>{index + 1}</span> <span className='text-primary-active ml-5 text-sm whitespace-nowrap'>{index + 1}</span>
</div> </div>
</> </>
); );
+1 -1
View File
@@ -10,7 +10,7 @@ const Viewer = () => {
<div> <div>
<Header /> <Header />
<div <div
className="flex flex-row flex-no-wrap items-stretch flex-1 w-full overflow-hidden" className="flex flex-row flex-nowrap items-stretch flex-1 w-full overflow-hidden"
style={{ height: 'calc(100vh - 52px' }} style={{ height: 'calc(100vh - 52px' }}
> >
<SidePanel <SidePanel
-4
View File
@@ -828,8 +828,4 @@ module.exports = {
}, },
corePlugins: {}, corePlugins: {},
plugins: [], plugins: [],
future: {
purgeLayersByDefault: true,
standardFontWeights: true,
},
}; };
+7
View File
@@ -36,6 +36,13 @@ module.exports = (env, argv) => {
path: DIST_DIR, path: DIST_DIR,
filename: isProdBuild ? '[name].bundle.[chunkhash].js' : '[name].js', filename: isProdBuild ? '[name].bundle.[chunkhash].js' : '[name].js',
publicPath: PUBLIC_URL, // Used by HtmlWebPackPlugin for asset prefix publicPath: PUBLIC_URL, // Used by HtmlWebPackPlugin for asset prefix
devtoolModuleFilenameTemplate: function(info) {
if (isProdBuild) {
return `webpack:///${info.resourcePath}`;
} else {
return 'file:///' + encodeURI(info.absoluteResourcePath);
}
},
}, },
resolve: { resolve: {
modules: [ modules: [