From 27996e4cb5efa978cec1e1dd01ecc727dc4b85a8 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Thu, 3 Oct 2019 11:04:09 +0200
Subject: [PATCH] Update to new icons
---
packages/auth/rollup.config.js | 2 +-
packages/auth/src/vpu-auth.js | 12 ++++--------
packages/auth/vendor/common | 2 +-
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/packages/auth/rollup.config.js b/packages/auth/rollup.config.js
index 50d416e9..7bc07c81 100644
--- a/packages/auth/rollup.config.js
+++ b/packages/auth/rollup.config.js
@@ -53,7 +53,7 @@ export default {
{src: 'assets/favicon.ico', dest:'dist'},
{src: 'assets/icon_key_hover_tugprod.png', dest:'dist/local/vpu-auth'},
{src: 'assets/icon_key_normal_tugprod.png', dest:'dist/local/vpu-auth'},
- {src: 'node_modules/material-design-icons-svg/paths/*.json', dest: 'dist/local/vpu-common/icons'},
+ {src: 'node_modules/vpu-common/assets/icons/*.svg', dest: 'dist/local/vpu-common/icons'},
]
}),
(process.env.ROLLUP_WATCH === 'true') ? serve({contentBase: 'dist', host: '127.0.0.1', port: 8002}) : false
diff --git a/packages/auth/src/vpu-auth.js b/packages/auth/src/vpu-auth.js
index d2395f1d..6fdb465a 100644
--- a/packages/auth/src/vpu-auth.js
+++ b/packages/auth/src/vpu-auth.js
@@ -250,8 +250,9 @@ class VPUAuth extends LitElement {
}
vpu-icon {
- height: 2em;
- width: 2em;
+ height: 1em;
+ width: 1em;
+ vertical-align: -0.1rem;
}
`;
}
@@ -275,7 +276,7 @@ class VPUAuth extends LitElement {
<div class="dropdown" @click="${this.onDropdownClick}">
<div class="dropdown-trigger">
<span>${this.name}</span>
- <vpu-icon name="menu-down"></vpu-icon>
+ <vpu-icon name="chevron-down"></vpu-icon>
</div>
<div class="dropdown-menu" id="dropdown-menu2" role="menu">
<div class="dropdown-content">
@@ -303,11 +304,6 @@ class VPUAuth extends LitElement {
const bulmaCSS = commonUtils.getAssetURL(bulmaCSSPath);
return html`
<link rel="stylesheet" href="${bulmaCSS}">
- <style>
- vpu-icon {
- vertical-align: -0.7rem;
- }
- </style>
<div>
${this.loggedIn ? this.renderLoggedIn() : this.renderLoggedOut()}
diff --git a/packages/auth/vendor/common b/packages/auth/vendor/common
index adbdf637..0dfaa45a 160000
--- a/packages/auth/vendor/common
+++ b/packages/auth/vendor/common
@@ -1 +1 @@
-Subproject commit adbdf63736ba48eaf93ca06f83ee3652b7f85f12
+Subproject commit 0dfaa45a645d513e51ed5dbb20a68874aef466d8
--
GitLab