8
0
Просмотр исходного кода

Adjusted styles. Code refactoring in styles.

Aleksander Nowodzinski 5 лет назад
Родитель
Сommit
3f3f4e2b08

+ 3 - 3
packages/ckeditor5-table/src/tablecellproperties/ui/tablecellpropertiesview.js

@@ -344,7 +344,7 @@ export default class TableCellPropertiesView extends View {
 						operatorLabel,
 						heightInput
 					],
-					class: 'ck-table-cell-properties-form__dimensions-row'
+					class: 'ck-table-properties-form__dimensions-row'
 				} ),
 				// Padding row.
 				new FormRowView( locale, {
@@ -582,7 +582,7 @@ export default class TableCellPropertiesView extends View {
 
 		widthInput.set( {
 			label: t( 'Width' ),
-			class: 'ck-table-cell-properties-form__width',
+			class: 'ck-table-properties-form__width',
 		} );
 
 		widthInput.view.bind( 'value' ).to( this, 'width' );
@@ -611,7 +611,7 @@ export default class TableCellPropertiesView extends View {
 
 		heightInput.set( {
 			label: t( 'Height' ),
-			class: 'ck-table-cell-properties-form__height',
+			class: 'ck-table-properties-form__height',
 		} );
 
 		heightInput.view.bind( 'value' ).to( this, 'height' );

+ 3 - 3
packages/ckeditor5-table/tests/tablecellproperties/ui/tablecellpropertiesview.js

@@ -323,7 +323,7 @@ describe( 'table cell properties', () => {
 						const row = view.element.childNodes[ 3 ].childNodes[ 0 ];
 
 						expect( row.classList.contains( 'ck-form__row' ) ).to.be.true;
-						expect( row.classList.contains( 'ck-table-cell-properties-form__dimensions-row' ) ).to.be.true;
+						expect( row.classList.contains( 'ck-table-properties-form__dimensions-row' ) ).to.be.true;
 						expect( row.childNodes[ 0 ].textContent ).to.equal( 'Dimensions' );
 						expect( row.childNodes[ 1 ] ).to.equal( view.widthInput.element );
 						expect( row.childNodes[ 2 ].textContent ).to.equal( '×' );
@@ -340,7 +340,7 @@ describe( 'table cell properties', () => {
 						it( 'should be created', () => {
 							expect( labeledInput.view ).to.be.instanceOf( InputTextView );
 							expect( labeledInput.label ).to.equal( 'Width' );
-							expect( labeledInput.class ).to.equal( 'ck-table-cell-properties-form__width' );
+							expect( labeledInput.class ).to.equal( 'ck-table-properties-form__width' );
 						} );
 
 						it( 'should reflect #width property', () => {
@@ -372,7 +372,7 @@ describe( 'table cell properties', () => {
 						it( 'should be created', () => {
 							expect( labeledInput.view ).to.be.instanceOf( InputTextView );
 							expect( labeledInput.label ).to.equal( 'Height' );
-							expect( labeledInput.class ).to.equal( 'ck-table-cell-properties-form__height' );
+							expect( labeledInput.class ).to.equal( 'ck-table-properties-form__height' );
 						} );
 
 						it( 'should reflect #height property', () => {

+ 0 - 17
packages/ckeditor5-table/theme/tablecellproperties.css

@@ -5,26 +5,9 @@
 
 .ck.ck-table-cell-properties-form {
 	& .ck-form__row {
-		&.ck-table-cell-properties-form__dimensions-row,
 		&.ck-table-cell-properties-form__alignment-row {
 			flex-wrap: wrap;
-		}
-
-		&.ck-table-cell-properties-form__dimensions-row {
-			align-items: center;
 
-			& .ck-labeled-view {
-				display: flex;
-				flex-direction: column-reverse;
-				align-items: center;
-
-				& .ck.ck-dropdown {
-					flex-grow: 0;
-				}
-			}
-		}
-
-		&.ck-table-cell-properties-form__alignment-row {
 			& .ck.ck-toolbar {
 				flex-grow: 0;
 			}

+ 28 - 12
packages/ckeditor5-table/theme/tableform.css

@@ -4,25 +4,41 @@
  */
 
 .ck.ck-table-form {
-	& .ck-table-form__border-row {
-		flex-wrap: wrap;
+	& .ck-form__row {
+		&.ck-table-form__border-row {
+			flex-wrap: wrap;
 
-		& .ck-labeled-view {
-			display: flex;
-			flex-direction: column-reverse;
-			align-items: center;
+			& .ck-labeled-view {
+				display: flex;
+				flex-direction: column-reverse;
+
+				& .ck.ck-dropdown {
+					flex-grow: 0;
+				}
+			}
 
-			& .ck.ck-dropdown {
+			& .ck-table-form__border-style {
 				flex-grow: 0;
 			}
-		}
 
-		& .ck-table-form__border-style {
-			flex-grow: 0;
+			& .ck-table-form__border-width {
+				flex-grow: 0;
+			}
 		}
 
-		& .ck-table-form__border-width {
-			flex-grow: 0;
+		&.ck-table-properties-form__dimensions-row {
+			flex-wrap: wrap;
+			align-items: center;
+
+			& .ck-labeled-view {
+				display: flex;
+				flex-direction: column-reverse;
+				align-items: center;
+
+				& .ck.ck-dropdown {
+					flex-grow: 0;
+				}
+			}
 		}
 	}
 

+ 0 - 19
packages/ckeditor5-table/theme/tableproperties.css

@@ -5,25 +5,6 @@
 
 .ck.ck-table-properties-form {
 	& .ck-form__row {
-		&.ck-table-properties-form__dimensions-row,
-		&.ck-table-properties-form__alignment-row {
-			flex-wrap: wrap;
-		}
-
-		&.ck-table-properties-form__dimensions-row {
-			align-items: center;
-
-			& .ck-labeled-view {
-				display: flex;
-				flex-direction: column-reverse;
-				align-items: center;
-
-				& .ck.ck-dropdown {
-					flex-grow: 0;
-				}
-			}
-		}
-
 		&.ck-table-properties-form__alignment-row {
 			flex-wrap: wrap;
 			flex-basis: 0;