Skip to content

Commit

Permalink
Merge pull request #2 from westonganger/jquery3
Browse files Browse the repository at this point in the history
Make jquery3 compatible
  • Loading branch information
paomedia authored Feb 7, 2020
2 parents ffc3a0f + a2d8f7c commit a88014e
Show file tree
Hide file tree
Showing 27 changed files with 61 additions and 51 deletions.
9 changes: 3 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Clearmin Web Template
# Clearmin Web Template

![Clearmin template](preview.png)

Expand Down Expand Up @@ -60,7 +60,7 @@ To start using Clearmin template in a new project you can use this minimal templ
</div>
<footer class="cm-footer"><span class="pull-right">&copy; ACME Inc.</span></footer>
</div>
<script src="assets/js/lib/jquery-2.1.3.min.js"></script>
<script src="assets/js/lib/jquery.min.js"></script>
<script src="assets/js/jquery.mousewheel.min.js"></script>
<script src="assets/js/jquery.cookie.min.js"></script>
<script src="assets/js/fastclick.min.js"></script>
Expand All @@ -84,7 +84,7 @@ To start using Clearmin template in a new project you can use this minimal templ

**Javascript files (just before `</body>`) :**

* assets/js/lib/jquery-2.1.3.min.js (required by bootstrap)
* assets/js/lib/jquery.min.js (required by bootstrap)
* assets/js/lib/jquery.mousewheel.min.js (catch some scrolling events)
* assets/js/lib/jquery.cookie.min.js (cookie manipulation plugin)
* assets/js/lib/fastclick.min.js (enhance mobile device click events)
Expand Down Expand Up @@ -121,9 +121,6 @@ You got two different way to restore this state :
* [Material Design Icons](https://github.com/google/material-design-icons) Google SVG icons
* [D3.js](http://d3js.org/) Data-Driven Documents
* [C3.js](http://c3js.org/) D3-based reusable chart library
* [Highlight.js](https://highlightjs.org/) Syntax highlighting for the Web
* [Fastclick](https://github.com/ftlabs/fastclick) Polyfill to remove click delays on browsers with touch UIs
* [Jquery-cookie](https://github.com/carhartl/jquery-cookie) A simple, lightweight jQuery plugin for reading, writing and deleting cookies
* [Jquery-mousewheel](https://github.com/jquery/jquery-mousewheel) A jQuery plugin that adds cross-browser mouse wheel support


2 changes: 1 addition & 1 deletion demo/assets/js/clearmin.min.js

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions demo/assets/js/lib/jquery.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions demo/components-buttons.html
Original file line number Diff line number Diff line change
Expand Up @@ -324,11 +324,11 @@ <h4 class="list-group-item-heading">
</div>
<footer class="cm-footer"><span class="pull-left">Connected as John Smith</span><span class="pull-right">&copy; PAOMEDIA SARL</span></footer>
</div>
<script src="assets/js/lib/jquery-2.1.3.min.js"></script>
<script src="assets/js/lib/jquery.min.js"></script>
<script src="assets/js/jquery.mousewheel.min.js"></script>
<script src="assets/js/jquery.cookie.min.js"></script>
<script src="assets/js/fastclick.min.js"></script>
<script src="assets/js/bootstrap.min.js"></script>
<script src="assets/js/clearmin.min.js"></script>
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions demo/components-interactive.html
Original file line number Diff line number Diff line change
Expand Up @@ -322,12 +322,12 @@ <h4 id="tooltips-in-a-modal">
</div>
<footer class="cm-footer"><span class="pull-left">Connected as John Smith</span><span class="pull-right">&copy; PAOMEDIA SARL</span></footer>
</div>
<script src="assets/js/lib/jquery-2.1.3.min.js"></script>
<script src="assets/js/lib/jquery.min.js"></script>
<script src="assets/js/jquery.mousewheel.min.js"></script>
<script src="assets/js/jquery.cookie.min.js"></script>
<script src="assets/js/fastclick.min.js"></script>
<script src="assets/js/bootstrap.min.js"></script>
<script src="assets/js/clearmin.min.js"></script>
<script src="assets/js/demo/popovers-tooltips.js"></script>
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions demo/components-text.html
Original file line number Diff line number Diff line change
Expand Up @@ -364,11 +364,11 @@ <h6>
</div>
<footer class="cm-footer"><span class="pull-left">Connected as John Smith</span><span class="pull-right">&copy; PAOMEDIA SARL</span></footer>
</div>
<script src="assets/js/lib/jquery-2.1.3.min.js"></script>
<script src="assets/js/lib/jquery.min.js"></script>
<script src="assets/js/jquery.mousewheel.min.js"></script>
<script src="assets/js/jquery.cookie.min.js"></script>
<script src="assets/js/fastclick.min.js"></script>
<script src="assets/js/bootstrap.min.js"></script>
<script src="assets/js/clearmin.min.js"></script>
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions demo/dashboard-sales.html
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ <h4 class="list-group-item-heading">
</div>
<footer class="cm-footer"><span class="pull-left">Connected as John Smith</span><span class="pull-right">&copy; PAOMEDIA SARL</span></footer>
</div>
<script src="assets/js/lib/jquery-2.1.3.min.js"></script>
<script src="assets/js/lib/jquery.min.js"></script>
<script src="assets/js/jquery.mousewheel.min.js"></script>
<script src="assets/js/jquery.cookie.min.js"></script>
<script src="assets/js/fastclick.min.js"></script>
Expand All @@ -234,4 +234,4 @@ <h4 class="list-group-item-heading">
<script src="assets/js/lib/c3.min.js"></script>
<script src="assets/js/demo/dashboard.js"></script>
</body>
</html>
</html>
3 changes: 2 additions & 1 deletion demo/dashboard-server_stats.html
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,11 @@ <h4 class="list-group-item-heading">
<footer class="cm-footer"><span class="pull-left">Connected as John Smith</span><span class="pull-right">&copy; PAOMEDIA SARL</span></footer>
</div>
<script src="assets/js/lib/jquery-2.1.3.min.js"></script>
<script src="assets/js/lib/jquery.min.js"></script>
<script src="assets/js/jquery.mousewheel.min.js"></script>
<script src="assets/js/jquery.cookie.min.js"></script>
<script src="assets/js/fastclick.min.js"></script>
<script src="assets/js/bootstrap.min.js"></script>
<script src="assets/js/clearmin.min.js"></script>
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions demo/dashboard-visitors.html
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,11 @@ <h3>Header Level 3</h3>
</div>
<footer class="cm-footer"><span class="pull-left">Connected as John Smith</span><span class="pull-right">&copy; PAOMEDIA SARL</span></footer>
</div>
<script src="assets/js/lib/jquery-2.1.3.min.js"></script>
<script src="assets/js/lib/jquery.min.js"></script>
<script src="assets/js/jquery.mousewheel.min.js"></script>
<script src="assets/js/jquery.cookie.min.js"></script>
<script src="assets/js/fastclick.min.js"></script>
<script src="assets/js/bootstrap.min.js"></script>
<script src="assets/js/clearmin.min.js"></script>
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions demo/ico-fa.html
Original file line number Diff line number Diff line change
Expand Up @@ -719,11 +719,11 @@ <h4 class="list-group-item-heading">
</div>
<footer class="cm-footer"><span class="pull-left">Connected as John Smith</span><span class="pull-right">&copy; PAOMEDIA SARL</span></footer>
</div>
<script src="assets/js/lib/jquery-2.1.3.min.js"></script>
<script src="assets/js/lib/jquery.min.js"></script>
<script src="assets/js/jquery.mousewheel.min.js"></script>
<script src="assets/js/jquery.cookie.min.js"></script>
<script src="assets/js/fastclick.min.js"></script>
<script src="assets/js/bootstrap.min.js"></script>
<script src="assets/js/clearmin.min.js"></script>
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions demo/ico-md.html
Original file line number Diff line number Diff line change
Expand Up @@ -3115,11 +3115,11 @@ <h4 class="list-group-item-heading">
</div>
<footer class="cm-footer"><span class="pull-left">Connected as John Smith</span><span class="pull-right">&copy; PAOMEDIA SARL</span></footer>
</div>
<script src="assets/js/lib/jquery-2.1.3.min.js"></script>
<script src="assets/js/lib/jquery.min.js"></script>
<script src="assets/js/jquery.mousewheel.min.js"></script>
<script src="assets/js/jquery.cookie.min.js"></script>
<script src="assets/js/fastclick.min.js"></script>
<script src="assets/js/bootstrap.min.js"></script>
<script src="assets/js/clearmin.min.js"></script>
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions demo/ico-sf.html
Original file line number Diff line number Diff line change
Expand Up @@ -800,11 +800,11 @@ <h4 class="list-group-item-heading">
</div>
<footer class="cm-footer"><span class="pull-left">Connected as John Smith</span><span class="pull-right">&copy; PAOMEDIA SARL</span></footer>
</div>
<script src="assets/js/lib/jquery-2.1.3.min.js"></script>
<script src="assets/js/lib/jquery.min.js"></script>
<script src="assets/js/jquery.mousewheel.min.js"></script>
<script src="assets/js/jquery.cookie.min.js"></script>
<script src="assets/js/fastclick.min.js"></script>
<script src="assets/js/bootstrap.min.js"></script>
<script src="assets/js/clearmin.min.js"></script>
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -261,12 +261,12 @@ <h4>Login page</h4> <small>Have a look to the login page.</small>
</div>
<footer class="cm-footer"><span class="pull-left">Connected as John Smith</span><span class="pull-right">&copy; PAOMEDIA SARL</span></footer>
</div>
<script src="assets/js/lib/jquery-2.1.3.min.js"></script>
<script src="assets/js/lib/jquery.min.js"></script>
<script src="assets/js/jquery.mousewheel.min.js"></script>
<script src="assets/js/jquery.cookie.min.js"></script>
<script src="assets/js/fastclick.min.js"></script>
<script src="assets/js/bootstrap.min.js"></script>
<script src="assets/js/clearmin.min.js"></script>
<script src="assets/js/demo/home.js"></script>
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions demo/layouts-breadcrumb1.html
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,11 @@ <h3>Header Level 3</h3>
</div>
<footer class="cm-footer"><span class="pull-left">Connected as John Smith</span><span class="pull-right">&copy; PAOMEDIA SARL</span></footer>
</div>
<script src="assets/js/lib/jquery-2.1.3.min.js"></script>
<script src="assets/js/lib/jquery.min.js"></script>
<script src="assets/js/jquery.mousewheel.min.js"></script>
<script src="assets/js/jquery.cookie.min.js"></script>
<script src="assets/js/fastclick.min.js"></script>
<script src="assets/js/bootstrap.min.js"></script>
<script src="assets/js/clearmin.min.js"></script>
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions demo/layouts-breadcrumb2.html
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,11 @@ <h3>Header Level 3</h3>
</div>
<footer class="cm-footer"><span class="pull-left">Connected as John Smith</span><span class="pull-right">&copy; PAOMEDIA SARL</span></footer>
</div>
<script src="assets/js/lib/jquery-2.1.3.min.js"></script>
<script src="assets/js/lib/jquery.min.js"></script>
<script src="assets/js/jquery.mousewheel.min.js"></script>
<script src="assets/js/jquery.cookie.min.js"></script>
<script src="assets/js/fastclick.min.js"></script>
<script src="assets/js/bootstrap.min.js"></script>
<script src="assets/js/clearmin.min.js"></script>
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions demo/layouts-tabs.html
Original file line number Diff line number Diff line change
Expand Up @@ -258,11 +258,11 @@ <h2 style="margin-top:0">Aliquam erat volutpat</h2>
</div>
<footer class="cm-footer"><span class="pull-left">Connected as John Smith</span><span class="pull-right">&copy; PAOMEDIA SARL</span></footer>
</div>
<script src="assets/js/lib/jquery-2.1.3.min.js"></script>
<script src="assets/js/lib/jquery.min.js"></script>
<script src="assets/js/jquery.mousewheel.min.js"></script>
<script src="assets/js/jquery.cookie.min.js"></script>
<script src="assets/js/fastclick.min.js"></script>
<script src="assets/js/bootstrap.min.js"></script>
<script src="assets/js/clearmin.min.js"></script>
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions demo/notepad.html
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ <h4 class="list-group-item-heading">
</div>
<footer class="cm-footer"><span class="pull-left">Connected as John Smith</span><span class="pull-right">&copy; PAOMEDIA SARL</span></footer>
</div>
<script src="assets/js/lib/jquery-2.1.3.min.js"></script>
<script src="assets/js/lib/jquery.min.js"></script>
<script src="assets/js/jquery.mousewheel.min.js"></script>
<script src="assets/js/jquery.cookie.min.js"></script>
<script src="assets/js/fastclick.min.js"></script>
Expand All @@ -137,4 +137,4 @@ <h4 class="list-group-item-heading">
<script src="assets/js/summernote.min.js"></script>
<script src="assets/js/demo/notepad.js"></script>
</body>
</html>
</html>
Loading

0 comments on commit a88014e

Please sign in to comment.