partkeepr

commit 2098a41e57242e8fbf50c72a7983d271b289b18d
parent c9f9437ad5a54a8b45639be0cb34698f3ca757a0
Author: Felicitus <felicitus@felicitus.org>
Date:   Thu,  8 Oct 2015 18:48:57 +0200

Refactored logo to be CSS only

Diffstat:
M
src/PartKeepr/FrontendBundle/Resources/public/css/PartKeepr.css
 | 
16
++++++++++++++--
M
src/PartKeepr/FrontendBundle/Resources/public/js/Components/MenuBar.js
 | 
8
++------

2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/PartKeepr/FrontendBundle/Resources/public/css/PartKeepr.css b/src/PartKeepr/FrontendBundle/Resources/public/css/PartKeepr.css
@@ -53,4 +53,17 @@
 
 .x-form-trigger-help {
     background-image: url(../images/form/trigger-help.gif);
-}-
\ No newline at end of file
+}
+
+.partkeepr-logo {
+    height: 26px;
+    padding-right: 30px;
+    vertical-align: middle;
+    display:flex;
+    align-items:center;
+    font-size: 20px;
+    font-family: 'Ubuntu', sans-serif;
+    background-repeat: no-repeat;
+    background-position:  right;
+    background-image: url(../images/partkeepr-logo.png);
+}
diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/MenuBar.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/MenuBar.js
@@ -118,12 +118,8 @@ Ext.define('PartKeepr.MenuBar', {
 		'->',
 		{
 			xtype: 'tbtext',
-			cls: 'partkeepr-logo-align',
-			text: '<div class="partkeepr-logo">PartKeepr</div>'
-		},
-		{
-			xtype: 'tbtext',
-			text: '<img style="float: left;" src="bundles/partkeeprfrontend/images/partkeepr-logo.png"/>'
+			cls: 'partkeepr-logo',
+			text: 'PartKeepr'
 		}];