Skip to content

Commit

Permalink
Merge pull request #213 from predixdesignsystem/update-datagrid-comment
Browse files Browse the repository at this point in the history 
Updated style and message for px-data-table and px-data-grid reference
  • Loading branch information
@arongraham-ge
arongraham-ge authored Dec 1, 2018
2 parents 7305dc2 + 82f1914 commit e3f66fd
Show file tree
Hide file tree
Showing 7 changed files with 1,140 additions and 1,116 deletions.
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "px-data-table",
"version": "6.1.3",
"version": "6.1.4",
"main": [
"px-data-table.html"
],
Expand Down
23 changes: 0 additions & 23 deletions css/px-data-table-predix-styles.html
View file

This file was deleted.

36 changes: 26 additions & 10 deletions demo/px-data-table-column-demo.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,22 @@
<!-- Demo DOM module -->
<dom-module id="px-data-table-column-demo">
<template>

<style>
.message-banner {
background-color: #09819c;
padding: 1rem 0;
color: white;
}
.message-banner .message {
width: 80%;
margin: 0 auto;
max-width: 80rem;
}
.message-banner .message a {
color: white!important;
text-decoration: underline!important;
}
</style>
<!-- Header -->
<px-demo-header
module-name="px-data-table-column"
Expand All @@ -42,15 +57,16 @@
tablet desktop>
</px-demo-header>

<template is="dom-if" if="{{!displayDemo}}">
<p class="demo-layout--center">
<strong>Note:</strong> You are attempting to view this Polymer 1.x component in a Polymer 2.x environment.
Please access
<a href="https://predix-ui.com/px-data-table/px-data-table">https://predix-ui.com/px-data-table/px-data-table</a>
directly for a demo of this component in a Polymer 1.x environment. A Polymer 2.x compatible
version of the data grid will be coming in the next few weeks. We appreciate your patience
during this transition.
</p>
<template is="dom-if" if="{{!displayDemo}}"> -->
<div class="message-banner">
<div class="message">
<strong>Note:</strong> You are attempting to view this Polymer 1.x component in a Polymer 2.x environment.
Please access
<a href="https://predix-ui.com/px-data-table/px-data-table">https://predix-ui.com/px-data-table/px-data-table</a>
directly for a demo of this component in a Polymer 1.x environment. For Polymer 2.x projects please use
<a href="https://www.predix-ui.com/#/elements/data-grid/px-data-grid">px-data-grid</a>
</div>
</div>
</template>
<template is="dom-if" if="{{displayDemo}}">

Expand Down
33 changes: 24 additions & 9 deletions demo/px-data-table-demo.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,20 @@
.toaster--message--label {
font-style: italic;
}
.message-banner {
background-color: #09819c;
padding: 1rem 0;
color: white;
}
.message-banner .message {
width: 80%;
margin: 0 auto;
max-width: 80rem;
}
.message-banner .message a {
color: white!important;
text-decoration: underline!important;
}
</style>

<!-- Header -->
Expand All @@ -80,15 +94,16 @@
</px-demo-header>

<template is="dom-if" if="{{!displayDemo}}">
<p class="demo-layout--center">
<strong>Note:</strong> You are attempting to view this Polymer 1.x component in a Polymer 2.x environment.
Please access
<a href="https://predix-ui.com/px-data-table/px-data-table">https://predix-ui.com/px-data-table/px-data-table</a>
directly for a demo of this component in a Polymer 1.x environment. A Polymer 2.x compatible
version of the data grid will be coming in the next few weeks. We appreciate your patience
during this transition.
</p>
</template>
<div class="message-banner">
<div class="message">
<strong>Note:</strong> You are attempting to view this Polymer 1.x component in a Polymer 2.x environment.
Please access
<a href="https://predix-ui.com/px-data-table/px-data-table">https://predix-ui.com/px-data-table/px-data-table</a>
directly for a demo of this component in a Polymer 1.x environment. For Polymer 2.x projects please use
<a href="https://www.predix-ui.com/#/elements/data-grid/px-data-grid">px-data-grid</a>
</div>
</div>
</template>
<template is="dom-if" if="{{displayDemo}}">

<!-- Interactive -->
Expand Down
36 changes: 26 additions & 10 deletions demo/px-data-table-highlight-demo.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,22 @@
<!-- Demo DOM module -->
<dom-module id="px-data-table-highlight-demo">
<template>

<style>
.message-banner {
background-color: #09819c;
padding: 1rem 0;
color: white;
}
.message-banner .message {
width: 80%;
margin: 0 auto;
max-width: 80rem;
}
.message-banner .message a {
color: white!important;
text-decoration: underline!important;
}
</style>
<!-- Header -->
<px-demo-header
module-name="px-data-table-highlight"
Expand All @@ -44,15 +59,16 @@
</px-demo-header>

<template is="dom-if" if="{{!displayDemo}}">
<p class="demo-layout--center">
<strong>Note:</strong> You are attempting to view this Polymer 1.x component in a Polymer 2.x environment.
Please access
<a href="https://predix-ui.com/px-data-table/px-data-table">https://predix-ui.com/px-data-table/px-data-table</a>
directly for a demo of this component in a Polymer 1.x environment. A Polymer 2.x compatible
version of the data grid will be coming in the next few weeks. We appreciate your patience
during this transition.
</p>
</template>
<div class="message-banner">
<div class="message">
<strong>Note:</strong> You are attempting to view this Polymer 1.x component in a Polymer 2.x environment.
Please access
<a href="https://predix-ui.com/px-data-table/px-data-table">https://predix-ui.com/px-data-table/px-data-table</a>
directly for a demo of this component in a Polymer 1.x environment. For Polymer 2.x projects please use
<a href="https://www.predix-ui.com/#/elements/data-grid/px-data-grid">px-data-grid</a>
</div>
</div>
</template>
<template is="dom-if" if="{{displayDemo}}">

<!-- Interactive -->
Expand Down
Loading

0 comments on commit e3f66fd

Please sign in to comment.