diff --git a/apps/common/mobile/resources/less/about.less b/apps/common/mobile/resources/less/about.less
index 6b71c1c41..7b5e3f1e8 100644
--- a/apps/common/mobile/resources/less/about.less
+++ b/apps/common/mobile/resources/less/about.less
@@ -3,11 +3,11 @@
.about {
.page-content {
- text-align: center;
+ text-align: center /*rtl:ignore*/;
}
.content-block:first-child {
- margin: 15px 0;
+ margin: 15px 0 /*rtl:append20px*/;
}
.content-block {
diff --git a/apps/documenteditor/mobile/src/app.js b/apps/documenteditor/mobile/src/app.js
index c6e174778..87819ade0 100644
--- a/apps/documenteditor/mobile/src/app.js
+++ b/apps/documenteditor/mobile/src/app.js
@@ -16,7 +16,7 @@ window.$ = jQuery;
// Import Framework7 Styles
// import 'framework7/framework7-bundle.css';
-import 'framework7/framework7-bundle-rtl.css';
+// import 'framework7/framework7-bundle-rtl.css';
// Import Icons and App Custom Styles
// import '../css/icons.css';
diff --git a/apps/documenteditor/mobile/src/index_dev.html b/apps/documenteditor/mobile/src/index_dev.html
index 9d247a82b..05790b92b 100644
--- a/apps/documenteditor/mobile/src/index_dev.html
+++ b/apps/documenteditor/mobile/src/index_dev.html
@@ -20,7 +20,6 @@
<% } else { %>
<% } %>
-
diff --git a/apps/documenteditor/mobile/src/less/app.less b/apps/documenteditor/mobile/src/less/app.less
index c0607a196..c5463bf8d 100644
--- a/apps/documenteditor/mobile/src/less/app.less
+++ b/apps/documenteditor/mobile/src/less/app.less
@@ -1,3 +1,4 @@
+@import '../../../../../vendor/framework7-react/node_modules/framework7/framework7-bundle.less';
@import '../../../../../vendor/framework7-react/node_modules/framework7/less/mixins.less';
@import '../../../../common/mobile/resources/less/_mixins.less';
@import '../../../../common/mobile/resources/less/colors-table.less';
diff --git a/vendor/framework7-react/build/webpack.config.js b/vendor/framework7-react/build/webpack.config.js
index 5f84acf62..71204212e 100644
--- a/vendor/framework7-react/build/webpack.config.js
+++ b/vendor/framework7-react/build/webpack.config.js
@@ -2,8 +2,10 @@ const webpack = require('webpack');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const { CleanWebpackPlugin } = require('clean-webpack-plugin');
-const WebpackRTLPlugin = require('webpack-rtl-plugin');
+// const WebpackRTLPlugin = require('webpack-rtl-plugin');
// const rtlcss = require('rtlcss');
+const postcssRTLCSS = require('postcss-rtlcss');
+const { Mode } = require('postcss-rtlcss/options');
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
@@ -100,15 +102,17 @@ module.exports = {
}
}),
'css-loader',
- {
- loader: 'postcss-loader',
- options: {
- config: {
- path: path.resolve(__dirname, '..'),
- },
- // plugins: [rtlcss]
- },
+ {
+ loader: 'postcss-loader',
+ options: {
+ postcssOptions: {
+ path: path.resolve(__dirname, '..'),
+ plugins: [
+ postcssRTLCSS({mode: Mode.combined})
+ ]
+ },
},
+ },
],
},
{
@@ -122,13 +126,15 @@ module.exports = {
}),
'css-loader?url=false',
{
- loader: 'postcss-loader',
- options: {
- config: {
- path: path.resolve(__dirname, '..'),
- },
- // plugins: [rtlcss]
+ loader: 'postcss-loader',
+ options: {
+ postcssOptions: {
+ path: path.resolve(__dirname, '..'),
+ plugins: [
+ postcssRTLCSS({mode: Mode.combined})
+ ]
},
+ },
},
{
loader: "less-loader",
@@ -202,10 +208,10 @@ module.exports = {
new MiniCssExtractPlugin({
filename: 'css/[name].css',
}),
- new WebpackRTLPlugin({
- filename: 'css/[name].rtl.css',
- diffOnly: true
- }),
+ // new WebpackRTLPlugin({
+ // filename: 'css/[name].rtl.css',
+ // diffOnly: true
+ // }),
new HtmlWebpackPlugin({
filename: `../../../apps/${editor}/mobile/index.html`,
template: `../../apps/${editor}/mobile/src/index_dev.html`,
diff --git a/vendor/framework7-react/package.json b/vendor/framework7-react/package.json
index 68cbe8734..06735dd7f 100644
--- a/vendor/framework7-react/package.json
+++ b/vendor/framework7-react/package.json
@@ -33,6 +33,7 @@
"framework7-react": "^6.0.4",
"i18next": "^19.8.4",
"i18next-fetch-backend": "^3.0.0",
+ "postcss": "^8.4.12",
"prop-types": "^15.7.2",
"react": "^17.0.1",
"react-dom": "^17.0.1",
@@ -67,8 +68,9 @@
"mobx": "^6.1.8",
"mobx-react": "^7.1.0",
"ora": "^4.1.1",
- "postcss-loader": "^3.0.0",
+ "postcss-loader": "^6.2.1",
"postcss-preset-env": "^6.7.0",
+ "postcss-rtlcss": "^3.6.1",
"rimraf": "^3.0.2",
"style-loader": "^1.3.0",
"terser-webpack-plugin": "^5.1.3",
diff --git a/vendor/framework7-react/postcss.config.js b/vendor/framework7-react/postcss.config.js
index f88a19cc8..a8baa9d42 100644
--- a/vendor/framework7-react/postcss.config.js
+++ b/vendor/framework7-react/postcss.config.js
@@ -1,5 +1,6 @@
+
module.exports = (ctx) => ({
plugins: {
- 'postcss-preset-env': {},
+ 'postcss-preset-env': {}
},
});