Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add RTL specific styles #139

Merged
merged 2 commits into from
Jan 13, 2020
Merged

Add RTL specific styles #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11677bc
Add rtl specific styles and visual tests
yuriy-fix Jan 9, 2020
d16debe
Update default button styles
yuriy-fix Jan 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/vaadin-button.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
position: absolute;
top: 0;
left: 0;
right: 0;
width: 100%;
height: 100%;
opacity: 0;
Expand Down
50 changes: 50 additions & 0 deletions test/visual/default-rtl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<!DOCTYPE html>

<head lang="en">
<meta charset="UTF-8">

<script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
<script>
const theme = window.location.search.replace(/.*theme=(\w+).*/, '$1') || 'lumo';
document.write(`<link rel="import" href="../../theme/${theme}/vaadin-button.html">`);
</script>

<link rel="import" href="../../../vaadin-lumo-styles/icons.html">
<link rel="import" href="../../../iron-icon/iron-icon.html">
</head>

<body>

<form style="display: inline-block;">
<fieldset id="default-tests">

<vaadin-button disabled dir="rtl">
Disabled
</vaadin-button>

<vaadin-button dir="rtl">
<img src="vaadin-logo.svg">
</vaadin-button>

<vaadin-button theme="tertiary" dir="rtl">
Tertiary
</vaadin-button>

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

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

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

</fieldset>
</form>

</body>
Binary file added test/visual/screens/vaadin-button/default-rtl-tests-lumo/default/chrome.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added test/visual/screens/vaadin-button/default-rtl-tests-lumo/default/firefox.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added test/visual/screens/vaadin-button/default-rtl-tests-material/default/chrome.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added test/visual/screens/vaadin-button/default-rtl-tests-material/default/firefox.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions test/visual/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ gemini.suite('vaadin-button', function(rootSuite) {
.capture('default');
});

gemini.suite(`default-rtl-tests-${theme}`, function(suite) {
suite
.setUrl(`default-rtl.html?theme=${theme}`)
.setCaptureElements('body')
.capture('default');
});

gemini.suite(`colors-${theme}`, function(suite) {
suite
.setUrl(`colors.html?theme=${theme}`)
Expand Down
18 changes: 18 additions & 0 deletions theme/lumo/vaadin-button-styles.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,24 @@
margin-left: 0;
margin-right: 0;
}

/* RTL specific styles */

:host([dir="rtl"]) [part="prefix"] {
margin-left: 0.25em;
margin-right: -0.25em;
}

:host([dir="rtl"]) [part="suffix"] {
margin-left: -0.25em;
margin-right: 0.25em;
}

:host([dir="rtl"][theme~="icon"]) [part="prefix"],
:host([dir="rtl"][theme~="icon"]) [part="suffix"] {
margin-left: 0;
margin-right: 0;
}
</style>
</template>
</dom-module>
31 changes: 31 additions & 0 deletions theme/material/vaadin-button-styles.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,37 @@
margin-left: 8px;
margin-right: -4px;
}

/* RTL specific styles */

:host([dir="rtl"])::before {
left: auto;
right: 0;
}

:host([dir="rtl"])::after {
left: auto;
right: 50%;
transform: translate(50%, -50%);
}

:host([active][dir="rtl"])::after {
transform: translate(50%, -50%) scale(0.0000001);
}

:host(:hover:not([active])[dir="rtl"])::after {
transform: translate(50%, -50%) scale(1);
}

:host([dir="rtl"]) [part="prefix"] ::slotted(iron-icon) {
margin-right: -4px;
margin-left: 8px;
}

:host([dir="rtl"]) [part="suffix"] ::slotted(iron-icon) {
margin-left: -4px;
margin-right: 8px;
}
</style>
</template>
</dom-module>