| @@ -142,8 +142,9 @@ | ||
| 142 | 142 | $css["mb-item a"]["normal"]["cursor"] = "pointer"; // by default social share = call to action. |
| 143 | 143 | $css['mb-item a']['normal']['text-decoration'] = 'none'; |
| 144 | 144 | |
| 145 | 145 | |
| 146 | + | |
| 146 | 147 | if (isset($blockdata['button_spacing']) && $blockdata['button_spacing'] > 0) |
| 147 | 148 | { |
| 148 | 149 | $orientation = $this->collection->orientation; |
| 149 | 150 | $is_static = $w->ask('display/env/is_static'); |
| @@ -159,8 +160,19 @@ | ||
| 159 | 160 | $css['mb-item']['normal']['margin-bottom'] = $button_spacing . 'px'; |
| 160 | 161 | } |
| 161 | 162 | } |
| 162 | 163 | |
| 164 | + // Check font again. | |
| 165 | + if (Install::isPro()) | |
| 166 | + { | |
| 167 | + //var_dump($css); | |
| 168 | + $blockdata = $this->data[$this->blockname]; | |
| 169 | + $font = $blockdata['font']; | |
| 170 | + $args = array('font' => $font); | |
| 171 | + $webfont = patches::checkWebFonts($args); | |
| 172 | + $this->data[$this->blockname]['webfonts'] = $webfont; | |
| 173 | + } | |
| 174 | + | |
| 163 | 175 | return $css; |
| 164 | 176 | |
| 165 | 177 | } |
| 166 | 178 | |
| @@ -185,18 +197,18 @@ | ||
| 185 | 197 | if ( count ($post) == 0) |
| 186 | 198 | return $data; // don't run on default situations |
| 187 | 199 | |
| 188 | 200 | // Do the font here |
| 189 | - $blockdata = $this->data[$this->blockname]; | |
| 201 | + $blockdata = $data[$this->blockname]; | |
| 190 | 202 | $font = $blockdata['font']; |
| 191 | 203 | //$label_weight = $blockdata['font_label_weight']; |
| 192 | 204 | // $icon_weight = $blockdata['icon_label_weight']; |
| 193 | 205 | |
| 194 | 206 | $args = array('font' => $font); |
| 207 | + | |
| 195 | 208 | $webfont = patches::checkWebFonts($args); |
| 196 | 209 | $data[$this->blockname]['webfonts'] = $webfont; |
| 197 | 210 | |
| 198 | - | |
| 199 | 211 | return $data; |
| 200 | 212 | |
| 201 | 213 | } |
| 202 | 214 | |
| @@ -211,9 +223,9 @@ | ||
| 211 | 223 | <span class='content'> |
| 212 | 224 | <p><?php printf(__("Select from %s fonts you would like to use and they will show up in the dropdown list", 'maxbuttons-pro'), '<span class="fontcount"></span>'); ?></p> |
| 213 | 225 | <div class="loading_overlay"></div> |
| 214 | 226 | <div class='loading'> |
| 215 | - <img src="<?php echo MB()->get_plugin_url(true) ?>images/loading.gif"> | |
| 227 | + <img src="<?php echo MB()->get_plugin_url(false) ?>images/spinner.gif"> | |
| 216 | 228 | <span><?php _e("Loading","maxbuttons-pro"); ?></span> |
| 217 | 229 | </div> |
| 218 | 230 | <div class="font_manager"> |
| 219 | 231 | <div class='font_search'> <span><?php _e("Search","maxbuttons-pro") ?></span> |
