| @@ -73,18 +73,8 @@ | ||
| 73 | 73 | $thumbnail = $thumbnail_id ? current(wp_get_attachment_image_src($thumbnail_id, 'large', true)) : ''; |
| 74 | 74 | } else { |
| 75 | 75 | $thumbnail = null; |
| 76 | 76 | } |
| 77 | - | |
| 78 | - | |
| 79 | - $unq_class = mt_rand(100000,999999); | |
| 80 | - $blockuniqueclass = ''; | |
| 81 | - | |
| 82 | - if(!empty($attributes['uniqueClass'])){ | |
| 83 | - $blockuniqueclass = $attributes['uniqueClass']; | |
| 84 | - }else{ | |
| 85 | - $blockuniqueclass = 'blockspare-share-'.$unq_class; | |
| 86 | - } | |
| 87 | 77 | |
| 88 | 78 | $icon_style = ''; |
| 89 | 79 | |
| 90 | 80 | if ($attributes['iconColorOption'] != 'blockspare-default-official-color') { |
| @@ -137,13 +127,11 @@ | ||
| 137 | 127 | } |
| 138 | 128 | |
| 139 | 129 | $block_content = sprintf( |
| 140 | 130 | ' |
| 141 | -<div class="%7$s"> | |
| 142 | -<div class="blockspare-blocks blockspare-social-wrapper"> | |
| 131 | +<div style="text-align: %7$s" > | |
| 143 | 132 | <ul class="blockspare-social-sharing %2$s %3$s %4$s %5$s %6$s">%1$s</ul> |
| 144 | 133 | </div> |
| 145 | - </div> | |
| 146 | 134 | ', |
| 147 | 135 | $share_url, |
| 148 | 136 | isset($attributes['iconColorOption']) ? $attributes['iconColorOption'] : null, |
| 149 | 137 | isset($attributes['buttonOptions']) ? $attributes['buttonOptions'] : null, |
| @@ -149,28 +137,12 @@ | ||
| 149 | 137 | isset($attributes['buttonOptions']) ? $attributes['buttonOptions'] : null, |
| 150 | 138 | isset($attributes['buttonShapes']) ? $attributes['buttonShapes'] : null, |
| 151 | 139 | isset($attributes['buttonSizes']) ? $attributes['buttonSizes'] : null, |
| 152 | 140 | isset($attributes['buttonFills']) ? $attributes['buttonFills'] : null, |
| 153 | - $blockuniqueclass | |
| 154 | - | |
| 141 | + isset($attributes['sectionAlignment']) ? $attributes['sectionAlignment'] : null | |
| 155 | 142 | |
| 156 | 143 | |
| 157 | 144 | ); |
| 158 | - | |
| 159 | - $block_content .= '<style type="text/css">'; | |
| 160 | - | |
| 161 | - if ($attributes['iconColorOption'] != 'blockspare-default-official-color') { | |
| 162 | - | |
| 163 | - $block_content .= ' .' . $blockuniqueclass . ' .blockspare-social-sharing a{ | |
| 164 | - color:' . $attributes['customfontColorOption'] .'; | |
| 165 | - background-color:' . $attributes['custombackgroundColorOption'] . '; | |
| 166 | - }'; | |
| 167 | - } | |
| 168 | - $block_content .=' .' . $blockuniqueclass . ' .blockspare-social-wrapper{ | |
| 169 | - text-align:'.$attributes['sectionAlignment'].'; | |
| 170 | - }'; | |
| 171 | - | |
| 172 | - $block_content .= '</style>'; | |
| 173 | 145 | |
| 174 | 146 | return $block_content; |
| 175 | 147 | } |
| 176 | 148 | |
| @@ -208,16 +180,17 @@ | ||
| 208 | 180 | $share_url .= sprintf( |
| 209 | 181 | '<li> |
| 210 | 182 | <a |
| 211 | 183 | %1$s |
| 212 | - class="%3$s" | |
| 184 | + class="%4$s" | |
| 213 | 185 | title="%2$s" |
| 214 | - > | |
| 215 | - <i class="%4$s"></i> <span class="blockspare-social-text">%2$s</span> | |
| 186 | + style="%3$s"> | |
| 187 | + <i class="%5$s"></i> <span class="blockspare-social-text">%2$s</span> | |
| 216 | 188 | </a> |
| 217 | 189 | </li>', |
| 218 | 190 | $href_format, |
| 219 | 191 | esc_html__($attribute_title), |
| 192 | + esc_attr__($icon_style), | |
| 220 | 193 | esc_attr__($item_class), |
| 221 | 194 | esc_attr__($icon_class) |
| 222 | 195 | |
| 223 | 196 | ); |
