From 4bfe84b253831c41bb356c24f612d060acfc7c2b Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Fri, 23 Dec 2016 08:53:47 -0800
Subject: [PATCH] Fix for srcSet sizing. Voux theme alignment fixes.

---
 e107_handlers/e_parse_class.php       | 10 ++++++++--
 e107_themes/voux/style.css            |  4 ++--
 e107_themes/voux/theme_shortcodes.php |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index 0cf2ad288..fdff31732 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -2564,14 +2564,18 @@ class e_parse extends e_parser
 				return $this->thumbUrl($src, $parm)." h".$parm['h']." ".$multiply;
 			}
 
-			$width = (!empty($parm['w'])) ? ($parm['w'] * $multiply) : ($this->thumbWidth * $multiply);
-			$height = (!empty($parm['h'])) ? ($parm['h'] * $multiply) : ($this->thumbHeight * $multiply);
+			$width = (!empty($parm['w']) || !empty($parm['h'])) ? (intval($parm['w']) * $multiply) : ($this->thumbWidth * $multiply);
+			$height = (!empty($parm['h']) || !empty($parm['w'])) ? (intval($parm['h']) * $multiply) : ($this->thumbHeight * $multiply);
+
 		}
 		else
 		{
 			$height = (($this->thumbHeight * $width) / $this->thumbWidth);
+
 		}
 
+
+
 		if(!isset($parm['aw']))
 		{
 			$parm['aw'] = null;
@@ -2598,6 +2602,8 @@ class e_parse extends e_parser
 
 		// $parms['x'] = $encode;
 
+
+
 		if(!empty($parm['return']) && $parm['return'] == 'src')
 		{
 			return $this->thumbUrl($src, $parms);
diff --git a/e107_themes/voux/style.css b/e107_themes/voux/style.css
index ddfe3ab7d..f159d6dd2 100644
--- a/e107_themes/voux/style.css
+++ b/e107_themes/voux/style.css
@@ -421,7 +421,7 @@ nav  { text-align: center }
 
 
 
-.xurl-social-icons a  { color: #343434; font-size:1.5em; padding-left:15px; padding-top:5px; padding-bottom:0; margin:0; display:inline-block; }
+.xurl-social-icons a  { color: #343434; font-size:1.5em; padding-left:15px; padding-top:8px; padding-bottom:0; margin:0; display:inline-block; }
 .xurl-social-icons a:hover { color:#777777;; }
 
 .banner-menu-item   { text-align:center }
@@ -534,7 +534,7 @@ img.news-image-1 { margin-bottom:15px }
 .menu ul li { padding-bottom:8px }
 .menu ul.list-unstyled { padding-left:0}
 
-
+.nav > li > a:focus, .nav > li > a.voux-nav-avatar:hover { text-decoration:none}
 
 
 /* Extra small devices Phones (<768px)  .col-xs */
diff --git a/e107_themes/voux/theme_shortcodes.php b/e107_themes/voux/theme_shortcodes.php
index 144110c8f..66b0b4977 100644
--- a/e107_themes/voux/theme_shortcodes.php
+++ b/e107_themes/voux/theme_shortcodes.php
@@ -206,7 +206,7 @@ class theme_shortcodes extends e_shortcode
 		$text = '
 		
 		<ul class="nav navbar-nav navbar-right'.$direction.'">
-		<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">{SETIMAGE: w=20} {USER_AVATAR: shape=circle} '. USERNAME.' <b class="caret"></b></a>
+		<li class="dropdown"><a href="#" class="voux-nav-avatar dropdown-toggle" data-toggle="dropdown">{SETIMAGE: w=20&h=20} {USER_AVATAR: shape=circle} <b class="caret"></b></a>
 		<ul class="dropdown-menu">
 		<li>
 			<a href="{LM_USERSETTINGS_HREF}"><span class="glyphicon glyphicon-cog"></span> '.LAN_SETTINGS.'</a>