Skip to content

Commit 097f040

Browse files
bmarkovbmarkov
committed
updates
1 parent 30ac771 commit 097f040

11 files changed

+2
-536
lines changed

‎README.md‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
|
77
[Documentation ↗](https://www.htmlelements.com/docs/)
88
|
9-
<<<<<<< HEAD
109
[Installation ↗](https://www.npmjs.com/package/@smarthtmlelements/smart-core)
11-
=======
12-
[Installation ↗](https://www.npmjs.com/package/@smarthtmlelements/smarthtmlelements-core)
13-
>>>>>>> origin/master
1410

1511
[&lt;smart-button&gt;](http://htmlelements.com/demos/button/) is a Custom HTML Element providing an alternative of the standard button, part of the [Smart HTML Elements](https://htmlelements.com/).
1612

@@ -19,19 +15,10 @@
1915
<custom-element-demo>
2016
<template>
2117
<script src="../webcomponentsjs/webcomponents-lite.js"></script>
22-
<<<<<<< HEAD
2318
<script src="../smart-core/source/smart.element.js"></script>
2419
<script src="../smart-core/source/smart.button.js"></script>
2520
<link rel="stylesheet" href="../smart-core/source/styles/smart.base.css" type="text/css" />
2621
<link rel="stylesheet" href="../smart-core/source/styles/smart.material.css" type="text/css" />
27-
=======
28-
<script src="../smart-core/source-minified/native-shim.js"></script>
29-
<script src="../smart-core/source-minified/smart.element-polyfills.js"></script>
30-
<script src="../smart-core/source-minified/smart.element.js"></script>
31-
<script src="../smart-core/source-minified/smart.button.js"></script>
32-
<link rel="stylesheet" href="../smart-core/source-minified/styles/smart.base.css" type="text/css" />
33-
<link rel="stylesheet" href="../smart-core/source-minified/styles/smart.material.css" type="text/css" />
34-
>>>>>>> origin/master
3522
<next-code-block></next-code-block>
3623
</template>
3724
</custom-element-demo>

‎demos/smart-button-attributes-synchronization.htm‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,13 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
<<<<<<< HEAD
54
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/1.2.0/webcomponents-lite.js"></script>
65
<link rel="stylesheet" href="../../smart-core/source/styles/smart.base.css" type="text/css" />
76
<link rel="stylesheet" href="../styles/demos.css" type="text/css" />
87

98
<script type="text/javascript" src="../../smart-core/source/smart.element.js"></script>
109
<script type="text/javascript" src="../../smart-core/source/smart.button.js"></script>
11-
=======
12-
<script>
13-
// IE/Edge polyfill.
14-
if (!window.customElements) {
15-
document.writeln('<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/0.7.23/webcomponents-lite.js"><\/script>');
16-
document.write('<!--');
17-
}
18-
</script>
19-
<script type="text/javascript" src="../../smart-core/source-minified/native-shim.js"></script>
20-
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/1.0.22/webcomponents-lite.js"></script>
21-
<!--! do not remove -->
22-
<script>
23-
// IE polyfill.
24-
if (!(window.CSS && window.CSS.supports && window.CSS.supports('(--fake-var: 0)'))) {
25-
document.writeln('<link rel="stylesheet" href="../../smart-core/source-minified/styles/smart.base-novars.css" type="text/css" />');
26-
document.write('<!--');
27-
}
28-
</script>
29-
<link rel="stylesheet" href="../../smart-core/source-minified/styles/smart.base.css" type="text/css" />
30-
<!--! do not remove -->
31-
<link rel="stylesheet" href="../styles/demos.css" type="text/css" />
32-
<script type="text/javascript" src="../../smart-core/source-minified/smart.element-polyfills.js"></script>
33-
<script type="text/javascript" src="../../smart-core/source-minified/smart.element.js"></script>
34-
<script type="text/javascript" src="../../smart-core/source-minified/smart.button.js"></script>
35-
>>>>>>> origin/master
10+
3611
<script>
3712
function clickMe(event) {
3813
var button = document.querySelector("smart-button");

‎demos/smart-button-create-from-script.htm‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,12 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
<<<<<<< HEAD
5-
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/1.2.0/webcomponents-lite.js"></script>
4+
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/1.2.0/webcomponents-lite.js"></script>
65
<link rel="stylesheet" href="../../smart-core/source/styles/smart.base.css" type="text/css" />
76
<link rel="stylesheet" href="../styles/demos.css" type="text/css" />
87

98
<script type="text/javascript" src="../../smart-core/source/smart.element.js"></script>
109
<script type="text/javascript" src="../../smart-core/source/smart.button.js"></script>
11-
=======
12-
<script>
13-
// IE/Edge polyfill.
14-
if (!window.customElements) {
15-
document.writeln('<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/0.7.23/webcomponents-lite.js"><\/script>');
16-
document.write('<!--');
17-
}
18-
</script>
19-
<script type="text/javascript" src="../../smart-core/source-minified/native-shim.js"></script>
20-
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/1.0.22/webcomponents-lite.js"></script>
21-
<!--! do not remove -->
22-
<script>
23-
// IE polyfill.
24-
if (!(window.CSS && window.CSS.supports && window.CSS.supports('(--fake-var: 0)'))) {
25-
document.writeln('<link rel="stylesheet" href="../../smart-core/source-minified/styles/smart.base-novars.css" type="text/css" />');
26-
document.write('<!--');
27-
}
28-
</script>
29-
<link rel="stylesheet" href="../../smart-core/source-minified/styles/smart.base.css" type="text/css" />
30-
<!--! do not remove -->
31-
<link rel="stylesheet" href="../styles/demos.css" type="text/css" />
32-
<script type="text/javascript" src="../../smart-core/source-minified/smart.element-polyfills.js"></script>
33-
<script type="text/javascript" src="../../smart-core/source-minified/smart.element.js"></script>
34-
<script type="text/javascript" src="../../smart-core/source-minified/smart.button.js"></script>
35-
>>>>>>> origin/master
3610
<script>
3711
window.onload = function () {
3812
var button = document.createElement("smart-button");

‎demos/smart-button-custom-module.htm‎

Lines changed: 0 additions & 75 deletions
This file was deleted.

‎demos/smart-button-events.htm‎

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎demos/smart-button-image.htm‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎demos/smart-button-overview.htm‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,12 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
<<<<<<< HEAD
54
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/1.2.0/webcomponents-lite.js"></script>
65
<link rel="stylesheet" href="../../smart-core/source/styles/smart.base.css" type="text/css" />
76
<link rel="stylesheet" href="../styles/demos.css" type="text/css" />
87

98
<script type="text/javascript" src="../../smart-core/source/smart.element.js"></script>
109
<script type="text/javascript" src="../../smart-core/source/smart.button.js"></script>
11-
=======
12-
<script>
13-
// IE/Edge polyfill.
14-
if (!window.customElements) {
15-
document.writeln('<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/0.7.23/webcomponents-lite.js"><\/script>');
16-
document.write('<!--');
17-
}
18-
</script>
19-
<script type="text/javascript" src="../../smart-core/source-minified/native-shim.js"></script>
20-
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/1.0.22/webcomponents-lite.js"></script>
21-
<!--! do not remove -->
22-
<script>
23-
// IE polyfill.
24-
if (!(window.CSS && window.CSS.supports && window.CSS.supports('(--fake-var: 0)'))) {
25-
document.writeln('<link rel="stylesheet" href="../../smart-core/source-minified/styles/smart.base-novars.css" type="text/css" />');
26-
document.write('<!--');
27-
}
28-
</script>
29-
<link rel="stylesheet" href="../../smart-core/source-minified/styles/smart.base.css" type="text/css" />
30-
<!--! do not remove -->
31-
<link rel="stylesheet" href="../styles/demos.css" type="text/css" />
32-
<script type="text/javascript" src="../../smart-core/source-minified/smart.element-polyfills.js"></script>
33-
<script type="text/javascript" src="../../smart-core/source-minified/smart.element.js"></script>
34-
<script type="text/javascript" src="../../smart-core/source-minified/smart.button.js"></script>
35-
>>>>>>> origin/master
3610
</head>
3711
<body>
3812
<smart-button id="button">Click Me</smart-button>

0 commit comments

Comments
 (0)