Skip to content

Commit

Permalink
Use native css properties
Browse files Browse the repository at this point in the history
  • Loading branch information
Sleeckx committed Feb 15, 2017
1 parent f215c23 commit 57aad8d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/WebComponents/Menu/menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ $backgroundColor: $blue-grey-900;
.label {
display: block;
font-size: var(--theme-h3);
line-height: var(--vi-menu-expanded-header-height);
height: var(--vi-menu-expanded-header-height);
line-height: calc(var(--theme-h1) * 2);
height: calc(var(--theme-h1) * 2);
background-color: var(--theme-color-dark);
white-space: nowrap;
overflow: hidden;
Expand Down
3 changes: 0 additions & 3 deletions src/WebComponents/Menu/menu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@ namespace Vidyano.WebComponents {
Enumerable.from(Polymer.dom(this.app).querySelectorAll("[vi-menu-element~='footer']")).forEach(element => Polymer.dom(this.$["footerElements"]).appendChild(element));
Enumerable.from(Polymer.dom(this.app).querySelectorAll("[vi-menu-element~='header']")).forEach(element => Polymer.dom(this.$["headerElements"]).appendChild(element));

// Fix for FireFox line-height calc bug (https://bugzilla.mozilla.org/show_bug.cgi?id=594933)
this.customStyle["--vi-menu-expanded-header-height"] = (parseInt(this.getComputedStyleValue("--theme-h1")) * 2) + "px";

if (!Menu._minResizeWidth)
Menu._minResizeWidth = this.offsetWidth;

Expand Down
2 changes: 1 addition & 1 deletion src/vidyano.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<script> Polymer = { lazyRegister: true }; </script>
<script> Polymer = { lazyRegister: "max", useNativeCSSProperties: true }; </script>
<link rel="import" href="Libs/polymer/polymer.html" />
<link rel="import" href="Libs/layout/layout.html" />
<link rel="import" href="vidyano-lite.html" />
Expand Down

0 comments on commit 57aad8d

Please sign in to comment.