Skip to content

Commit

Permalink
7.11
Browse files Browse the repository at this point in the history
  • Loading branch information
chriscct7 committed Jul 1, 2020
1 parent 59650c5 commit 0b7aa3a
Show file tree
Hide file tree
Showing 85 changed files with 5,673 additions and 3,145 deletions.
26 changes: 18 additions & 8 deletions assets/css/admin-common.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
#toplevel_page_monsterinsights_reports .wp-menu-image img,
#toplevel_page_monsterinsights_settings .wp-menu-image img,
#toplevel_page_monsterinsights_network .wp-menu-image img {
width: 18px;
height: auto;
padding-top: 7px;
}

.monsterinsights-wooedd-upsell-left {
width: 50%;
display: table-cell;
Expand Down Expand Up @@ -54,3 +46,21 @@
display: none;
}
}

#wpadminbar .monsterinsights-menu-notification-indicator,
.monsterinsights-menu-notification-indicator {
width: 12px;
height: 12px;
border-radius: 50%;
background: #C84B29;
display: inline-block;
margin-left: 8px;
}

@media (max-width: 782px) {
#wpadminbar .monsterinsights-menu-notification-indicator {
margin: 0 0 10px -13px;
z-index: 10;
position: relative;
}
}
2 changes: 1 addition & 1 deletion assets/css/admin-common.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 23 additions & 8 deletions assets/lib/pandora/class-am-deactivation-survey.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public function __construct( $name = '', $plugin = '' ) {
add_action( 'admin_print_scripts', array( $this, 'css' ) );
add_action( 'admin_footer', array( $this, 'modal' ) );
}

/**
* Checks if current site is a development one.
*
Expand All @@ -70,13 +70,13 @@ public function is_dev_url() {
if ( defined ('AWESOMEMOTIVE_DEV_MODE' ) && AWESOMEMOTIVE_DEV_MODE ) {
return false;
}

$url = network_site_url( '/' );
$is_local_url = false;

// Trim it up
$url = strtolower( trim( $url ) );

// Need to get the host...so let's add the scheme so we can use parse_url
if ( false === strpos( $url, 'http://' ) && false === strpos( $url, 'https://' ) ) {
$url = 'http://' . $url;
Expand Down Expand Up @@ -316,7 +316,12 @@ public function modal() {
<div class="am-deactivate-survey-wrap">
<form class="am-deactivate-survey" method="post">
<span class="am-deactivate-survey-title"><span class="dashicons dashicons-testimonial"></span><?php echo ' ' . esc_html__( 'Quick Feedback', 'google-analytics-for-wordpress' ); ?></span>
<span class="am-deactivate-survey-desc"><?php echo sprintf( esc_html__('If you have a moment, please share why you are deactivating %s:', 'google-analytics-for-wordpress' ), $this->name ); ?></span>
<span class="am-deactivate-survey-desc">
<?php
// Translators: Placeholder for the plugin name.
echo sprintf( esc_html__('If you have a moment, please share why you are deactivating %s:', 'google-analytics-for-wordpress' ), $this->name );
?>
</span>
<div class="am-deactivate-survey-options">
<?php foreach ( $options as $id => $option ) : ?>
<div class="am-deactivate-survey-option">
Expand All @@ -331,13 +336,23 @@ public function modal() {
<?php endforeach; ?>
</div>
<div class="am-deactivate-survey-footer">
<button type="submit" class="am-deactivate-survey-submit button button-primary button-large"><?php echo sprintf( esc_html__('Submit %s Deactivate', 'google-analytics-for-wordpress' ), '&amp;' ); ?></button>
<a href="#" class="am-deactivate-survey-deactivate"><?php echo sprintf( esc_html__('Skip %s Deactivate', 'google-analytics-for-wordpress' ), '&amp;' ); ?></a>
<button type="submit" class="am-deactivate-survey-submit button button-primary button-large">
<?php
// Translators: Adds an ampersand.
echo sprintf( esc_html__('Submit %s Deactivate', 'google-analytics-for-wordpress' ), '&amp;' );
?>
</button>
<a href="#" class="am-deactivate-survey-deactivate">
<?php
// Translators: Adds an ampersand.
echo sprintf( esc_html__('Skip %s Deactivate', 'google-analytics-for-wordpress' ), '&amp;' );
?>
</a>
</div>
</form>
</div>
</div>
<?php
}
}
} // End if().
} // End if().
Loading

0 comments on commit 0b7aa3a

Please sign in to comment.