diff --git a/.stylelintrc b/.stylelintrc index bd8f84bd1..6a2e42d5d 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -8,6 +8,9 @@ "block-no-empty": true, "declaration-block-no-redundant-longhand-properties": true, + "declaration-property-value-disallowed-list": { + "float": ["inline-start", "inline-end"] + }, "length-zero-no-unit": [true, { ignore: ["custom-properties"] }], diff --git a/gulpfile.js b/gulpfile.js index 2c106c2e9..f6a105cc2 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1288,6 +1288,10 @@ function preprocessDefaultPreferences(content) { return licenseHeader + "\n" + MODIFICATION_WARNING + "\n" + content + "\n"; } +function replaceMozcentralCSS() { + return replace(/var\(--(inline-(?:start|end))\)/g, "$1"); +} + gulp.task( "mozcentral", gulp.series( @@ -1357,10 +1361,12 @@ gulp.task( preprocessCSS("web/viewer.css", defines) .pipe(postcss([autoprefixer(MOZCENTRAL_AUTOPREFIXER_CONFIG)])) + .pipe(replaceMozcentralCSS()) .pipe(gulp.dest(MOZCENTRAL_CONTENT_DIR + "web")), preprocessCSS("web/viewer-geckoview.css", defines) .pipe(postcss([autoprefixer(MOZCENTRAL_AUTOPREFIXER_CONFIG)])) + .pipe(replaceMozcentralCSS()) .pipe(gulp.dest(MOZCENTRAL_CONTENT_DIR + "web")), gulp diff --git a/web/viewer.css b/web/viewer.css index 5cc3affca..10cb26717 100644 --- a/web/viewer.css +++ b/web/viewer.css @@ -17,10 +17,7 @@ :root { --dir-factor: 1; - /*#if MOZCENTRAL*/ - --inline-start: inline-start; - --inline-end: inline-end; - /*#else*/ + /*#if !MOZCENTRAL*/ --inline-start: left; --inline-end: right; /*#endif*/