Skip to content

Commit 906d52e

Browse files
frankpaganfrankpagan
committed
resolve mrge conflicts
1 parent 49edd83 commit 906d52e

File tree

1 file changed

+0
-106
lines changed

1 file changed

+0
-106
lines changed

‎docs/index.html‎

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

0 commit comments

Comments
 (0)