From b2748d586cea8f79bc1dd63424095901c23a0e24 Mon Sep 17 00:00:00 2001
From: nikitozzzzzzz <nsinelnikov.work@gmail.com>
Date: Thu, 30 Aug 2018 09:24:19 +0300
Subject: [PATCH] - fixed notifier CSS; - fixed admin forms notice;

---
 assets/css/um-profile.css                 |  9 +++++++--
 includes/admin/core/class-admin-forms.php | 16 +++++++++-------
 includes/core/um-actions-profile.php      |  4 ++--
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/assets/css/um-profile.css b/assets/css/um-profile.css
index e14b2721..9c825e9d 100644
--- a/assets/css/um-profile.css
+++ b/assets/css/um-profile.css
@@ -555,12 +555,17 @@ font-weight: normal;
     height: 18px;
     border-radius: 999px;
     line-height: 18px;
-	top: 2px;
-	right: 8px;
+	top: -3px;
+	right: -7px;
 	font-size: 11px;
 	font-weight: 400;
 }
 
+.um-tab-notifier.uimob800-show.uimob500-show.uimob340-show {
+	top: 2px;
+	right: 8px;
+}
+
 .um-profile.um-viewing .um-field-checkbox, .um-profile.um-viewing .um-field-radio{
 	cursor: default !important;
 }
\ No newline at end of file
diff --git a/includes/admin/core/class-admin-forms.php b/includes/admin/core/class-admin-forms.php
index d1015974..d73b9ab4 100644
--- a/includes/admin/core/class-admin-forms.php
+++ b/includes/admin/core/class-admin-forms.php
@@ -734,15 +734,17 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
 			$value = $this->get_field_value( $field_data );
 
 			$options = '';
-			foreach ( $field_data['options'] as $key => $option ) {
-				if ( ! empty( $field_data['multi'] ) ) {
+			if ( ! empty( $field_data['options'] ) ) {
+				foreach ( $field_data['options'] as $key => $option ) {
+					if ( ! empty( $field_data['multi'] ) ) {
 
-					if ( ! is_array( $value ) || empty( $value ) )
-						$value = array();
+						if ( ! is_array( $value ) || empty( $value ) )
+							$value = array();
 
-					$options .= '<option value="' . $key . '" ' . selected( in_array( $key, $value ), true, false ) . '>' . esc_html( $option ) . '</option>';
-				} else {
-					$options .= '<option value="' . $key . '" ' . selected( (string)$key == $value, true, false ) . '>' . esc_html( $option ) . '</option>';
+						$options .= '<option value="' . $key . '" ' . selected( in_array( $key, $value ), true, false ) . '>' . esc_html( $option ) . '</option>';
+					} else {
+						$options .= '<option value="' . $key . '" ' . selected( (string)$key == $value, true, false ) . '>' . esc_html( $option ) . '</option>';
+					}
 				}
 			}
 
diff --git a/includes/core/um-actions-profile.php b/includes/core/um-actions-profile.php
index e8027661..dd3f2ef4 100644
--- a/includes/core/um-actions-profile.php
+++ b/includes/core/um-actions-profile.php
@@ -1341,7 +1341,7 @@ function um_profile_menu( $args ) {
 						<i class="<?php echo $tab['icon']; ?>"></i>
 
 						<?php if ( isset( $tab['notifier'] ) && $tab['notifier'] > 0 ) { ?>
-							<span class="um-tab-notifier uimob800-show uimob500-show uimob340-show"><?php echo $tab['notifier']; ?></span>
+							<span class="um-tab-notifier"><?php echo $tab['notifier']; ?></span>
 						<?php } ?>
 
 						<span class="title"><?php echo $tab['name']; ?></span>
@@ -1360,7 +1360,7 @@ function um_profile_menu( $args ) {
 					   title="<?php echo esc_attr( $tab['name'] ); ?>">
 
 						<?php if ( isset( $tab['notifier'] ) && $tab['notifier'] > 0) { ?>
-							<span class="um-tab-notifier uimob800-show uimob500-show uimob340-show"><?php echo $tab['notifier']; ?></span>
+							<span class="um-tab-notifier"><?php echo $tab['notifier']; ?></span>
 						<?php } ?>
 
 						<span class="title"><?php echo $tab['name']; ?></span>