diff options
Diffstat (limited to 'plugins/jetpack/modules/sharedaddy')
10 files changed, 293 insertions, 79 deletions
diff --git a/plugins/jetpack/modules/sharedaddy/admin-sharing-rtl.css b/plugins/jetpack/modules/sharedaddy/admin-sharing-rtl.css index f4e1b366..a0f428af 100644 --- a/plugins/jetpack/modules/sharedaddy/admin-sharing-rtl.css +++ b/plugins/jetpack/modules/sharedaddy/admin-sharing-rtl.css @@ -101,7 +101,7 @@ li.service span:before { color: #555; display: inline-block; -webkit-font-smoothing: antialiased; - font: normal 16px/1 'Noticons', 'Genericons'; + font: normal 18px/1 'social-logos'; vertical-align: top; position: relative; top: 1px; @@ -134,9 +134,6 @@ li.service.share-tumblr span:before { li.service.share-pocket span:before { content: '\f224'; } -li.service.share-skype span:before { - content: '\f220'; -} li.service.share-pinterest span:before { content: '\f209'; } @@ -144,12 +141,20 @@ li.service.share-google-plus-1 span:before { content: '\f218'; } li.service.share-facebook span:before { - content: '\f204'; + content: '\f203'; } li.service.share-press-this span:before { /* Fixme: remove this button in favor of reblog */ content: '\f205'; } - +li.service.share-telegram span:before { + content: '\f606'; +} +li.service.share-jetpack-whatsapp span:before { + content: '\f608'; +} +li.service.share-skype span:before { + content: '\f220'; +} /** * Preview section @@ -311,8 +316,7 @@ body.settings_page_sharing .advanced input[type=submit] { background: url(images/linkedin-smart.png) no-repeat top center; background-size: 99px 18px; width:99px; - height:18px; - margin-top: 1px; + height:20px; } .preview-google-plus-1 .option-smart-on { @@ -349,7 +353,49 @@ body.settings_page_sharing .advanced input[type=submit] { width: 60px; height: 20px; } +@media +(-webkit-min-device-pixel-ratio: 1.25), +(min-resolution: 120dpi) { + .preview-digg .option-smart-on { + background-image: url(images/smart-digg@2x.png); + } + .preview-reddit .option-smart-on { + background-image: url(images/smart-reddit@2x.png); + } + + .preview-facebook .option-smart-on { + background-image: url(images/smart-like@2x.png); + } + + .preview-twitter .option-smart-on { + background-image: url(images/smart-twitter@2x.png?1); + } + + .preview-linkedin .option-smart-on { + background-image: url(images/linkedin-smart@2x.png); + } + + .preview-google-plus-1 .option-smart-on { + background-image: url(images/smart-googleplus1@2x.png); + } + + .preview-tumblr .option-smart-on { + background-image: url(images/smart-tumblr@2x.png); + } + + .preview-pinterest .option-smart-on { + background-image: url(images/smart-pinterest@2x.png); + } + + .preview-pocket .option-smart-on { + background-image: url(images/smart-pocket@2x.png); + } + + .preview-skype .option-smart-on { + background-image: url(images/smart-skype@2x.png); + } +} /** * Overflow sharing dialog diff --git a/plugins/jetpack/modules/sharedaddy/admin-sharing-rtl.min.css b/plugins/jetpack/modules/sharedaddy/admin-sharing-rtl.min.css index 1807d0a6..0b56d04a 100644 --- a/plugins/jetpack/modules/sharedaddy/admin-sharing-rtl.min.css +++ b/plugins/jetpack/modules/sharedaddy/admin-sharing-rtl.min.css @@ -1 +1 @@ -#services-config{min-width:700px;width:100%;float:right}#services-config h3{font-weight:400;font-size:15px;margin:0;padding:8px 10px;overflow:hidden;white-space:nowrap;color:#464646}#available-services,#enabled-services,#live-preview{padding:20px 0 0;width:100%;border-spacing:0}#enabled-services .ui-sortable{min-height:50px}#enabled-services{padding-bottom:20px}#available-services,#enabled-services{border-bottom:2px solid #ccc}#live-preview{border-bottom:1px solid #dfdfdf;padding-bottom:60px}#available-services h3,#enabled-services h3,#live-preview h3{padding:0;margin-top:0;margin-bottom:1em}body.settings_page_sharing .description{width:180px;vertical-align:top}body.settings_page_sharing .description p{font-size:13px;font-style:italic}body.settings_page_sharing .services{padding:0 20px;vertical-align:top}body.settings_page_sharing .services ul li{float:right;cursor:move}body.settings_page_sharing .services ul li.divider{border:none;padding:0;background:0 0;cursor:default}body.settings_page_sharing ul.services-hidden{margin-bottom:0}#available-services .service,#enabled-services .service{margin-left:10px;padding:5px 5px 5px 10px;border-radius:3px;border:1px solid #bbb;background:center center no-repeat #f8f8f8}#available-services .service:hover,#enabled-services .service:hover{background:#fff;border:1px solid #bbb;box-shadow:0 1px 3px rgba(0,0,0,.2)}li.service span:before{color:#555;display:inline-block;-webkit-font-smoothing:antialiased;font:400 16px/1 Noticons,Genericons;vertical-align:top;position:relative;top:1px;margin-left:3px;width:16px;height:16px;text-align:center}li.service.share-print span:before{content:'\f469'}li.service.share-digg span:before{content:'\f221'}li.service.share-email span:before{content:'\f410'}li.service.share-linkedin span:before{content:'\f207'}li.service.share-twitter span:before{content:'\f202'}li.service.share-reddit span:before{content:'\f222'}li.service.share-tumblr span:before{content:'\f214'}li.service.share-pocket span:before{content:'\f224'}li.service.share-skype span:before{content:'\f220'}li.service.share-pinterest span:before{content:'\f209'}li.service.share-google-plus-1 span:before{content:'\f218'}li.service.share-facebook span:before{content:'\f204'}li.service.share-press-this span:before{content:'\f205'}body.settings_page_sharing ul.preview{float:right;margin:0}body.settings_page_sharing ul.preview li.preview-item,body.settings_page_sharing ul.preview li.preview-item a{cursor:default;text-decoration:none}div.sd-social-icon .inner li.preview-item a span,div.sd-social-icon ul.preview li.preview-item a span{display:none}div.sd-social-icon ul.preview li.preview-item.preview-custom a span{display:inline-block}.services .preview li.share-custom a{text-decoration:none}.services ul li.end-fix{clear:both;float:none;visibility:hidden;padding:0;margin:0;height:20px;width:0}#enabled-services h2{font-size:20px;padding-top:0;font-weight:400!important;color:#999}body.settings_page_sharing #live-preview h2{font-size:20px;font-weight:400!important;color:#e3e3e3}body.settings_page_sharing .clearing{clear:both}body.settings_page_sharing .options .options-left{float:right}body.settings_page_sharing .input label{font-size:11px;line-height:16px}body.settings_page_sharing .advanced-form{padding:10px 10px 8px 14px;margin-right:-24px;display:none;border-top:1px #e3e3e3 solid;margin-top:4px}body.settings_page_sharing .utility{float:left;padding-top:10px;padding-left:10px;font-size:10px}body.settings_page_sharing .advanced input[type=submit]{float:right;margin-top:10px;margin-left:10px}.services li.dropzone{border:1px dashed #999;border-radius:3px;background:#e3e3e3;margin-left:10px;padding:5px;height:18px}.advanced-form .form-table th{width:auto!important}.advanced-form .button-secondary{margin-top:0!important}#hidden-drop-target{background:#e1e1e1;border:1px solid #cdcdcd;width:29%;padding:10px;vertical-align:top}#hidden-drop-target p{font-size:13px;font-style:italic;margin:0 0 10px}.preview li.preview-item{background-position:0 5px;cursor:default}.preview .option-smart-on{margin:3px 0 0 5px}.preview-digg .option-smart-on{background:url(images/smart-digg.png) top right/76px 17px no-repeat;width:76px;height:17px;margin-top:2px}.preview-reddit .option-smart-on{background:url(images/smart-reddit.png) top right/104px 21px no-repeat;width:104px;height:21px}.preview-facebook .option-smart-on{background:url(images/smart-like.png) top right/85px 20px no-repeat;width:85px;height:20px}.preview-twitter .option-smart-on{background:url(images/smart-twitter.png?1) top right/60px 20px no-repeat;width:60px;height:20px}.preview-linkedin .option-smart-on{background:url(images/linkedin-smart.png) top center/99px 18px no-repeat;width:99px;height:18px;margin-top:1px}.preview-google-plus-1 .option-smart-on{background:url(images/smart-googleplus1.png) top right/96px 20px no-repeat;width:96px;height:20px}.preview-tumblr .option-smart-on{background:url(images/smart-tumblr.png) top right/62px 20px no-repeat;width:62px;height:20px}.preview-pinterest .option-smart-on{background:url(images/smart-pinterest.png) top right/39px 20px no-repeat;width:39px;height:20px}.preview-pocket .option-smart-on{background:url(images/smart-pocket.png) top right/60px 20px no-repeat;width:60px;height:20px}.preview-skype .option-smart-on{background:url(images/smart-skype.png) top right/60px 20px no-repeat;width:60px;height:20px}.services .sharing-hidden li{background-color:transparent}.sharing-hidden li.share-end{clear:both;height:0;padding:0!important;margin:0!important;width:0;visibility:hidden;float:none}.preview .sharing-label{font-weight:700;border:0;padding:4px 0 0 6px}#services-config a.remove{background:#ddd;color:#fff;padding:0 4px 2px;border-radius:15px;-moz-border-radius:15px;-webkit-border-radius:15px;text-decoration:none;font-weight:700;font-size:10px}#services-config a.remove:hover{background:red}.sd-social-icon .inner a.sd-button span,.sd-social-icon .inner a.share-icon span{display:inline-block;overflow:hidden;width:0;text-indent:100%}
\ No newline at end of file +#services-config{min-width:700px;width:100%;float:right}#services-config h3{font-weight:400;font-size:15px;margin:0;padding:8px 10px;overflow:hidden;white-space:nowrap;color:#464646}#available-services,#enabled-services,#live-preview{padding:20px 0 0;width:100%;border-spacing:0}#enabled-services .ui-sortable{min-height:50px}#enabled-services{padding-bottom:20px}#available-services,#enabled-services{border-bottom:2px solid #ccc}#live-preview{border-bottom:1px solid #dfdfdf;padding-bottom:60px}#available-services h3,#enabled-services h3,#live-preview h3{padding:0;margin-top:0;margin-bottom:1em}body.settings_page_sharing .description{width:180px;vertical-align:top}body.settings_page_sharing .description p{font-size:13px;font-style:italic}body.settings_page_sharing .services{padding:0 20px;vertical-align:top}body.settings_page_sharing .services ul li{float:right;cursor:move}body.settings_page_sharing .services ul li.divider{border:none;padding:0;background:0 0;cursor:default}body.settings_page_sharing ul.services-hidden{margin-bottom:0}#available-services .service,#enabled-services .service{margin-left:10px;padding:5px 5px 5px 10px;border-radius:3px;border:1px solid #bbb;background:center center no-repeat #f8f8f8}#available-services .service:hover,#enabled-services .service:hover{background:#fff;border:1px solid #bbb;box-shadow:0 1px 3px rgba(0,0,0,.2)}li.service span:before{color:#555;display:inline-block;-webkit-font-smoothing:antialiased;font:400 18px/1 social-logos;vertical-align:top;position:relative;top:1px;margin-left:3px;width:16px;height:16px;text-align:center}li.service.share-print span:before{content:'\f469'}li.service.share-digg span:before{content:'\f221'}li.service.share-email span:before{content:'\f410'}li.service.share-linkedin span:before{content:'\f207'}li.service.share-twitter span:before{content:'\f202'}li.service.share-reddit span:before{content:'\f222'}li.service.share-tumblr span:before{content:'\f214'}li.service.share-pocket span:before{content:'\f224'}li.service.share-pinterest span:before{content:'\f209'}li.service.share-google-plus-1 span:before{content:'\f218'}li.service.share-facebook span:before{content:'\f203'}li.service.share-press-this span:before{content:'\f205'}li.service.share-telegram span:before{content:'\f606'}li.service.share-jetpack-whatsapp span:before{content:'\f608'}li.service.share-skype span:before{content:'\f220'}body.settings_page_sharing ul.preview{float:right;margin:0}body.settings_page_sharing ul.preview li.preview-item,body.settings_page_sharing ul.preview li.preview-item a{cursor:default;text-decoration:none}div.sd-social-icon .inner li.preview-item a span,div.sd-social-icon ul.preview li.preview-item a span{display:none}div.sd-social-icon ul.preview li.preview-item.preview-custom a span{display:inline-block}.services .preview li.share-custom a{text-decoration:none}.services ul li.end-fix{clear:both;float:none;visibility:hidden;padding:0;margin:0;height:20px;width:0}#enabled-services h2{font-size:20px;padding-top:0;font-weight:400!important;color:#999}body.settings_page_sharing #live-preview h2{font-size:20px;font-weight:400!important;color:#e3e3e3}body.settings_page_sharing .clearing{clear:both}body.settings_page_sharing .options .options-left{float:right}body.settings_page_sharing .input label{font-size:11px;line-height:16px}body.settings_page_sharing .advanced-form{padding:10px 10px 8px 14px;margin-right:-24px;display:none;border-top:1px #e3e3e3 solid;margin-top:4px}body.settings_page_sharing .utility{float:left;padding-top:10px;padding-left:10px;font-size:10px}body.settings_page_sharing .advanced input[type=submit]{float:right;margin-top:10px;margin-left:10px}.services li.dropzone{border:1px dashed #999;border-radius:3px;background:#e3e3e3;margin-left:10px;padding:5px;height:18px}.advanced-form .form-table th{width:auto!important}.advanced-form .button-secondary{margin-top:0!important}#hidden-drop-target{background:#e1e1e1;border:1px solid #cdcdcd;width:29%;padding:10px;vertical-align:top}#hidden-drop-target p{font-size:13px;font-style:italic;margin:0 0 10px}.preview li.preview-item{background-position:0 5px;cursor:default}.preview .option-smart-on{margin:3px 0 0 5px}.preview-digg .option-smart-on{background:url(images/smart-digg.png) top right/76px 17px no-repeat;width:76px;height:17px;margin-top:2px}.preview-reddit .option-smart-on{background:url(images/smart-reddit.png) top right/104px 21px no-repeat;width:104px;height:21px}.preview-facebook .option-smart-on{background:url(images/smart-like.png) top right/85px 20px no-repeat;width:85px;height:20px}.preview-twitter .option-smart-on{background:url(images/smart-twitter.png?1) top right/60px 20px no-repeat;width:60px;height:20px}.preview-linkedin .option-smart-on{background:url(images/linkedin-smart.png) top center/99px 18px no-repeat;width:99px;height:20px}.preview-google-plus-1 .option-smart-on{background:url(images/smart-googleplus1.png) top right/96px 20px no-repeat;width:96px;height:20px}.preview-tumblr .option-smart-on{background:url(images/smart-tumblr.png) top right/62px 20px no-repeat;width:62px;height:20px}.preview-pinterest .option-smart-on{background:url(images/smart-pinterest.png) top right/39px 20px no-repeat;width:39px;height:20px}.preview-pocket .option-smart-on{background:url(images/smart-pocket.png) top right/60px 20px no-repeat;width:60px;height:20px}.preview-skype .option-smart-on{background:url(images/smart-skype.png) top right/60px 20px no-repeat;width:60px;height:20px}@media (-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.preview-digg .option-smart-on{background-image:url(images/smart-digg@2x.png)}.preview-reddit .option-smart-on{background-image:url(images/smart-reddit@2x.png)}.preview-facebook .option-smart-on{background-image:url(images/smart-like@2x.png)}.preview-twitter .option-smart-on{background-image:url(images/smart-twitter@2x.png?1)}.preview-linkedin .option-smart-on{background-image:url(images/linkedin-smart@2x.png)}.preview-google-plus-1 .option-smart-on{background-image:url(images/smart-googleplus1@2x.png)}.preview-tumblr .option-smart-on{background-image:url(images/smart-tumblr@2x.png)}.preview-pinterest .option-smart-on{background-image:url(images/smart-pinterest@2x.png)}.preview-pocket .option-smart-on{background-image:url(images/smart-pocket@2x.png)}.preview-skype .option-smart-on{background-image:url(images/smart-skype@2x.png)}}.services .sharing-hidden li{background-color:transparent}.sharing-hidden li.share-end{clear:both;height:0;padding:0!important;margin:0!important;width:0;visibility:hidden;float:none}.preview .sharing-label{font-weight:700;border:0;padding:4px 0 0 6px}#services-config a.remove{background:#ddd;color:#fff;padding:0 4px 2px;border-radius:15px;-moz-border-radius:15px;-webkit-border-radius:15px;text-decoration:none;font-weight:700;font-size:10px}#services-config a.remove:hover{background:red}.sd-social-icon .inner a.sd-button span,.sd-social-icon .inner a.share-icon span{display:inline-block;overflow:hidden;width:0;text-indent:100%}
\ No newline at end of file diff --git a/plugins/jetpack/modules/sharedaddy/admin-sharing.css b/plugins/jetpack/modules/sharedaddy/admin-sharing.css index c61df08e..3702d08c 100644 --- a/plugins/jetpack/modules/sharedaddy/admin-sharing.css +++ b/plugins/jetpack/modules/sharedaddy/admin-sharing.css @@ -101,7 +101,7 @@ li.service span:before { color: #555; display: inline-block; -webkit-font-smoothing: antialiased; - font: normal 16px/1 'Noticons', 'Genericons'; + font: normal 18px/1 'social-logos'; vertical-align: top; position: relative; top: 1px; @@ -134,9 +134,6 @@ li.service.share-tumblr span:before { li.service.share-pocket span:before { content: '\f224'; } -li.service.share-skype span:before { - content: '\f220'; -} li.service.share-pinterest span:before { content: '\f209'; } @@ -144,12 +141,20 @@ li.service.share-google-plus-1 span:before { content: '\f218'; } li.service.share-facebook span:before { - content: '\f204'; + content: '\f203'; } li.service.share-press-this span:before { /* Fixme: remove this button in favor of reblog */ content: '\f205'; } - +li.service.share-telegram span:before { + content: '\f606'; +} +li.service.share-jetpack-whatsapp span:before { + content: '\f608'; +} +li.service.share-skype span:before { + content: '\f220'; +} /** * Preview section @@ -311,8 +316,7 @@ body.settings_page_sharing .advanced input[type=submit] { background: url(images/linkedin-smart.png) no-repeat top center; background-size: 99px 18px; width:99px; - height:18px; - margin-top: 1px; + height:20px; } .preview-google-plus-1 .option-smart-on { @@ -349,7 +353,49 @@ body.settings_page_sharing .advanced input[type=submit] { width: 60px; height: 20px; } +@media +(-webkit-min-device-pixel-ratio: 1.25), +(min-resolution: 120dpi) { + .preview-digg .option-smart-on { + background-image: url(images/smart-digg@2x.png); + } + .preview-reddit .option-smart-on { + background-image: url(images/smart-reddit@2x.png); + } + + .preview-facebook .option-smart-on { + background-image: url(images/smart-like@2x.png); + } + + .preview-twitter .option-smart-on { + background-image: url(images/smart-twitter@2x.png?1); + } + + .preview-linkedin .option-smart-on { + background-image: url(images/linkedin-smart@2x.png); + } + + .preview-google-plus-1 .option-smart-on { + background-image: url(images/smart-googleplus1@2x.png); + } + + .preview-tumblr .option-smart-on { + background-image: url(images/smart-tumblr@2x.png); + } + + .preview-pinterest .option-smart-on { + background-image: url(images/smart-pinterest@2x.png); + } + + .preview-pocket .option-smart-on { + background-image: url(images/smart-pocket@2x.png); + } + + .preview-skype .option-smart-on { + background-image: url(images/smart-skype@2x.png); + } +} /** * Overflow sharing dialog diff --git a/plugins/jetpack/modules/sharedaddy/admin-sharing.js b/plugins/jetpack/modules/sharedaddy/admin-sharing.js index ad30eb6f..831c96a2 100644 --- a/plugins/jetpack/modules/sharedaddy/admin-sharing.js +++ b/plugins/jetpack/modules/sharedaddy/admin-sharing.js @@ -123,7 +123,12 @@ $( '#live-preview div.sharedaddy' ).addClass( 'sd-social-icon' ); } else if ( 'official' === button_style ) { $( '#live-preview ul.preview .advanced, .sharing-hidden .inner ul .advanced' ).each( function( /*i*/ ) { - if ( !$( this ).hasClass( 'preview-press-this' ) && !$( this ).hasClass( 'preview-email' ) && !$( this ).hasClass( 'preview-print' ) && !$( this ).hasClass( 'share-custom' ) ) { + if ( !$( this ).hasClass( 'preview-press-this' ) && + !$( this ).hasClass( 'preview-email' ) && + !$( this ).hasClass( 'preview-print' ) && + !$( this ).hasClass( 'preview-telegram' ) && + !$( this ).hasClass( 'preview-jetpack-whatsapp' ) && + !$( this ).hasClass( 'share-custom' ) ) { $( this ).find( '.option a span' ).html( '' ).parent().removeClass( 'sd-button' ).parent().attr( 'class', 'option option-smart-on' ); } } ); @@ -287,15 +292,15 @@ $( '.service' ).on( 'keydown', function ( e ) { // Reposition if one of the directional keys is pressed - switch ( e.keyCode ) { - case 13: keyboardDragDrop( $( this ) ); break; // Enter - case 32: keyboardDragDrop( $( this ) ); break; // Space - case 37: keyboardChangeOrder( $( this ), 'left' ); break; // Left - case 39: keyboardChangeOrder( $( this ), 'right' ); break; // Right - default: return true; // Exit and bubble - } - - e.preventDefault(); + switch ( e.keyCode ) { + case 13: keyboardDragDrop( $( this ) ); break; // Enter + case 32: keyboardDragDrop( $( this ) ); break; // Space + case 37: keyboardChangeOrder( $( this ), 'left' ); break; // Left + case 39: keyboardChangeOrder( $( this ), 'right' ); break; // Right + default: return true; // Exit and bubble + } + + e.preventDefault(); }); function keyboardChangeOrder( $this, dir ) { @@ -346,7 +351,7 @@ // Add focus nextSibling.next().focus(); } - + //Save changes save_services(); } @@ -370,7 +375,7 @@ // Move it to the appropriate area and add focus back to service $( '.' + dropzone ).prepend( thisService ).find( 'li:first-child' ).focus(); - + //Save changes save_services(); } diff --git a/plugins/jetpack/modules/sharedaddy/admin-sharing.min.css b/plugins/jetpack/modules/sharedaddy/admin-sharing.min.css index ca0413da..b0e172c2 100644 --- a/plugins/jetpack/modules/sharedaddy/admin-sharing.min.css +++ b/plugins/jetpack/modules/sharedaddy/admin-sharing.min.css @@ -1 +1 @@ -#services-config{min-width:700px;width:100%;float:left}#services-config h3{font-weight:400;font-size:15px;margin:0;padding:8px 10px;overflow:hidden;white-space:nowrap;color:#464646}#available-services,#enabled-services,#live-preview{padding:20px 0 0;width:100%;border-spacing:0}#enabled-services .ui-sortable{min-height:50px}#enabled-services{padding-bottom:20px}#available-services,#enabled-services{border-bottom:2px solid #ccc}#live-preview{border-bottom:1px solid #dfdfdf;padding-bottom:60px}#available-services h3,#enabled-services h3,#live-preview h3{padding:0;margin-top:0;margin-bottom:1em}body.settings_page_sharing .description{width:180px;vertical-align:top}body.settings_page_sharing .description p{font-size:13px;font-style:italic}body.settings_page_sharing .services{padding:0 20px;vertical-align:top}body.settings_page_sharing .services ul li{float:left;cursor:move}body.settings_page_sharing .services ul li.divider{border:none;padding:0;background:0 0;cursor:default}body.settings_page_sharing ul.services-hidden{margin-bottom:0}#available-services .service,#enabled-services .service{margin-right:10px;padding:5px 10px 5px 5px;border-radius:3px;border:1px solid #bbb;background:center center no-repeat #f8f8f8}#available-services .service:hover,#enabled-services .service:hover{background:#fff;border:1px solid #bbb;box-shadow:0 1px 3px rgba(0,0,0,.2)}li.service span:before{color:#555;display:inline-block;-webkit-font-smoothing:antialiased;font:400 16px/1 Noticons,Genericons;vertical-align:top;position:relative;top:1px;margin-right:3px;width:16px;height:16px;text-align:center}li.service.share-print span:before{content:'\f469'}li.service.share-digg span:before{content:'\f221'}li.service.share-email span:before{content:'\f410'}li.service.share-linkedin span:before{content:'\f207'}li.service.share-twitter span:before{content:'\f202'}li.service.share-reddit span:before{content:'\f222'}li.service.share-tumblr span:before{content:'\f214'}li.service.share-pocket span:before{content:'\f224'}li.service.share-skype span:before{content:'\f220'}li.service.share-pinterest span:before{content:'\f209'}li.service.share-google-plus-1 span:before{content:'\f218'}li.service.share-facebook span:before{content:'\f204'}li.service.share-press-this span:before{content:'\f205'}body.settings_page_sharing ul.preview{float:left;margin:0}body.settings_page_sharing ul.preview li.preview-item,body.settings_page_sharing ul.preview li.preview-item a{cursor:default;text-decoration:none}div.sd-social-icon .inner li.preview-item a span,div.sd-social-icon ul.preview li.preview-item a span{display:none}div.sd-social-icon ul.preview li.preview-item.preview-custom a span{display:inline-block}.services .preview li.share-custom a{text-decoration:none}.services ul li.end-fix{clear:both;float:none;visibility:hidden;padding:0;margin:0;height:20px;width:0}#enabled-services h2{font-size:20px;padding-top:0;font-weight:400!important;color:#999}body.settings_page_sharing #live-preview h2{font-size:20px;font-weight:400!important;color:#e3e3e3}body.settings_page_sharing .clearing{clear:both}body.settings_page_sharing .options .options-left{float:left}body.settings_page_sharing .input label{font-size:11px;line-height:16px}body.settings_page_sharing .advanced-form{padding:10px 14px 8px 10px;margin-left:-24px;display:none;border-top:1px #e3e3e3 solid;margin-top:4px}body.settings_page_sharing .utility{float:right;padding-top:10px;padding-right:10px;font-size:10px}body.settings_page_sharing .advanced input[type=submit]{float:left;margin-top:10px;margin-right:10px}.services li.dropzone{border:1px dashed #999;border-radius:3px;background:#e3e3e3;margin-right:10px;padding:5px;height:18px}.advanced-form .form-table th{width:auto!important}.advanced-form .button-secondary{margin-top:0!important}#hidden-drop-target{background:#e1e1e1;border:1px solid #cdcdcd;width:29%;padding:10px;vertical-align:top}#hidden-drop-target p{font-size:13px;font-style:italic;margin:0 0 10px}.preview li.preview-item{background-position:0 5px;cursor:default}.preview .option-smart-on{margin:3px 5px 0 0}.preview-digg .option-smart-on{background:url(images/smart-digg.png) top left/76px 17px no-repeat;width:76px;height:17px;margin-top:2px}.preview-reddit .option-smart-on{background:url(images/smart-reddit.png) top left/104px 21px no-repeat;width:104px;height:21px}.preview-facebook .option-smart-on{background:url(images/smart-like.png) top left/85px 20px no-repeat;width:85px;height:20px}.preview-twitter .option-smart-on{background:url(images/smart-twitter.png?1) top left/60px 20px no-repeat;width:60px;height:20px}.preview-linkedin .option-smart-on{background:url(images/linkedin-smart.png) top center/99px 18px no-repeat;width:99px;height:18px;margin-top:1px}.preview-google-plus-1 .option-smart-on{background:url(images/smart-googleplus1.png) top left/96px 20px no-repeat;width:96px;height:20px}.preview-tumblr .option-smart-on{background:url(images/smart-tumblr.png) top left/62px 20px no-repeat;width:62px;height:20px}.preview-pinterest .option-smart-on{background:url(images/smart-pinterest.png) top left/39px 20px no-repeat;width:39px;height:20px}.preview-pocket .option-smart-on{background:url(images/smart-pocket.png) top left/60px 20px no-repeat;width:60px;height:20px}.preview-skype .option-smart-on{background:url(images/smart-skype.png) top left/60px 20px no-repeat;width:60px;height:20px}.services .sharing-hidden li{background-color:transparent}.sharing-hidden li.share-end{clear:both;height:0;padding:0!important;margin:0!important;width:0;visibility:hidden;float:none}.preview .sharing-label{font-weight:700;border:0;padding:4px 6px 0 0}#services-config a.remove{background:#ddd;color:#fff;padding:0 4px 2px;border-radius:15px;-moz-border-radius:15px;-webkit-border-radius:15px;text-decoration:none;font-weight:700;font-size:10px}#services-config a.remove:hover{background:red}.sd-social-icon .inner a.sd-button span,.sd-social-icon .inner a.share-icon span{display:inline-block;overflow:hidden;width:0;text-indent:100%}
\ No newline at end of file +#services-config{min-width:700px;width:100%;float:left}#services-config h3{font-weight:400;font-size:15px;margin:0;padding:8px 10px;overflow:hidden;white-space:nowrap;color:#464646}#available-services,#enabled-services,#live-preview{padding:20px 0 0;width:100%;border-spacing:0}#enabled-services .ui-sortable{min-height:50px}#enabled-services{padding-bottom:20px}#available-services,#enabled-services{border-bottom:2px solid #ccc}#live-preview{border-bottom:1px solid #dfdfdf;padding-bottom:60px}#available-services h3,#enabled-services h3,#live-preview h3{padding:0;margin-top:0;margin-bottom:1em}body.settings_page_sharing .description{width:180px;vertical-align:top}body.settings_page_sharing .description p{font-size:13px;font-style:italic}body.settings_page_sharing .services{padding:0 20px;vertical-align:top}body.settings_page_sharing .services ul li{float:left;cursor:move}body.settings_page_sharing .services ul li.divider{border:none;padding:0;background:0 0;cursor:default}body.settings_page_sharing ul.services-hidden{margin-bottom:0}#available-services .service,#enabled-services .service{margin-right:10px;padding:5px 10px 5px 5px;border-radius:3px;border:1px solid #bbb;background:center center no-repeat #f8f8f8}#available-services .service:hover,#enabled-services .service:hover{background:#fff;border:1px solid #bbb;box-shadow:0 1px 3px rgba(0,0,0,.2)}li.service span:before{color:#555;display:inline-block;-webkit-font-smoothing:antialiased;font:400 18px/1 social-logos;vertical-align:top;position:relative;top:1px;margin-right:3px;width:16px;height:16px;text-align:center}li.service.share-print span:before{content:'\f469'}li.service.share-digg span:before{content:'\f221'}li.service.share-email span:before{content:'\f410'}li.service.share-linkedin span:before{content:'\f207'}li.service.share-twitter span:before{content:'\f202'}li.service.share-reddit span:before{content:'\f222'}li.service.share-tumblr span:before{content:'\f214'}li.service.share-pocket span:before{content:'\f224'}li.service.share-pinterest span:before{content:'\f209'}li.service.share-google-plus-1 span:before{content:'\f218'}li.service.share-facebook span:before{content:'\f203'}li.service.share-press-this span:before{content:'\f205'}li.service.share-telegram span:before{content:'\f606'}li.service.share-jetpack-whatsapp span:before{content:'\f608'}li.service.share-skype span:before{content:'\f220'}body.settings_page_sharing ul.preview{float:left;margin:0}body.settings_page_sharing ul.preview li.preview-item,body.settings_page_sharing ul.preview li.preview-item a{cursor:default;text-decoration:none}div.sd-social-icon .inner li.preview-item a span,div.sd-social-icon ul.preview li.preview-item a span{display:none}div.sd-social-icon ul.preview li.preview-item.preview-custom a span{display:inline-block}.services .preview li.share-custom a{text-decoration:none}.services ul li.end-fix{clear:both;float:none;visibility:hidden;padding:0;margin:0;height:20px;width:0}#enabled-services h2{font-size:20px;padding-top:0;font-weight:400!important;color:#999}body.settings_page_sharing #live-preview h2{font-size:20px;font-weight:400!important;color:#e3e3e3}body.settings_page_sharing .clearing{clear:both}body.settings_page_sharing .options .options-left{float:left}body.settings_page_sharing .input label{font-size:11px;line-height:16px}body.settings_page_sharing .advanced-form{padding:10px 14px 8px 10px;margin-left:-24px;display:none;border-top:1px #e3e3e3 solid;margin-top:4px}body.settings_page_sharing .utility{float:right;padding-top:10px;padding-right:10px;font-size:10px}body.settings_page_sharing .advanced input[type=submit]{float:left;margin-top:10px;margin-right:10px}.services li.dropzone{border:1px dashed #999;border-radius:3px;background:#e3e3e3;margin-right:10px;padding:5px;height:18px}.advanced-form .form-table th{width:auto!important}.advanced-form .button-secondary{margin-top:0!important}#hidden-drop-target{background:#e1e1e1;border:1px solid #cdcdcd;width:29%;padding:10px;vertical-align:top}#hidden-drop-target p{font-size:13px;font-style:italic;margin:0 0 10px}.preview li.preview-item{background-position:0 5px;cursor:default}.preview .option-smart-on{margin:3px 5px 0 0}.preview-digg .option-smart-on{background:url(images/smart-digg.png) top left/76px 17px no-repeat;width:76px;height:17px;margin-top:2px}.preview-reddit .option-smart-on{background:url(images/smart-reddit.png) top left/104px 21px no-repeat;width:104px;height:21px}.preview-facebook .option-smart-on{background:url(images/smart-like.png) top left/85px 20px no-repeat;width:85px;height:20px}.preview-twitter .option-smart-on{background:url(images/smart-twitter.png?1) top left/60px 20px no-repeat;width:60px;height:20px}.preview-linkedin .option-smart-on{background:url(images/linkedin-smart.png) top center/99px 18px no-repeat;width:99px;height:20px}.preview-google-plus-1 .option-smart-on{background:url(images/smart-googleplus1.png) top left/96px 20px no-repeat;width:96px;height:20px}.preview-tumblr .option-smart-on{background:url(images/smart-tumblr.png) top left/62px 20px no-repeat;width:62px;height:20px}.preview-pinterest .option-smart-on{background:url(images/smart-pinterest.png) top left/39px 20px no-repeat;width:39px;height:20px}.preview-pocket .option-smart-on{background:url(images/smart-pocket.png) top left/60px 20px no-repeat;width:60px;height:20px}.preview-skype .option-smart-on{background:url(images/smart-skype.png) top left/60px 20px no-repeat;width:60px;height:20px}@media (-webkit-min-device-pixel-ratio:1.25),(min-resolution:120dpi){.preview-digg .option-smart-on{background-image:url(images/smart-digg@2x.png)}.preview-reddit .option-smart-on{background-image:url(images/smart-reddit@2x.png)}.preview-facebook .option-smart-on{background-image:url(images/smart-like@2x.png)}.preview-twitter .option-smart-on{background-image:url(images/smart-twitter@2x.png?1)}.preview-linkedin .option-smart-on{background-image:url(images/linkedin-smart@2x.png)}.preview-google-plus-1 .option-smart-on{background-image:url(images/smart-googleplus1@2x.png)}.preview-tumblr .option-smart-on{background-image:url(images/smart-tumblr@2x.png)}.preview-pinterest .option-smart-on{background-image:url(images/smart-pinterest@2x.png)}.preview-pocket .option-smart-on{background-image:url(images/smart-pocket@2x.png)}.preview-skype .option-smart-on{background-image:url(images/smart-skype@2x.png)}}.services .sharing-hidden li{background-color:transparent}.sharing-hidden li.share-end{clear:both;height:0;padding:0!important;margin:0!important;width:0;visibility:hidden;float:none}.preview .sharing-label{font-weight:700;border:0;padding:4px 6px 0 0}#services-config a.remove{background:#ddd;color:#fff;padding:0 4px 2px;border-radius:15px;-moz-border-radius:15px;-webkit-border-radius:15px;text-decoration:none;font-weight:700;font-size:10px}#services-config a.remove:hover{background:red}.sd-social-icon .inner a.sd-button span,.sd-social-icon .inner a.share-icon span{display:inline-block;overflow:hidden;width:0;text-indent:100%}
\ No newline at end of file diff --git a/plugins/jetpack/modules/sharedaddy/sharing-service.php b/plugins/jetpack/modules/sharedaddy/sharing-service.php index 8966600a..a5513299 100644 --- a/plugins/jetpack/modules/sharedaddy/sharing-service.php +++ b/plugins/jetpack/modules/sharedaddy/sharing-service.php @@ -44,18 +44,20 @@ class Sharing_Service { // if you update this list, please update the REST API tests // in bin/tests/api/suites/SharingTest.php $services = array( - 'email' => 'Share_Email', - 'print' => 'Share_Print', - 'facebook' => 'Share_Facebook', - 'linkedin' => 'Share_LinkedIn', - 'reddit' => 'Share_Reddit', - 'twitter' => 'Share_Twitter', - 'press-this' => 'Share_PressThis', - 'google-plus-1' => 'Share_GooglePlus1', - 'tumblr' => 'Share_Tumblr', - 'pinterest' => 'Share_Pinterest', - 'pocket' => 'Share_Pocket', - 'skype' => 'Share_Skype', + 'email' => 'Share_Email', + 'print' => 'Share_Print', + 'facebook' => 'Share_Facebook', + 'linkedin' => 'Share_LinkedIn', + 'reddit' => 'Share_Reddit', + 'twitter' => 'Share_Twitter', + 'press-this' => 'Share_PressThis', + 'google-plus-1' => 'Share_GooglePlus1', + 'tumblr' => 'Share_Tumblr', + 'pinterest' => 'Share_Pinterest', + 'pocket' => 'Share_Pocket', + 'telegram' => 'Share_Telegram', + 'jetpack-whatsapp' => 'Jetpack_Share_WhatsApp', + 'skype' => 'Share_Skype', ); if ( $include_custom ) { @@ -557,7 +559,7 @@ function sharing_add_header() { if ( count( $enabled['all'] ) > 0 && sharing_maybe_enqueue_scripts() ) { wp_enqueue_style( 'sharedaddy', plugin_dir_url( __FILE__ ) .'sharing.css', array(), JETPACK__VERSION ); - wp_enqueue_style( 'genericons' ); + wp_enqueue_style( 'social-logos' ); } } diff --git a/plugins/jetpack/modules/sharedaddy/sharing-sources.php b/plugins/jetpack/modules/sharedaddy/sharing-sources.php index 5edb4c09..1fc6cef0 100644 --- a/plugins/jetpack/modules/sharedaddy/sharing-sources.php +++ b/plugins/jetpack/modules/sharedaddy/sharing-sources.php @@ -512,7 +512,7 @@ class Share_Email extends Sharing_Source { ?> <img style="float: right; display: none" class="loading" src="<?php - /** This filter is documented in modules/shortcodes/audio.php */ + /** This filter is documented in modules/stats.php */ echo apply_filters( 'jetpack_static_url', plugin_dir_url( __FILE__ ) . 'images/loading.gif' ); ?>" alt="loading" width="16" height="16" /> <input type="submit" value="<?php esc_attr_e( 'Send Email', 'jetpack' ); ?>" class="sharing_send" /> <a rel="nofollow" href="#cancel" class="sharing_cancel"><?php _e( 'Cancel', 'jetpack' ); ?></a> @@ -1602,6 +1602,49 @@ class Share_Pocket extends Sharing_Source { } +class Share_Telegram extends Sharing_Source { + public $shortname = 'telegram'; + + public function __construct( $id, array $settings ) { + parent::__construct( $id, $settings ); + } + + public function get_name() { + return __( 'Telegram', 'jetpack' ); + } + public function process_request( $post, array $post_data ) { + // Record stats + parent::process_request( $post, $post_data ); + $telegram_url = esc_url_raw( 'https://telegram.me/share/url?url=' . rawurlencode( $this->get_share_url( $post->ID ) ) . '&text=' . rawurlencode( $this->get_share_title( $post->ID ) ) ); + wp_redirect( $telegram_url ); + exit; + } + + public function get_display( $post ) { + return $this->get_link( $this->get_process_request_url( $post->ID ), _x( 'Telegram', 'share to', 'jetpack' ), __( 'Click to share on Telegram', 'jetpack' ), 'share=telegram' ); + } + + function display_footer() { + $this->js_dialog( $this->shortname, array( 'width' => 450, 'height' => 450 ) ); + } +} + +class Jetpack_Share_WhatsApp extends Sharing_Source { + public $shortname = 'jetpack-whatsapp'; + + public function __construct( $id, array $settings ) { + parent::__construct( $id, $settings ); + } + + public function get_name() { + return __( 'WhatsApp', 'jetpack' ); + } + + public function get_display( $post ) { + return $this->get_link( 'whatsapp://send?text=' . rawurlencode( $this->get_share_title( $post->ID ) ) . ' ' . rawurlencode( get_permalink( $post->ID ) ), _x( 'WhatsApp', 'share to', 'jetpack' ), __( 'Click to share on WhatsApp', 'jetpack' ) ); + } +} + class Share_Skype extends Sharing_Source { public $shortname = 'skype'; public $genericon = '\f220'; diff --git a/plugins/jetpack/modules/sharedaddy/sharing.css b/plugins/jetpack/modules/sharedaddy/sharing.css index 3d6565bf..06845483 100644 --- a/plugins/jetpack/modules/sharedaddy/sharing.css +++ b/plugins/jetpack/modules/sharedaddy/sharing.css @@ -114,12 +114,14 @@ body.highlander-dark h3.sd-title:before { vertical-align: top; } +.sd-social-official .sd-content ul li a.sd-button>span { + line-height: 17px; +} .sd-social-official .sd-content>ul>li>a.sd-button:before, .sd-social-official .sd-content>ul>li .digg_button>a:before, .sd-social-official .sd-content .sharing-hidden .inner>ul>li>a.sd-button:before, .sd-social-official .sd-content .sharing-hidden .inner>ul>li .digg_button>a:before { margin-bottom: -1px; - top: 0; } .sd-social-icon .sd-content ul li a.sd-button:hover, @@ -145,18 +147,39 @@ body.highlander-dark h3.sd-title:before { box-shadow: inset 0 1px 0 rgba(0,0,0,.16); } - /* All icons */ .sd-content ul li a.sd-button:before { display: inline-block; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - font: normal 16px/1 'Genericons'; + font: normal 18px/1 'social-logos'; vertical-align: top; - position: relative; - top: 3px; text-align: center; } +/* text + icon styles should have relative and top position */ +.sd-social-icon-text ul li a.sd-button:before { + position: relative; + top: 2px; +} + +/* Make it look great in Chrome and Safari */ +@media screen and (-webkit-min-device-pixel-ratio:0) { + .sd-content ul li a.sd-button:before { + position: relative; + top: 2px; + } +} + +.sd-social-official ul li a.sd-button:before { + position: relative; + top: -2px; +} +/* Make it look great in Chrome and Safari */ +@media screen and (-webkit-min-device-pixel-ratio:0) { + .sd-social-official ul li a.sd-button:before { + top: 0px; + } +} .sd-content ul li { margin: 0 !important; @@ -190,8 +213,20 @@ body .sd-content ul li.share-custom.no-icon a span { .sd-social-icon .sd-content ul li a.share-more { position: relative; - top: 2px; + top: -4px; } +@media screen and (-webkit-min-device-pixel-ratio:0) { + .sd-social-icon .sd-content ul li a.share-more { + top: 2px; + } +} +/* Firefox specific hack to make the share more button look better on Firefox. */ +@-moz-document url-prefix() { + .sd-social-icon .sd-content ul li a.share-more { + top: 2px; + } +} + .sd-social-icon .sd-content ul li a.share-more span { margin-left: 3px; } @@ -235,25 +270,20 @@ body .sd-content ul li.share-custom.no-icon a span { .sd-social-text .sd-content ul li.share-tumblr a:before, .sd-content ul li.share-tumblr div.option.option-smart-off a:before, .sd-social-icon-text .sd-content li.share-tumblr a:before { - content: '\f214'; + content: '\f607'; } + .sd-social-icon .sd-content ul li.share-pocket a:before, .sd-social-text .sd-content ul li.share-pocket a:before, .sd-content ul li.share-pocket div.option.option-smart-off a:before, .sd-social-icon-text .sd-content li.share-pocket a:before { content: '\f224'; } -.sd-social-icon .sd-content ul li.share-skype a:before, -.sd-social-text .sd-content ul li.share-skype a:before, -.sd-content ul li.share-skype div.option.option-smart-off a:before, -.sd-social-icon-text .sd-content li.share-skype a:before { - content: '\f220'; -} .sd-social-icon .sd-content ul li.share-pinterest a:before, .sd-social-text .sd-content ul li.share-pinterest a:before, .sd-content ul li.share-pinterest div.option.option-smart-off a:before, .sd-social-icon-text .sd-content li.share-pinterest a:before { - content: '\f209'; + content: '\f210'; } .sd-social-icon .sd-content ul li.share-google-plus-1 a:before, .sd-social-text .sd-content ul li.share-google-plus-1 a:before, @@ -265,7 +295,7 @@ body .sd-content ul li.share-custom.no-icon a span { .sd-social-text .sd-content ul li.share-facebook a:before, .sd-content ul li.share-facebook div.option.option-smart-off a:before, .sd-social-icon-text .sd-content li.share-facebook a:before { - content: '\f204'; + content: '\f203'; } .sd-social-icon .sd-content ul li.share-press-this a:before, .sd-social-text .sd-content ul li.share-press-this a:before, @@ -277,6 +307,22 @@ body .sd-content ul li.share-custom.no-icon a span { .sd-social-official .sd-content li.share-press-this a:before { color: #2ba1cb; } +.sd-social-icon .sd-content ul li.share-telegram a:before, +.sd-social-text .sd-content ul li.share-telegram a:before, +.sd-content ul li.share-telegram div.option.option-smart-off a:before, +.sd-social-icon-text .sd-content li.share-telegram a:before, +.sd-social-official .sd-content li.share-telegram a:before { + content: '\f606'; +} +.sd-social-official .sd-content li.share-telegram a:before { + color: #0088cc; +} +.sd-social-icon .sd-content ul li.share-skype a:before, +.sd-social-text .sd-content ul li.share-skype a:before, +.sd-content ul li.share-skype div.option.option-smart-off a:before, +.sd-social-icon-text .sd-content li.share-skype a:before { + content: '\f220'; +} .sd-social-icon .sd-content ul a.share-more:before, .sd-social-text .sd-content ul a.share-more:before, .sd-content ul li.advanced a.share-more:before, @@ -288,6 +334,20 @@ body .sd-content ul li.share-custom.no-icon a span { color: #2ba1cb; } +.sd-social-icon .sd-content ul li.share-jetpack-whatsapp a:before, +.sd-social-text .sd-content ul li.share-jetpack-whatsapp a:before, +.sd-content ul li.share-jetpack-whatsapp div.option.option-smart-off a:before, +.sd-social-icon-text .sd-content li.share-jetpack-whatsapp a:before, +.sd-social-official .sd-content li.share-jetpack-whatsapp a:before { + content: '\f608'; +} +.sd-social-official .sd-content li.share-jetpack-whatsapp a:before { + color: #43d854; +} +.sd-social-icon .sd-content ul li[class*='share-'].share-jetpack-whatsapp a.sd-button { + background: #43d854; + color: #fff !important; +} /* Share count */ .sd-social .sd-button .share-count { @@ -339,9 +399,6 @@ body .sd-content ul li.share-custom.no-icon a span { width: 98px; } -.sd-social-official .sd-content .skypeShare { - width: 55px; -} /* Individual official buttons */ .googleplus1_button .g-plus { @@ -356,6 +413,10 @@ body .sd-content ul li.share-custom.no-icon a span { margin: 0 !important; } +.sd-social-official .sd-content .share-skype { + width: 55px; +} + body .sd-social-official li.share-print , body .sd-social-official li.share-email a, body .sd-social-official li.share-custom a, @@ -394,9 +455,6 @@ body .sd-social-icon .sd-content li.share-custom a span { width: 0; } -body .sd-content li.share-custom a:hover span { -} - body .sd-social-icon .sd-content li.share-custom a span { padding-left: 16px !important; } @@ -423,8 +481,8 @@ body .sd-social-icon .sd-content li.share-custom a span { .sd-social-official .sd-content .sharing-hidden ul>li.share-end { clear: both; - margin: 0; - height: 0; + margin: 0 !important; + height: 0 !important; } .sharing-hidden .inner:before, .sharing-hidden .inner:after { @@ -465,7 +523,7 @@ body .sd-social-icon .sd-content li.share-custom a span { -webkit-border-radius: 50%; border: 0; box-shadow: none; - padding: 8px; + padding: 7px; position: relative; top: -2px; line-height: 1; @@ -485,8 +543,11 @@ body .sd-social-icon .sd-content li.share-custom a span { opacity: .6; } + + .sd-social-icon .sd-content ul li[class*='share-'] a.sd-button:before { - top: 0; + top: 1px; + top: 0px\9; /* IE8 and below */ } .sd-social-icon .sd-content ul li[class*='share-'] a.sd-button.share-custom { @@ -548,6 +609,11 @@ body .sd-social-icon .sd-content li.share-custom a span { color: #fff !important; } +.sd-social-icon .sd-content ul li[class*='share-'].share-telegram a.sd-button { + background: #0088cc; + color: #fff !important; +} + .sd-social-icon .sd-content ul li[class*='share-'].share-linkedin a.sd-button { background: #0077b5; color: #fff !important; @@ -563,16 +629,15 @@ body .sd-social-icon .sd-content li.share-custom a span { color: #fff !important; } -.sd-social-icon .sd-content ul li[class*='share-'].share-skype a.sd-button { - background: #00AFF0; - color: #fff !important; -} - .sd-social-icon .sd-content ul li[class*='share-'].share-reddit a.sd-button { background: #cee3f8; color: #555555 !important; } +.sd-social-icon .sd-content ul li[class*='share-'].share-skype a.sd-button { + background: #00AFF0; + color: #fff !important; +} /** * Screen Reader Text for "Icon Only" option @@ -680,3 +745,4 @@ div.sharedaddy.sharedaddy-dark #sharing_email { height: 123px; margin: 0 0 1em 0; } + diff --git a/plugins/jetpack/modules/sharedaddy/sharing.js b/plugins/jetpack/modules/sharedaddy/sharing.js index 96a26b4b..ac287a24 100644 --- a/plugins/jetpack/modules/sharedaddy/sharing.js +++ b/plugins/jetpack/modules/sharedaddy/sharing.js @@ -204,7 +204,7 @@ var updateLinkedInCount = function( data ) { $more_sharing_pane.data( 'justSlid', false ); }, 300 ); - if ( $more_sharing_pane.find( '.share-google-plus-1' ).size() ) { + if ( $more_sharing_pane.find( '.share-google-plus-1' ).length ) { // The pane needs to stay open for the Google+ Button return; } diff --git a/plugins/jetpack/modules/sharedaddy/sharing.php b/plugins/jetpack/modules/sharedaddy/sharing.php index 72dc3a04..2f69d5ad 100644 --- a/plugins/jetpack/modules/sharedaddy/sharing.php +++ b/plugins/jetpack/modules/sharedaddy/sharing.php @@ -23,10 +23,16 @@ class Sharing_Admin { } public function sharing_head() { - wp_enqueue_script( 'sharing-js', WP_SHARING_PLUGIN_URL.'admin-sharing.js', array( 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-form' ), 2 ); - wp_enqueue_style( 'sharing-admin', WP_SHARING_PLUGIN_URL.'admin-sharing.css', false, JETPACK__VERSION ); - wp_enqueue_style( 'sharing', WP_SHARING_PLUGIN_URL.'sharing.css', false, JETPACK__VERSION ); - wp_enqueue_style( 'genericons' ); + wp_enqueue_script( 'sharing-js', WP_SHARING_PLUGIN_URL . 'admin-sharing.js', array( 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-form' ), 2 ); + $postfix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; + if ( is_rtl() ) { + wp_enqueue_style( 'sharing-admin', WP_SHARING_PLUGIN_URL . 'admin-sharing-rtl' . $postfix . '.css', false, JETPACK__VERSION ); + } else { + wp_enqueue_style( 'sharing-admin', WP_SHARING_PLUGIN_URL . 'admin-sharing' . $postfix . '.css', false, JETPACK__VERSION ); + } + wp_enqueue_style( 'sharing', WP_SHARING_PLUGIN_URL . 'sharing.css', false, JETPACK__VERSION ); + + wp_enqueue_style( 'social-logos' ); wp_enqueue_script( 'sharing-js-fe', WP_SHARING_PLUGIN_URL . 'sharing.js', array( ), 4 ); add_thickbox(); |