From 7b5d1b567d908e19a725dc175130adeb1aebc6d0 Mon Sep 17 00:00:00 2001 From: Christoph Reiter <reiter.christoph@gmail.com> Date: Thu, 22 Aug 2019 15:00:55 +0200 Subject: [PATCH] Use vpu-icon for the menu arrow --- packages/auth/rollup.config.js | 1 + packages/auth/src/vpu-auth.js | 18 +++++++----------- packages/auth/vendor/common | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/packages/auth/rollup.config.js b/packages/auth/rollup.config.js index 0c3a65e0..c8d02bdd 100644 --- a/packages/auth/rollup.config.js +++ b/packages/auth/rollup.config.js @@ -43,6 +43,7 @@ export default { targets: [ {src: 'assets/index.html', dest:'dist'}, {src: 'assets/favicon.ico', dest:'dist'}, + {src: 'node_modules/material-design-icons-svg/paths/*.json', 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 0d6a5464..8492145a 100644 --- a/packages/auth/src/vpu-auth.js +++ b/packages/auth/src/vpu-auth.js @@ -2,6 +2,7 @@ import {i18n} from './i18n.js'; import {html, css, LitElement} from 'lit-element'; import JSONLD from 'vpu-common/jsonld' import * as commonUtils from 'vpu-common/utils'; +import 'vpu-common/vpu-icon.js'; /** * Keycloak auth web component @@ -212,16 +213,6 @@ class VPUAuth extends LitElement { static get styles() { return css` - i.arrow-down { - border: solid black; - border-width: 0 3px 3px 0; - display: inline-block; - padding: 3px; - margin: 0 3px 0 9px; - transform: rotate(45deg); - -webkit-transform: rotate(45deg); - } - a.dropdown-item { width: initial !important; } @@ -229,6 +220,11 @@ class VPUAuth extends LitElement { .main-button { min-width: 150px; } + + vpu-icon { + height: 2em; + width: 2em; + } `; } @@ -250,7 +246,7 @@ class VPUAuth extends LitElement { <div class="dropdown-trigger"> <button class="button main-button" aria-haspopup="true" aria-controls="dropdown-menu2"> <span>${this.name}</span> - <i class="arrow-down"></i> + <vpu-icon name="menu-down"></vpu-icon> </button> </div> <div class="dropdown-menu" id="dropdown-menu2" role="menu"> diff --git a/packages/auth/vendor/common b/packages/auth/vendor/common index 8a80921c..f310ba99 160000 --- a/packages/auth/vendor/common +++ b/packages/auth/vendor/common @@ -1 +1 @@ -Subproject commit 8a80921c5f8ea2b0d1a0a548741d2ca1716a5139 +Subproject commit f310ba99da6347270774f6a9554368128f86721b -- GitLab