Merge pull request #2227 from Storke/master

Fix issues on dashboard title and logo with AdminLTE

Resources/public/css/styles.css

@@ -33,7 +33,17 @@ body > .header .logo {
 }
 
 .logo img {
+    display: inline;
     padding-bottom: 4px;
+    max-height: 100%;
+    max-width: 60px;
+}
+
+.logo span {
+    display: inline-block;
+    line-height: 1;
+    vertical-align: middle;
+    width: 140px;
 }
 
 .open > .dropdown-menu {
@@ -316,4 +326,4 @@ div.select2-container {
 
 div.select2-drop ul {
     margin: 0 !important;
-}
+}

Resources/views/standard_layout.html.twig

@@ -83,7 +83,7 @@ file that was distributed with this source code.
                             <img src="{{ asset(admin_pool.titlelogo) }}" alt="{{ admin_pool.title }}">{% if 'both' == admin_pool.getOption('title_mode') %}&nbsp;{% endif %}
                         {% endif %}
                         {% if 'single_text' == admin_pool.getOption('title_mode') or 'both' == admin_pool.getOption('title_mode') %}
-                            {{ admin_pool.title }}
+                            <span>{{ admin_pool.title }}</span>
                         {% endif %}
                     </a>
                 {% endblock %}