Skip to content

Commit

Permalink
Merge 37a40cb into 66277a5
Browse files Browse the repository at this point in the history
  • Loading branch information
web-padawan committed Jun 20, 2019
2 parents 66277a5 + 37a40cb commit cf62e5c
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 9 deletions.
9 changes: 7 additions & 2 deletions test/visual/anchor-tabs.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@

<script>
const theme = window.location.search.replace(/.*theme=(\w+).*/, '$1') || 'lumo';
document.write(`<link rel="import" href="../../theme/${theme}/vaadin-tab.html">`);
document.write(`<link rel="import" href="../../theme/${theme}/vaadin-tabs.html">`);
document.write(`
<link rel="import" href="../../theme/${theme}/vaadin-tab.html">
<link rel="import" href="../../theme/${theme}/vaadin-tabs.html">
<custom-style>
<style include="${theme}-typography ${theme === 'lumo' ? theme + '-color' : theme + '-color-light'}"></style>
</custom-style>
`);
</script>
</head>

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions theme/lumo/vaadin-tab-styles.html
Original file line number Diff line number Diff line change
Expand Up @@ -117,21 +117,21 @@
justify-content: center;
}

:host ::slotted(a[href]) {
:host ::slotted(a) {
display: flex;
width: 100%;
align-items: center;
height: 100%;
margin: -0.5rem -0.75rem;
padding: 0.5rem 0.75rem;
text-decoration: none;
color: inherit;
outline: none;
}

:host ::slotted(a[href]:hover),
:host ::slotted(a[href]:focus) {
color: inherit;
/*
Override the CSS inherited from `lumo-color` and `lumo-typography`.
Note: `!important` is needed because of the `:slotted` specificity.
*/
text-decoration: none !important;
color: inherit !important;
}

:host ::slotted(iron-icon) {
Expand Down

0 comments on commit cf62e5c

Please sign in to comment.