Sfoglia il codice sorgente

Fix priority for font-color/bg-color, set equal priority for all font features. higher than links but lwoer than basic styles.

Mateusz Samsel 6 anni fa
parent
commit
5f121deaa5

+ 1 - 1
packages/ckeditor5-font/src/fontfamily/utils.js

@@ -72,7 +72,7 @@ function generateFontPreset( fontDefinition ) {
 			styles: {
 				'font-family': cssFontNames
 			},
-			priority: 5
+			priority: 7
 		}
 	};
 }

+ 5 - 5
packages/ckeditor5-font/src/fontsize/utils.js

@@ -30,7 +30,7 @@ const namedPresets = {
 		view: {
 			name: 'span',
 			classes: 'text-tiny',
-			priority: 5
+			priority: 7
 		}
 	},
 	small: {
@@ -39,7 +39,7 @@ const namedPresets = {
 		view: {
 			name: 'span',
 			classes: 'text-small',
-			priority: 5
+			priority: 7
 		}
 	},
 	big: {
@@ -48,7 +48,7 @@ const namedPresets = {
 		view: {
 			name: 'span',
 			classes: 'text-big',
-			priority: 5
+			priority: 7
 		}
 	},
 	huge: {
@@ -57,7 +57,7 @@ const namedPresets = {
 		view: {
 			name: 'span',
 			classes: 'text-huge',
-			priority: 5
+			priority: 7
 		}
 	}
 };
@@ -113,7 +113,7 @@ function generatePixelPreset( size ) {
 			styles: {
 				'font-size': `${ size }px`
 			},
-			priority: 5
+			priority: 7
 		}
 	};
 }

+ 3 - 5
packages/ckeditor5-font/src/utils.js

@@ -84,7 +84,7 @@ export function renderUpcastAttribute( styleAttr ) {
 export function renderDowncastElement( styleAttr ) {
 	return ( modelAttributeValue, viewWriter ) => viewWriter.createAttributeElement( 'span', {
 		style: `${ styleAttr }:${ modelAttributeValue }`
-	} );
+	}, { priority: 7 } );
 }
 
 /**
@@ -188,8 +188,7 @@ function normalizeSingleColorDefinition( color ) {
 				name: 'span',
 				styles: {
 					color
-				},
-				priority: 5
+				}
 			}
 		};
 	} else {
@@ -201,8 +200,7 @@ function normalizeSingleColorDefinition( color ) {
 				name: 'span',
 				styles: {
 					color: `${ color.color }`
-				},
-				priority: 5
+				}
 			}
 		};
 	}