summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/jetpack/modules/widgets')
-rw-r--r--plugins/jetpack/modules/widgets/eu-cookie-law/style.css1
-rw-r--r--plugins/jetpack/modules/widgets/gallery.php7
-rw-r--r--plugins/jetpack/modules/widgets/goodreads.php7
-rw-r--r--plugins/jetpack/modules/widgets/migrate-to-core/image-widget.php10
-rw-r--r--plugins/jetpack/modules/widgets/social-media-icons/style.css2
5 files changed, 14 insertions, 13 deletions
diff --git a/plugins/jetpack/modules/widgets/eu-cookie-law/style.css b/plugins/jetpack/modules/widgets/eu-cookie-law/style.css
index 8610bbb8..b97f306d 100644
--- a/plugins/jetpack/modules/widgets/eu-cookie-law/style.css
+++ b/plugins/jetpack/modules/widgets/eu-cookie-law/style.css
@@ -1,4 +1,5 @@
.widget_eu_cookie_law_widget.widget {
+ border: none;
bottom: 1em;
display: none;
left: 1em;
diff --git a/plugins/jetpack/modules/widgets/gallery.php b/plugins/jetpack/modules/widgets/gallery.php
index c41498bf..1bab5569 100644
--- a/plugins/jetpack/modules/widgets/gallery.php
+++ b/plugins/jetpack/modules/widgets/gallery.php
@@ -417,11 +417,8 @@ class Jetpack_Gallery_Widget extends WP_Widget {
);
wp_localize_script( 'gallery-widget-admin', '_wpGalleryWidgetAdminSettings', $js_settings );
- if( is_rtl() ) {
- wp_enqueue_style( 'gallery-widget-admin', plugins_url( '/gallery/css/rtl/admin-rtl.css', __FILE__ ) );
- } else {
- wp_enqueue_style( 'gallery-widget-admin', plugins_url( '/gallery/css/admin.css', __FILE__ ) );
- }
+ wp_enqueue_style( 'gallery-widget-admin', plugins_url( '/gallery/css/admin.css', __FILE__ ) );
+ wp_style_add_data( 'gallery-widget-admin', 'rtl', 'replace' );
}
}
}
diff --git a/plugins/jetpack/modules/widgets/goodreads.php b/plugins/jetpack/modules/widgets/goodreads.php
index aa0d1ab5..2b823c23 100644
--- a/plugins/jetpack/modules/widgets/goodreads.php
+++ b/plugins/jetpack/modules/widgets/goodreads.php
@@ -42,11 +42,8 @@ class WPCOM_Widget_Goodreads extends WP_Widget {
}
function enqueue_style() {
- if ( is_rtl() ) {
- wp_enqueue_style( 'goodreads-widget', plugins_url( 'goodreads/css/rtl/goodreads-rtl.css', __FILE__ ) );
- } else {
- wp_enqueue_style( 'goodreads-widget', plugins_url( 'goodreads/css/goodreads.css', __FILE__ ) );
- }
+ wp_enqueue_style( 'goodreads-widget', plugins_url( 'goodreads/css/goodreads.css', __FILE__ ) );
+ wp_style_add_data( 'goodreads-widget', 'rtl', 'replace' );
}
function widget( $args, $instance ) {
diff --git a/plugins/jetpack/modules/widgets/migrate-to-core/image-widget.php b/plugins/jetpack/modules/widgets/migrate-to-core/image-widget.php
index 08a36181..e2a12ca8 100644
--- a/plugins/jetpack/modules/widgets/migrate-to-core/image-widget.php
+++ b/plugins/jetpack/modules/widgets/migrate-to-core/image-widget.php
@@ -198,16 +198,22 @@ function jetpack_migrate_image_widget() {
wp_set_sidebars_widgets( $sidebars_widgets );
- Jetpack_Options::update_option( 'image_widget_migration', true );
-
// We need to refresh on widgets page for changes to take effect.
add_action( 'current_screen', 'jetpack_refresh_on_widget_page' );
+ } else {
+ $widget_media_image = get_option( 'widget_media_image' );
+ if ( is_array( $widget_media_image ) ) {
+ delete_option( 'widget_image' );
+ }
}
+
+ Jetpack_Options::update_option( 'image_widget_migration', true );
}
add_action( 'widgets_init', 'jetpack_migrate_image_widget' );
function jetpack_refresh_on_widget_page( $current ) {
if ( 'widgets' === $current->base ) {
wp_safe_redirect( admin_url( 'widgets.php' ) );
+ exit;
}
}
diff --git a/plugins/jetpack/modules/widgets/social-media-icons/style.css b/plugins/jetpack/modules/widgets/social-media-icons/style.css
index b90c6faa..665d1c7d 100644
--- a/plugins/jetpack/modules/widgets/social-media-icons/style.css
+++ b/plugins/jetpack/modules/widgets/social-media-icons/style.css
@@ -3,7 +3,7 @@
margin-left: 0;
}
-.widget_wpcom_social_media_icons_widget li {
+.widget_wpcom_social_media_icons_widget ul li {
border: 0 none;
display: inline;
margin-right: 0.5em;