MAGETWO-35091: UI improvements

- QA updates

Author: Oleg Zinoviev

app/code/Magento/Theme/Block/Html/Header/Logo.php

@@ -78,32 +78,6 @@ public function getLogoAlt()
         return $this->_data['logo_alt'];
     }
 
-    /**
-     * Retrieve logo sizes (width and height))
-     *
-     * @return array
-     */
-    public function getLogoSizes()
-    {
-        $logoSrc = $this->getLogoSrc();
-        $logoExtension = strtolower(pathinfo($logoSrc, PATHINFO_EXTENSION));
-        $sizes = ['width' => 0, 'height' => 0];
-
-        if ($logoExtension == 'svg') {
-            $logoSvg = simplexml_load_file($logoSrc);
-            $logoAttr = $logoSvg->attributes();
-            $sizes['width'] = (int)$logoAttr->width;
-            $sizes['height'] = (int)$logoAttr->height;
-        } else {
-            $imageSize = getimagesize($logoSrc);
-            if (is_array($imageSize)) {
-                $sizes['width'] = (int)$imageSize[0];
-                $sizes['height'] = (int)$imageSize[1];
-            }
-        }
-        return $sizes;
-    }
-
     /**
      * Retrieve logo image URL
      *

app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml

@@ -10,27 +10,14 @@
  * @var \Magento\Theme\Block\Html\Header\Logo $block
  */
 ?>
-<?php
-    $logoAlt = $block->getLogoAlt();
-    $logoSrc = $block->getLogoSrc();
-    $logoSizes = $block->getLogoSizes();
-?>
-
+<?php $storeName = $block->getThemeName() ? $block->getThemeName() : $block->getLogoAlt();?>
 <span data-action="toggle-nav" class="action nav-toggle"><span><?php echo __('Toggle Nav') ?></span></span>
-
 <?php if ($block->isHomePage()):?>
     <strong class="logo">
-<?php else:?>
-    <a class="logo" href="<?php echo $block->getUrl(''); ?>" title="<?php echo $logoAlt; ?>">
-<?php endif;?>
-
-    <img src="<?php echo $logoSrc ?>"
-         width="<?php echo $logoSizes['width']; ?>"
-         height="<?php echo $logoSizes['height']; ?>"
-         alt="<?php echo $logoAlt; ?>" />
-
-<?php if ($block->isHomePage()):?>
+        <img src="<?php echo $block->getLogoSrc() ?>" alt="<?php echo $block->getLogoAlt() ?>" />
     </strong>
 <?php else:?>
+    <a class="logo" href="<?php echo $block->getUrl(''); ?>" title="<?php echo $storeName ?>">
+        <img src="<?php echo $block->getLogoSrc() ?>" alt="<?php echo $storeName ?>" />
     </a>
-<?php endif;?>
+<?php endif?>