From c121af110cab089e27975af9914f6d8e296013b1 Mon Sep 17 00:00:00 2001
From: Jack Reed <phillipjreed@gmail.com>
Date: Wed, 3 Jul 2019 12:40:35 +0300
Subject: [PATCH] Remove failed "fallback" generated styles
Seems to be an artifact of less -> css -> jss and fix
ordering of merge
---
src/containers/WorkspaceArea.js | 2 +-
src/styles/vendor/react-mosaic-jss.js | 35 +--------------------------
2 files changed, 2 insertions(+), 35 deletions(-)
diff --git a/src/containers/WorkspaceArea.js b/src/containers/WorkspaceArea.js
index 7398c2b5e..a70d08c94 100644
--- a/src/containers/WorkspaceArea.js
+++ b/src/containers/WorkspaceArea.js
@@ -107,6 +107,7 @@ const styles = theme => ({
paddingTop: 0,
},
},
+ ...reactMosaicJss['@global'],
'.mosaic-tile': {
boxShadow: [
[0, 1, 3, 0, 'rgba(0, 0, 0, .2)'],
@@ -120,7 +121,6 @@ const styles = theme => ({
'.mosaic-window-toolbar': {
display: [['none'], '!important'],
},
- ...reactMosaicJss['@global'],
...reactPlaceholderJss['@global'],
},
background: {
diff --git a/src/styles/vendor/react-mosaic-jss.js b/src/styles/vendor/react-mosaic-jss.js
index 93f8ce332..ea514a78d 100644
--- a/src/styles/vendor/react-mosaic-jss.js
+++ b/src/styles/vendor/react-mosaic-jss.js
@@ -1,5 +1,6 @@
// jss convert node_modules/react-mosaic-component/react-mosaic-component.css -f js > src/styles/vendor/react-mosaic-jss.js
// Then unused "Blueprint" theme styles removed
+// Then remove failed converted fallbacks (seems to be a problem from less -> css -> jss)
export default {
'@global': {
@@ -138,15 +139,6 @@ export default {
'.mosaic-window, .mosaic-preview': {
position: 'relative',
display: 'flex',
- fallbacks: [
- {
- W: 'vertical',
- },
- {
- display: '-webkit-box',
- },
- ],
- W: 'normal',
flexDirection: 'column',
overflow: 'hidden',
boxShadow: '0 0 1px rgba(0, 0, 0, 0.2)',
@@ -154,15 +146,6 @@ export default {
'.mosaic-window .mosaic-window-toolbar, .mosaic-preview .mosaic-window-toolbar': {
zIndex: '4',
display: 'flex',
- fallbacks: [
- {
- W: 'justify',
- },
- {
- display: '-webkit-box',
- },
- ],
- W: 'center',
justifyContent: 'space-between',
alignItems: 'center',
flexShrink: '0',
@@ -175,7 +158,6 @@ export default {
},
'.mosaic-window .mosaic-window-title, .mosaic-preview .mosaic-window-title': {
paddingLeft: 15,
- W: '1',
flex: '1',
textOverflow: 'ellipsis',
whiteSpace: 'nowrap',
@@ -257,21 +239,6 @@ export default {
},
'.mosaic-window .mosaic-preview .mosaic-window-body, .mosaic-preview .mosaic-preview .mosaic-window-body': {
display: 'flex',
- fallbacks: [
- {
- W: 'center',
- },
- {
- W: 'normal',
- },
- {
- W: 'vertical',
- },
- {
- display: '-webkit-box',
- },
- ],
- W: 'center',
flexDirection: 'column',
alignItems: 'center',
justifyContent: 'center',
--
GitLab