Merge remote-tracking branch 'origin/development'

FameThemes · Feb 27, 2017 · ec8d94a · ec8d94a
2 parents d7cb7fc + 1488fac
commit ec8d94a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/assets/sass/_sections.scss b/assets/sass/_sections.scss
@@ -888,6 +888,9 @@
 	br {
 		margin-bottom: 5px;
 	}
+	label {
+		width: 100%;
+	}
 }
 
 div.wpcf7-validation-errors {

diff --git a/inc/template-tags.php b/inc/template-tags.php
@@ -732,13 +732,15 @@ function onepress_get_social_profiles()
                 // If icon isset
                 $icons = array();
                 $array[$k]['icon'] = trim($array[$k]['icon']);
-                if ($array[$k]['icon'] != '' && strpos($array[$k]['icon'], 'fa-') !== 0) {
-                    $icons['fa-' . $array[$k]['icon']] = 'fa-' . $array[$k]['icon'];
+
+                if ($array[$k]['icon'] != '' && strpos($array[$k]['icon'], 'fa') !== 0) {
+                    $icons[$array[$k]['icon']] = 'fa-' . $array[$k]['icon'];
                 } else {
                     $icons[$array[$k]['icon']] = $array[$k]['icon'];
                 }
+
                 $network = ($array[$k]['network']) ? sanitize_title($array[$k]['network']) : false;
-                if ($network) {
+                if ( $network && ! $array[$k]['icon'] ) {
                     $icons['fa-' . $network] = 'fa-' . $network;
                 }
 

diff --git a/style.css b/style.css
@@ -3019,6 +3019,10 @@ section > .customize-partial-edit-shortcut button {
 	margin-bottom: 5px;
 }
 
+.wpcf7-form label {
+	width: 100%;
+}
+
 div.wpcf7-validation-errors {
 	margin: 20px 0px;
 	padding: 15px;
-Original file line number
+Diff line change
@@ Expand Up / @@ -888,6 +888,9 @@ @@
     	br {
     		margin-bottom: 5px;
     	}
+    	label {
+    		width: 100%;
+    	}
     }
     div.wpcf7-validation-errors {
@@ Expand Down @@