Skip to content

Commit 3a98437

Browse files
frankpaganfrankpagan
committed
resolve mrge conflicts
1 parent cb63079 commit 3a98437

File tree

1 file changed

+0
-104
lines changed

1 file changed

+0
-104
lines changed

‎docs/index.html‎

Lines changed: 0 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<<<<<<< HEAD
21
<!DOCTYPE html>
32
<html lang="en">
43
<head>
@@ -236,106 +235,3 @@ <h4>
236235
<script src="https://cdn.cocreate.app/latest/CoCreate.min.js"></script>
237236
</body>
238237
</html>
239-
=======
240-
<!DOCTYPE html>
241-
<html lang="en">
242-
<head>
243-
<meta charset="utf-8">
244-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
245-
<meta name="viewport" content="width=device-width, initial-scale=1">
246-
<title>CoCreate-server-side-render Documentation | CoCreateJS </title>
247-
<link rel="icon" type="image/png" sizes="32x32" href="https://cocreate.app/images/favicon.ico">
248-
<meta name="description" content="A simple HTML5 and pure javascript component. Easy configuration using data-attributes and highly styleable." />
249-
<meta name="keywords" content="helper classes, utility classes, css framework, css library, inline style classes" />
250-
<meta name="robots" content="index,follow" />
251-
252-
<!-- CoCreate CSS CDN -->
253-
<link rel="stylesheet" href="https://cdn.cocreate.app/latest/CoCreate.min.css" type="text/css" />
254-
255-
</head>
256-
257-
<body>
258-
<div collection="" document_id="" name="" id="cocreate-server-side-render">
259-
<div class="display:flex flex-wrap:wrap justify-content:space-between margin:10px">
260-
<div class="display:flex align-items:center">
261-
<h2>CoCreate-server-side-render</h2>
262-
</div>
263-
<div class="display:flex align-items:center font-size:20px" share-height="600" share-width="500" share-media="https://via.placeholder.com/300/09f/fff.png">
264-
<a href="https://github.com/CoCreate-app/CoCreate-server-side-render" target="_blank" class="margin-right:15px"><i class="fab fa-github"></i></a>
265-
<a class="margin-right:15px share" share-network='twitter' title="Share on twitter"><i class="fab fa-twitter"></i></a>
266-
<a class="margin-right:15px share" share-network='facebook' title="Share on Facebook"><i class="fab fa-facebook"></i></a>
267-
<a class="margin-right:15px share" share-network='instagram' title="Share on instagram"><i class="fab fa-instagram"></i></a>
268-
<a class="margin-right:15px share" share-network='share' title="Share on share"><i class="fas fa-share-alt"></i></a>
269-
</div>
270-
</div>
271-
<p class="max-width:500px margin:20px_10px">A simple HTML5, CSS and pure javascript component. Easy configuration using data-attributes and highly styleable.</h1>
272-
<div id="server-side-render-section" class="display:flex flex-wrap:wrap">
273-
<div class="flex-grow:1 width:300px padding:20px_10px">
274-
<h2 class="border-bottom:1px_solid_lightgrey padding:5px_0px">Install</h2>
275-
<pre class="margin-top:15px"><code class="language-javascript">npm install cocreate-server-side-render</code></pre>
276-
<p class="padding:10px_0px">Or you can use cdn link:</p>
277-
<pre><code class="language-javascript">https://cdn.cocreate.app/js/CoCreate-server-side-render.min.js</code></pre>
278-
279-
<h2 class="border-bottom:1px_solid_lightgrey margin-top:20px padding:5px_0px">Usage</h2>
280-
<p class="padding:10px_0px">server-side-render usage content</p>
281-
<pre><code class="language-html">&lt;div&gt;&lt;/div&gt;</code></pre>
282-
283-
<h2 class="border-bottom:1px_solid_lightgrey margin-top:20px padding:5px_0px">Reference</h2>
284-
<p class="padding:10px_0px">This is server-side-render reference content</p>
285-
<pre><code class="language-javascript">&lt;div&gt;&lt;/div&gt;</code></pre>
286-
<p class="padding:10px_0px">This is server-side-render reference content</p>
287-
288-
<h2 class="border-bottom:1px_solid_lightgrey margin-top:20px padding:5px_0px">Attributes</h2>
289-
<ul class="list-style-type:none ">
290-
<li class="padding:15px_0px border-bottom:1px_solid_lightgrey">
291-
<h4><span>server-side-render</span> <span class="cocreate-badge success">string</span> <span class="cocreate-badge warning">optional</span></h4>
292-
<p>server-side-render-attribute</p>
293-
</li>
294-
<li class="padding:15px_0px border-bottom:1px_solid_lightgrey">
295-
<h4><span>server-side-render</span> <span class="cocreate-badge success">string</span> <span class="cocreate-badge warning">optional</span></h4>
296-
<p>server-side-render-attribute</p>
297-
</li>
298-
</ul>
299-
</div>
300-
301-
<div class="flex-grow:1 width:300px padding:0px_10px margin:20px_0px border-bottom:1px_solid_lightgrey">
302-
<!-- SandBox -->
303-
<div class="display:flex flex-direction:column position:relative overflow:hidden card border-radius:2px width:auto height:600px margin-top:20px" id="playground">
304-
305-
<div id="demo-code" resizable class="position:relative height:50%">
306-
<textarea type="code" lang="html" collection="demos" document_id="" name="demo" save="false" id="demo" class="height:100% width:100% outline:none border:none resize:none padding:5px"></textarea>
307-
<div resize="bottom" class="background:lightgrey"></div>
308-
</div>
309-
310-
<div id="demo-preview" class="position:relative overflow:auto background-color:white">
311-
<div get-value="#demo" class="padding:20px"></div>
312-
</div>
313-
314-
<div class="font-size:20px position:absolute top:10px right:10px opacity:0.6">
315-
<a class="margin-right:10px" id="eye" show="#eye-slash" hide="#eye, #demo-preview" toggle="code-height" toggle-target="#demo-code"><i class="far fa-eye"></i></a>
316-
<a class="margin-right:10px" hidden id="eye-slash" show="#eye, #demo-preview" hide="#eye-slash" toggle="code-height" toggle-target="#demo-code"><i class="fas fa-eye-slash"></i></a>
317-
<a class="margin-right:10px" id="code" show="#code-slash" hide="#code, #demo-code"><i class="fa fa-code"></i></a>
318-
<a class="margin-right:10px" hidden id="code-slash" show="#code, #demo-code" hide="#code-slash"><i class="fas fa-code"></i></a>
319-
<a class="margin-right:5px" fullscreen target="#playground"><i class="fas fa-expand"></i></a>
320-
</div>
321-
322-
</div>
323-
<!-- End SandBox -->
324-
</div>
325-
</div>
326-
327-
</div>
328-
</div>
329-
330-
<script>
331-
var CoCreateConfig = {
332-
key: '2061acef-0451-4545-f754-60cf8160',
333-
organization_id: '5ff747727005da1c272740ab'
334-
}
335-
</script>
336-
337-
<!--CoCreateJS-->
338-
<script src="https://cdn.cocreate.app/latest/CoCreate.min.js"></script>
339-
</body>
340-
</html>
341-
>>>>>>> master

0 commit comments

Comments
 (0)