Skip to content

Commit

Permalink
Migrate Valo to Lumo
Browse files Browse the repository at this point in the history
  • Loading branch information
tomivirkki committed Jan 11, 2018
1 parent 29da017 commit 1bbfc12
Show file tree
Hide file tree
Showing 10 changed files with 103 additions and 103 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,25 @@
<vaadin-button disabled>Button Two</vaadin-button>
```

[<img src="https://raw.githubusercontent.com/vaadin/vaadin-button/master/screenshot.png" alt="Screenshot of vaadin-button, using the default Valo theme">](https://vaadin.com/elements/-/element/vaadin-button)
[<img src="https://raw.githubusercontent.com/vaadin/vaadin-button/master/screenshot.png" alt="Screenshot of vaadin-button, using the default Lumo theme">](https://vaadin.com/elements/-/element/vaadin-button)

## Getting Started

Vaadin Elements use the Valo theme by default.
Vaadin Elements use the Lumo theme by default.

## The file structure for Vaadin Elements

- `src/vaadin-button.html`

Unstyled element.

- `theme/valo/vaadin-button.html`
- `theme/lumo/vaadin-button.html`

Element with Valo theme.
Element with Lumo theme.

- `vaadin-button.html`

Alias for theme/valo/vaadin-button.html
Alias for theme/lumo/vaadin-button.html

## Running demos and tests in browser

Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"polymer": "^2.0.0",
"vaadin-control-state-mixin": "vaadin/vaadin-control-state-mixin#^2.0.0",
"vaadin-themable-mixin": "^1.1.0",
"vaadin-valo-styles": "vaadin/vaadin-valo-styles#^2.0.0",
"vaadin-lumo-styles": "vaadin/vaadin-lumo-styles#^1.0.0",
"vaadin-element-mixin": "vaadin/vaadin-element-mixin#^1.0.1"
}
}
}
2 changes: 1 addition & 1 deletion demo/button-a11y-demos.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ <h3>Accessible Icon Button</h3>
<vaadin-demo-snippet id='button-a11y-demos-accessible-label'>
<template preserve-content>
<vaadin-button aria-label="Create new">
<iron-icon icon="valo:plus"></iron-icon>
<iron-icon icon="lumo:plus"></iron-icon>
</vaadin-button>
</template>
</vaadin-demo-snippet>
Expand Down
6 changes: 3 additions & 3 deletions demo/button-basic-demos.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@ <h3>Using an Icon</h3>
This ensure proper alignment of the icon. -->

<vaadin-button>
<iron-icon icon="valo:edit" slot="prefix"></iron-icon>
<iron-icon icon="lumo:edit" slot="prefix"></iron-icon>
Edit
</vaadin-button>

<vaadin-button>
<iron-icon icon="valo:arrow-right" slot="suffix"></iron-icon>
<iron-icon icon="lumo:arrow-right" slot="suffix"></iron-icon>
Next
</vaadin-button>

<vaadin-button>
<iron-icon icon="valo:user"></iron-icon>
<iron-icon icon="lumo:user"></iron-icon>
<br>
Profile
</vaadin-button>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<dom-module id="button-valo-theme-demos">
<dom-module id="button-lumo-theme-demos">
<template>
<style include="vaadin-component-demo-shared-styles">
:host {
Expand Down Expand Up @@ -58,24 +58,24 @@ <h3>Icon Buttons</h3>
<template preserve-content>
<!-- Icon in place of label -->
<vaadin-button theme="icon" aria-label="Add new item">
<iron-icon icon="valo:plus"></iron-icon>
<iron-icon icon="lumo:plus"></iron-icon>
</vaadin-button>

<!-- With "prefix/suffix" slot -->
<vaadin-button theme="icon" aria-label="Delete item">
<iron-icon icon="valo:cross" slot="prefix"></iron-icon>
<iron-icon icon="lumo:cross" slot="prefix"></iron-icon>
</vaadin-button>
</template>
</vaadin-demo-snippet>


</template>
<script>
class ButtonValoThemeDemos extends DemoReadyEventEmitter(ButtonDemo(Polymer.Element)) {
class ButtonLumoThemeDemos extends DemoReadyEventEmitter(ButtonDemo(Polymer.Element)) {
static get is() {
return 'button-valo-theme-demos';
return 'button-lumo-theme-demos';
}
}
customElements.define(ButtonValoThemeDemos.is, ButtonValoThemeDemos);
customElements.define(ButtonLumoThemeDemos.is, ButtonLumoThemeDemos);
</script>
</dom-module>
8 changes: 4 additions & 4 deletions demo/demos.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
}
,
{
"name": "Valo Theme",
"url": "button-valo-theme-demos",
"src": "button-valo-theme-demos.html",
"name": "Lumo Theme",
"url": "button-lumo-theme-demos",
"src": "button-lumo-theme-demos.html",
"meta": {
"title": "Vaadin Button Valo Theme",
"title": "Vaadin Button Lumo Theme",
"description": "",
"image": ""
}
Expand Down
2 changes: 1 addition & 1 deletion demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<link rel="import" href="button-demo.html">

<link rel="import" href="../vaadin-button.html">
<link rel="import" href="../../vaadin-valo-styles/icons.html">
<link rel="import" href="../../vaadin-lumo-styles/icons.html">

<vaadin-component-demo config-src="demos.json"></vaadin-component-demo>
</body>
Expand Down
50 changes: 25 additions & 25 deletions test/visual/valo.html → test/visual/lumo.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!doctype html>
<script src="../../../webcomponentsjs/webcomponents-loader.js"></script>
<link rel="import" href="../../vaadin-button.html">
<link rel="import" href="../../../vaadin-valo-styles/icons.html">
<link rel="import" href="../../../vaadin-lumo-styles/icons.html">

<custom-style>
<style include="valo-typography valo-color">
<style include="lumo-typography lumo-color">
body {
margin: 2em;
}
Expand All @@ -23,22 +23,22 @@ <h2>Sizing and vertical align</h2>
<vaadin-button>Default</vaadin-button>

<vaadin-button style="width: 200px;">
<iron-icon slot="prefix" icon="valo:plus"></iron-icon>
<iron-icon slot="prefix" icon="lumo:plus"></iron-icon>
<span>Fixed width</span>
</vaadin-button>

<vaadin-button style="height: 60px;">
Fixed height
<iron-icon slot="suffix" icon="valo:plus"></iron-icon>
<iron-icon slot="suffix" icon="lumo:plus"></iron-icon>
</vaadin-button>

<vaadin-button style="width: 200px; height: 80px;">
<iron-icon slot="prefix" icon="valo:plus"></iron-icon>
<iron-icon slot="prefix" icon="lumo:plus"></iron-icon>
Fixed width and height
</vaadin-button>

<vaadin-button>
<iron-icon slot="prefix" icon="valo:plus"></iron-icon>
<iron-icon slot="prefix" icon="lumo:plus"></iron-icon>
Multiple<br>lines
</vaadin-button>

Expand All @@ -50,25 +50,25 @@ <h2>Truncation and expansion</h2>
<vaadin-button style="width: 100px;">Longer text for a button</vaadin-button>

<vaadin-button style="width: 100px;">
<iron-icon slot="prefix" icon="valo:plus"></iron-icon>
<iron-icon slot="prefix" icon="lumo:plus"></iron-icon>
<span>Longer text for a button</span>
</vaadin-button>

<vaadin-button style="width: 100px;">
<span>Longer text for a button</span>
<iron-icon slot="suffix" icon="valo:plus"></iron-icon>
<iron-icon slot="suffix" icon="lumo:plus"></iron-icon>
</vaadin-button>

<vaadin-button style="width: 300px;">Longer text for a button</vaadin-button>

<vaadin-button style="width: 300px;">
<iron-icon slot="prefix" icon="valo:edit"></iron-icon>
<iron-icon slot="prefix" icon="lumo:edit"></iron-icon>
<span>Longer text for a button</span>
</vaadin-button>

<vaadin-button style="width: 300px;">
<span>Longer text for a button</span>
<iron-icon slot="suffix" icon="valo:arrow-right"></iron-icon>
<iron-icon slot="suffix" icon="lumo:arrow-right"></iron-icon>
</vaadin-button>


Expand All @@ -80,45 +80,45 @@ <h2>Truncation and expansion</h2>
<h2>Icons and size presets</h2>

<vaadin-button aria-label="Icon-only button" theme="large icon">
<iron-icon slot="prefix" icon="valo:plus"></iron-icon>
<iron-icon slot="prefix" icon="lumo:plus"></iron-icon>
</vaadin-button>

<vaadin-button theme="large">
<iron-icon slot="prefix" icon="valo:edit"></iron-icon>
<iron-icon slot="prefix" icon="lumo:edit"></iron-icon>
<span>Icon prefix</span>
</vaadin-button>

<vaadin-button theme="large">
<span>Icon suffix</span>
<iron-icon slot="suffix" icon="valo:arrow-right"></iron-icon>
<iron-icon slot="suffix" icon="lumo:arrow-right"></iron-icon>
</vaadin-button>

<vaadin-button aria-label="Icon-only button" theme="icon">
<iron-icon slot="prefix" icon="valo:plus"></iron-icon>
<iron-icon slot="prefix" icon="lumo:plus"></iron-icon>
</vaadin-button>

<vaadin-button>
<iron-icon slot="prefix" icon="valo:edit"></iron-icon>
<iron-icon slot="prefix" icon="lumo:edit"></iron-icon>
<span>Icon prefix</span>
</vaadin-button>

<vaadin-button>
<span>Icon suffix</span>
<iron-icon slot="suffix" icon="valo:arrow-right"></iron-icon>
<iron-icon slot="suffix" icon="lumo:arrow-right"></iron-icon>
</vaadin-button>

<vaadin-button aria-label="Icon-only button" theme="small icon">
<iron-icon slot="prefix" icon="valo:plus"></iron-icon>
<iron-icon slot="prefix" icon="lumo:plus"></iron-icon>
</vaadin-button>

<vaadin-button theme="small">
<iron-icon slot="prefix" icon="valo:edit"></iron-icon>
<iron-icon slot="prefix" icon="lumo:edit"></iron-icon>
<span>Icon prefix</span>
</vaadin-button>

<vaadin-button theme="small">
<span>Icon suffix</span>
<iron-icon slot="suffix" icon="valo:arrow-right"></iron-icon>
<iron-icon slot="suffix" icon="lumo:arrow-right"></iron-icon>
</vaadin-button>


Expand All @@ -132,13 +132,13 @@ <h2>Types</h2>
</vaadin-button>

<vaadin-button theme="primary">
<iron-icon slot="prefix" icon="valo:edit"></iron-icon>
<iron-icon slot="prefix" icon="lumo:edit"></iron-icon>
<span>Icon prefix</span>
</vaadin-button>

<vaadin-button theme="primary">
<span>Icon suffix</span>
<iron-icon slot="suffix" icon="valo:arrow-right"></iron-icon>
<iron-icon slot="suffix" icon="lumo:arrow-right"></iron-icon>
</vaadin-button>

<br>Tertiary:
Expand All @@ -148,13 +148,13 @@ <h2>Types</h2>
</vaadin-button>

<vaadin-button theme="tertiary">
<iron-icon slot="prefix" icon="valo:edit"></iron-icon>
<iron-icon slot="prefix" icon="lumo:edit"></iron-icon>
<span>Icon prefix</span>
</vaadin-button>

<vaadin-button theme="tertiary">
<span>Icon suffix</span>
<iron-icon slot="suffix" icon="valo:arrow-right"></iron-icon>
<iron-icon slot="suffix" icon="lumo:arrow-right"></iron-icon>
</vaadin-button>

<br>Tertiary inline:
Expand All @@ -164,13 +164,13 @@ <h2>Types</h2>
</vaadin-button>
and
<vaadin-button theme="tertiary-inline">
<iron-icon slot="prefix" icon="valo:edit"></iron-icon>
<iron-icon slot="prefix" icon="lumo:edit"></iron-icon>
<span>Icon prefix</span>
</vaadin-button>
and
<vaadin-button theme="tertiary-inline">
<span>Icon suffix</span>
<iron-icon slot="suffix" icon="valo:arrow-right"></iron-icon>
<iron-icon slot="suffix" icon="lumo:arrow-right"></iron-icon>
</vaadin-button>


Expand Down
Loading

0 comments on commit 1bbfc12

Please sign in to comment.