Merge pull request #16265 from Snuffleupagus/float-inline
[Firefox] Use `float: inline-start/inline-end` directly in MOZCENTRAL builds (PR 15968 follow-up)
This commit is contained in:
		
						commit
						a43151103e
					
				@ -8,6 +8,9 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    "block-no-empty": true,
 | 
					    "block-no-empty": true,
 | 
				
			||||||
    "declaration-block-no-redundant-longhand-properties": true,
 | 
					    "declaration-block-no-redundant-longhand-properties": true,
 | 
				
			||||||
 | 
					    "declaration-property-value-disallowed-list": {
 | 
				
			||||||
 | 
					      "float": ["inline-start", "inline-end"]
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
    "length-zero-no-unit": [true, {
 | 
					    "length-zero-no-unit": [true, {
 | 
				
			||||||
      ignore: ["custom-properties"]
 | 
					      ignore: ["custom-properties"]
 | 
				
			||||||
    }],
 | 
					    }],
 | 
				
			||||||
 | 
				
			|||||||
@ -1288,6 +1288,10 @@ function preprocessDefaultPreferences(content) {
 | 
				
			|||||||
  return licenseHeader + "\n" + MODIFICATION_WARNING + "\n" + content + "\n";
 | 
					  return licenseHeader + "\n" + MODIFICATION_WARNING + "\n" + content + "\n";
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					function replaceMozcentralCSS() {
 | 
				
			||||||
 | 
					  return replace(/var\(--(inline-(?:start|end))\)/g, "$1");
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
gulp.task(
 | 
					gulp.task(
 | 
				
			||||||
  "mozcentral",
 | 
					  "mozcentral",
 | 
				
			||||||
  gulp.series(
 | 
					  gulp.series(
 | 
				
			||||||
@ -1357,10 +1361,12 @@ gulp.task(
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        preprocessCSS("web/viewer.css", defines)
 | 
					        preprocessCSS("web/viewer.css", defines)
 | 
				
			||||||
          .pipe(postcss([autoprefixer(MOZCENTRAL_AUTOPREFIXER_CONFIG)]))
 | 
					          .pipe(postcss([autoprefixer(MOZCENTRAL_AUTOPREFIXER_CONFIG)]))
 | 
				
			||||||
 | 
					          .pipe(replaceMozcentralCSS())
 | 
				
			||||||
          .pipe(gulp.dest(MOZCENTRAL_CONTENT_DIR + "web")),
 | 
					          .pipe(gulp.dest(MOZCENTRAL_CONTENT_DIR + "web")),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        preprocessCSS("web/viewer-geckoview.css", defines)
 | 
					        preprocessCSS("web/viewer-geckoview.css", defines)
 | 
				
			||||||
          .pipe(postcss([autoprefixer(MOZCENTRAL_AUTOPREFIXER_CONFIG)]))
 | 
					          .pipe(postcss([autoprefixer(MOZCENTRAL_AUTOPREFIXER_CONFIG)]))
 | 
				
			||||||
 | 
					          .pipe(replaceMozcentralCSS())
 | 
				
			||||||
          .pipe(gulp.dest(MOZCENTRAL_CONTENT_DIR + "web")),
 | 
					          .pipe(gulp.dest(MOZCENTRAL_CONTENT_DIR + "web")),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        gulp
 | 
					        gulp
 | 
				
			||||||
 | 
				
			|||||||
@ -17,10 +17,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
:root {
 | 
					:root {
 | 
				
			||||||
  --dir-factor: 1;
 | 
					  --dir-factor: 1;
 | 
				
			||||||
  /*#if MOZCENTRAL*/
 | 
					  /*#if !MOZCENTRAL*/
 | 
				
			||||||
  --inline-start: inline-start;
 | 
					 | 
				
			||||||
  --inline-end: inline-end;
 | 
					 | 
				
			||||||
  /*#else*/
 | 
					 | 
				
			||||||
  --inline-start: left;
 | 
					  --inline-start: left;
 | 
				
			||||||
  --inline-end: right;
 | 
					  --inline-end: right;
 | 
				
			||||||
  /*#endif*/
 | 
					  /*#endif*/
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user