From 922e658490723f97ff9343d34f75a92bcb26fa71 Mon Sep 17 00:00:00 2001
From: Hermann <blumh@ethz.ch>
Date: Mon, 11 Jun 2018 09:05:24 +0200
Subject: [PATCH] fix top toolbar styling
---
src/layout.js | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/layout.js b/src/layout.js
index 75e701c..363ca5b 100644
--- a/src/layout.js
+++ b/src/layout.js
@@ -4,6 +4,7 @@ import { List, ListTile, Icon, Toolbar, ToolbarTitle, Dialog, SVG } from 'polyth
import { styler } from 'polythene-core-css';
import { icons } from './views/elements';
import { resetSession } from './auth';
+import { colors } from './style'
const layoutStyle = [
{
@@ -12,9 +13,6 @@ const layoutStyle = [
margin: 0,
},
'.main-toolbar': {
- backgroundColor: '#1f2d54',
- color: '#fff',
- height: '72px',
'grid-column': '1 / span 2',
'grid-row': 1,
},
@@ -23,7 +21,7 @@ const layoutStyle = [
width: '100%',
display: 'grid',
'grid-template-columns': '200px auto',
- 'grid-template-rows': '72px auto',
+ 'grid-template-rows': '64px auto',
},
'.wrapper-sidebar': {
'grid-column': 1,
@@ -58,7 +56,10 @@ export class Layout {
view({ children }) {
return m('div', [
m('div.wrapper-main.smooth', [
- m(Toolbar, { className: 'main-toolbar' }, [
+ m(Toolbar, {
+ className: 'main-toolbar',
+ style: { backgroundColor: colors.amiv_blue, color: '#ffffff' },
+ }, [
m(ToolbarTitle, { text: 'AMIV Admintools' }),
m('a', { onclick: resetSession }, 'Logout'),
]),
--
GitLab