Skip to content
This repository has been archived by the owner on Dec 19, 2024. It is now read-only.

Commit

Permalink
Merge pull request #161 from PolymerElements/fix-paper-material-dom-id
Browse files Browse the repository at this point in the history
update paper-material
  • Loading branch information
notwaldorf authored May 12, 2017
2 parents e31b82f + ec73204 commit bd89a2e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions paper-button.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<link rel="import" href="../polymer/polymer.html">
<link rel="import" href="../iron-flex-layout/iron-flex-layout.html">
<link rel="import" href="../paper-behaviors/paper-button-behavior.html">
<link rel="import" href="../paper-styles/element-styles/paper-material.html">
<link rel="import" href="../paper-styles/element-styles/paper-material-styles.html">

<!--
Material design: [Buttons](https://www.google.com/design/spec/components/buttons.html)
Expand Down Expand Up @@ -83,7 +83,7 @@

<dom-module id="paper-button">
<template strip-whitespace>
<style include="paper-material">
<style include="paper-material-styles">
/* Need to specify the same specificity as the styles imported from paper-material. */
:host {
@apply --layout-inline;
Expand All @@ -106,7 +106,7 @@
cursor: pointer;
z-index: 0;
padding: 0.7em 0.57em;

@apply --paper-font-common-base;
@apply --paper-button;
}
Expand Down

0 comments on commit bd89a2e

Please sign in to comment.