Skip to content

Commit

Permalink
Merge pull request #25 from BrightspaceUI/polymer-3-2018-11-27-130611
Browse files Browse the repository at this point in the history
Polymer 3 Conversion
  • Loading branch information
margaree authored Nov 27, 2018
2 parents dbe2e7c + a8aa92e commit 834576a
Show file tree
Hide file tree
Showing 19 changed files with 577 additions and 525 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
test/acceptance/*
reports
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"extends": "brightspace/polymer-config"
"extends": "brightspace/polymer-3-config"
}
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
bower_components
bower_components-1.x
bower-1.x.json
node_modules/
package-lock.json
45 changes: 0 additions & 45 deletions bower.json

This file was deleted.

12 changes: 8 additions & 4 deletions d2l-alert-shared-styles.html → d2l-alert-shared-styles.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<link rel="import" href="../polymer/polymer.html">
<link rel="import" href="../d2l-colors/d2l-colors.html">
<custom-style>
import '../@polymer/polymer/polymer-legacy.js';
import '../d2l-colors/d2l-colors.js';
const $_documentContainer = document.createElement('template');

$_documentContainer.innerHTML = `<custom-style>
<style is="custom-style">
html {
--d2l-alert-critical-color: var(--d2l-color-cinnabar);
Expand All @@ -9,4 +11,6 @@
--d2l-alert-success-color: var(--d2l-color-olivine);
}
</style>
</custom-style>
</custom-style>`;

document.head.appendChild($_documentContainer.content);
177 changes: 0 additions & 177 deletions d2l-alert-toast.html

This file was deleted.

Loading

0 comments on commit 834576a

Please sign in to comment.