Merge with branch01 + update version/readme

This commit is contained in:
ruben- 2016-01-18 19:40:51 +01:00
parent 2281b39cc1
commit e182da8e01
6 changed files with 133 additions and 17 deletions

View file

@ -498,14 +498,14 @@ class MainWP_Child_Branding {
}
if ( ! empty( $header_css ) ) {
echo '<style>' . esc_html( $header_css ) . '</style>';
echo '<style>' . MainWP_Helper::parse_css( $header_css ) . '</style>';
}
}
function custom_login_css() {
$extra_setting = $this->settings['extra_settings'];
if ( is_array( $extra_setting ) && isset( $extra_setting['login_css'] ) && ! empty( $extra_setting['login_css'] ) ) {
echo '<style>' . esc_html( $extra_setting['login_css'] ) . '</style>';
echo '<style>' . MainWP_Helper::parse_css( $extra_setting['login_css'] ) . '</style>';
}
}
@ -658,7 +658,7 @@ class MainWP_Child_Branding {
<h2><?php echo esc_html( $this->settings['contact_support_label'] ); ?></h2>
<div style="height: auto; margin-bottom: 10px; text-align: left">
<p><?php echo esc_html( $support_message ); ?></p>
<p><?php echo wp_kses_post( $support_message ); ?></p>
<div style="max-width: 650px;">
<?php