Merge branch 'release/1.2.10'

siteorigin · Sep 10, 2020 · bd60061 · bd60061
2 parents 44c1b7a + 03f5759
commit bd60061
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/build b/build
diff --git a/css/admin.css b/css/admin.css
@@ -57,10 +57,10 @@
 #so-custom-css-info *:last-child {
   margin-bottom: 0;
 }
-#so-custom-css-info p.submit {
+#so-custom-css-info p.so-custom-css-submit {
   padding-top: 1px;
 }
-#so-custom-css-info p.submit .button-primary {
+#so-custom-css-info p.so-custom-css-submit .button-primary {
   font-size: 14px;
   min-height: 40px;
   width: 100%;

diff --git a/css/admin.less b/css/admin.less
@@ -75,7 +75,7 @@
 		margin-bottom: 0;
 	}
 
-	p.submit {
+	p.so-custom-css-submit {
 		padding-top: 1px;
 
 		.button-primary {

diff --git a/js/editor.js b/js/editor.js
@@ -373,7 +373,7 @@
 					$( '#siteorigin-custom-css' ).find( '> h2' ).outerHeight( true ) +
 					$form.find( '> .custom-css-toolbar' ).outerHeight( true ) +
 					$form.find( '> p.description' ).outerHeight( true ) +
-					$form.find( '> p.submit' ).outerHeight( true ) +
+					$form.find( '> p.so-custom-css-submit' ).outerHeight( true ) +
 					parseFloat( $( '#wpbody-content' ).css( 'padding-bottom' ) );
 				this.$el.find( '.CodeMirror-scroll' ).css( 'max-height', windowHeight - otherEltsHeight );
 				this.codeMirror.setSize( '100%', 'auto' );

diff --git a/readme.txt b/readme.txt
@@ -65,6 +65,9 @@ We offer free support on the [SiteOrigin support forums](https://siteorigin.com/
 
 == Changelog ==
 
+= 1.2.10 - 09 September 2020 =
+* Increased the specificity of the Save CSS button styling to prevent plugin conflicts.
+
 = 1.2.9 - 29 July 2020 =
 * Resolved Font Family field output.
 

diff --git a/tpl/page.php b/tpl/page.php
@@ -36,7 +36,7 @@
 
 	<div id="poststuff">
 		<div id="so-custom-css-info">
-			<p class="submit">
+			<p class="so-custom-css-submit">
 				<input type="submit" name="siteorigin_custom_css_save" class="button-primary" value="<?php esc_attr_e( $save_button_label ); ?>" />
 			</p>