Merge "Update deprecated @apply and var() CSS syntax for Polymer 2.0"

This commit is contained in:
Kasper Nilsson
2017-10-30 20:48:10 +00:00
committed by Gerrit Code Review
3 changed files with 10 additions and 10 deletions

View File

@@ -91,16 +91,16 @@ limitations under the License.
/* CSS Mixins should be applied last. */
section.assignee {
@apply(--change-metadata-assignee);
@apply --change-metadata-assignee;
}
section.labelStatus {
@apply(--change-metadata-label-status);
@apply --change-metadata-label-status;
}
section.strategy {
@apply(--change-metadata-strategy);
@apply --change-metadata-strategy;
}
section.topic {
@apply(--change-metadata-topic);
@apply --change-metadata-topic;
}
gr-account-chip[disabled],
gr-linked-chip[disabled] {

View File

@@ -37,10 +37,10 @@ limitations under the License.
vertical-align: -.25em;
}
.text {
@apply(--gr-account-label-text-style);
@apply --gr-account-label-text-style;
}
.text:hover {
@apply(--gr-account-label-text-hover-style);
@apply --gr-account-label-text-hover-style;
}
</style>
<span>

View File

@@ -51,7 +51,7 @@ limitations under the License.
}
paper-button[raised] {
background-color: var(--gr-button-background, #fff);
color: var(--gr-button-color, --color-link);
color: var(--gr-button-color, var(--color-link));
}
:host([no-uppercase]) paper-button {
text-transform: none;
@@ -71,13 +71,13 @@ limitations under the License.
:host([link]) paper-button:focus,
paper-button[raised]:hover,
paper-button[raised]:focus {
color: var(--gr-button-hover-color, --color-button-hover);
color: var(--gr-button-hover-color, var(--color-button-hover));
}
:host([primary]) paper-button[raised]:hover,
:host([primary]) paper-button[raised]:focus,
:host([secondary]) paper-button[raised]:hover,
:host([secondary]) paper-button[raised]:focus {
background-color: var(--gr-button-hover-background-color, --color-button-hover);
background-color: var(--gr-button-hover-background-color, var(--color-button-hover));
color: var(--gr-button-color, #fff);
}
paper-button,
@@ -128,4 +128,4 @@ limitations under the License.
</paper-button>
</template>
<script src="gr-button.js"></script>
</dom-module>
</dom-module>