Merge branch 'release/2.18.3'

inc/styles-admin.php

@@ -593,7 +593,11 @@ function measurements_list() {
 			'ex',
 			'pt',
 			'pc',
-			'rem'
+			'rem',
+			'vw',
+			'vh',
+			'vmin',
+			'vmax',
 		);
 
 		// Allow themes and plugins to trim or enhance the list.

readme.txt

@@ -1,7 +1,7 @@
 === Page Builder by SiteOrigin ===
 Tags: page builder, responsive, parallax, widgets, blocks, gallery, layout, grid, cms, builder, widget
 Requires at least: 4.7
-Tested up to: 6.0
+Tested up to: 6.1
 Requires PHP: 5.6.20
 Stable tag: trunk
 Build time: unbuilt
@@ -107,8 +107,12 @@ SiteOrigin Premium includes access to our professional email support service, pe
 
 == Changelog ==
 
+= 2.18.3 - 09 November 2022 =
+* Styles: Added viewport units of measurement.
+* Updated `Tested up to` tag to 6.1.
+
 = 2.18.2 - 26 October 2022 =
-* Restored row re-orderding functionality.
+* Restored row re-ordering functionality.
 
 = 2.18.1 - 25 October 2022 =
 * Restored admin row background functionality.

tpl/js-templates.php

@@ -101,19 +101,23 @@
 						<li><a class="so-row-settings"><?php _e('Edit Row', 'siteorigin-panels') ?></a></li>
 						<li><a class="so-row-duplicate"><?php _e('Duplicate Row', 'siteorigin-panels') ?></a></li>
 						<li><a class="so-row-delete so-needs-confirm" data-confirm="<?php esc_attr_e('Are you sure?', 'siteorigin-panels') ?>"><?php _e('Delete Row', 'siteorigin-panels') ?></a></li>
-						<li class="so-row-colors-container">
-							<?php
-							$row_colors = SiteOrigin_Panels_Admin::get_row_colors();
-							foreach ( $row_colors as $id => $color ) {
-								$name = ! empty( $color['name'] ) ? sanitize_title( $color['name'] ) : $id;
-								?>
-								<div data-color-label="<?php echo esc_attr( $name ); ?>"
-									class="<?php echo esc_attr( 'so-row-color so-row-color-' . $name ); ?>{{% if( rowColorLabel == '<?php echo esc_attr( $name ); ?>' ) print(' so-row-color-selected'); %}}"
-									></div>
+						<?php
+						$row_colors = SiteOrigin_Panels_Admin::get_row_colors();
+						if ( ! empty( $row_colors ) ) :
+						?>
+							<li class="so-row-colors-container">
 								<?php
-							}
-							?>
-						</li>
+								foreach ( $row_colors as $id => $color ) {
+									$name = ! empty( $color['name'] ) ? sanitize_title( $color['name'] ) : $id;
+									?>
+									<div data-color-label="<?php echo esc_attr( $name ); ?>"
+										class="<?php echo esc_attr( 'so-row-color so-row-color-' . $name ); ?>{{% if( rowColorLabel == '<?php echo esc_attr( $name ); ?>' ) print(' so-row-color-selected'); %}}"
+										></div>
+									<?php
+								}
+								?>
+							</li>
+						<?php endif; ?>
 					</ul>
 					<div class="so-pointer"></div>
 				</div>