Version 1.4.13

ThemeFuse · Nov 13, 2014 · 23b4360 · 23b4360
1 parent 815a2ca
commit 23b4360
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/scratch-parent/framework/includes/option-types/icon/class-fw-option-type-icon.php b/scratch-parent/framework/includes/option-types/icon/class-fw-option-type-icon.php
@@ -47,15 +47,15 @@ protected function _enqueue_static($id, $option, $data)
 
 			unset($sets);
 
-			if (!isset($this->enqueued_font_styles_src[ $set['font_style_src'] ])) {
+			if (!isset($this->enqueued_font_styles_src[ $set['font-style-src'] ])) {
 				wp_enqueue_style(
 					"fw-option-type-{$this->get_type()}-font-{$option['set']}",
-					$set['font_style_src'],
+					$set['font-style-src'],
 					array(),
 					fw()->manifest->get_version()
 				);
 
-				$this->enqueued_font_styles_src[ $set['font_style_src'] ] = true;
+				$this->enqueued_font_styles_src[ $set['font-style-src'] ] = true;
 			}
 		}
 	}
@@ -134,7 +134,7 @@ private function get_sets()
 	private function generate_unknown_set($icon)
 	{
 		return array(
-			'font_style_src'  => 'data:text/css;charset=utf-8;base64,LyoqLw==',
+			'font-style-src'  => 'data:text/css;charset=utf-8;base64,LyoqLw==',
 			'container-class' => '',
 			'groups' => array(
 				'unknown' => __('Unknown Set', 'fw'),
@@ -149,7 +149,7 @@ private function get_default_sets()
 	{
 		return array(
 			'font-awesome' => array( // http://fortawesome.github.io/Font-Awesome/icons
-				'font_style_src' => fw_get_framework_directory_uri('/static/libs/font-awesome/css/font-awesome.min.css'),
+				'font-style-src' => fw_get_framework_directory_uri('/static/libs/font-awesome/css/font-awesome.min.css'),
 				'container-class' => 'fa-lg', // some fonts need special wrapper class to display properly
 				'groups' => array(
 					'web-app' => __('Web Application Icons', 'fw'),

diff --git a/scratch-parent/framework/includes/option-types/icon/static/css/backend.css b/scratch-parent/framework/includes/option-types/icon/static/css/backend.css
@@ -6,6 +6,10 @@
 	max-height: 10.1em;
 }
 
+.fw-option-type-icon .option-type-icon-list:first-child {
+	margin-top: 0;
+}
+
 .fw-option-type-icon .option-type-icon-list:after {
 	content: '';
 	display: block;

diff --git a/scratch-parent/framework/includes/option-types/icon/view.php b/scratch-parent/framework/includes/option-types/icon/view.php
@@ -32,19 +32,19 @@
 
 	<div class="js-option-type-icon-container">
 
+		<?php if (count($groups) > 1): ?>
 		<div class="fw-backend-option-fixed-width">
 			<select class="js-option-type-icon-dropdown">
 				<?php
-					if (count($groups) > 1) {
-						echo fw_html_tag('option', array('value' => 'all'), htmlspecialchars(__('All Categories', 'fw')));
-					}
+					echo fw_html_tag('option', array('value' => 'all'), htmlspecialchars(__('All Categories', 'fw')));
 					foreach ($groups as $group_id => $group_title) {
 						$selected = (isset($set['icons'][$data['value']]['group']) && $set['icons'][$data['value']]['group'] === $group_id);
 						echo fw_html_tag('option', array('value' => $group_id, 'selected' => $selected), htmlspecialchars($group_title));
 					}
 				?>
 			</select>
 		</div>
+		<?php endif; ?>
 
 		<div class="option-type-icon-list js-option-type-icon-list <?php echo esc_attr($set['container-class']) ?>">
 			<?php

diff --git a/scratch-parent/framework/manifest.php b/scratch-parent/framework/manifest.php
@@ -4,6 +4,6 @@
 
 $manifest['name'] = __('Unyson', 'fw');
 
-$manifest['version'] = '1.4.12';
+$manifest['version'] = '1.4.13';
 
 $manifest['github_update'] = 'ThemeFuse/Unyson-Framework';