Skip to content

Commit a88014e

Browse files
paomediapaomedia
authored
Merge pull request #2 from westonganger/jquery3
Make jquery3 compatible
2 parents ffc3a0f + a2d8f7c commit a88014e

27 files changed

+61
-51
lines changed

‎README.md‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Clearmin Web Template
1+
# Clearmin Web Template
22

33
![Clearmin template](preview.png)
44

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

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

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

‎demo/assets/js/clearmin.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎demo/assets/js/lib/jquery.min.js‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎demo/components-buttons.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,11 +324,11 @@ <h4 class="list-group-item-heading">
324324
</div>
325325
<footer class="cm-footer"><span class="pull-left">Connected as John Smith</span><span class="pull-right">&copy; PAOMEDIA SARL</span></footer>
326326
</div>
327-
<script src="assets/js/lib/jquery-2.1.3.min.js"></script>
327+
<script src="assets/js/lib/jquery.min.js"></script>
328328
<script src="assets/js/jquery.mousewheel.min.js"></script>
329329
<script src="assets/js/jquery.cookie.min.js"></script>
330330
<script src="assets/js/fastclick.min.js"></script>
331331
<script src="assets/js/bootstrap.min.js"></script>
332332
<script src="assets/js/clearmin.min.js"></script>
333333
</body>
334-
</html>
334+
</html>

‎demo/components-interactive.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,12 +322,12 @@ <h4 id="tooltips-in-a-modal">
322322
</div>
323323
<footer class="cm-footer"><span class="pull-left">Connected as John Smith</span><span class="pull-right">&copy; PAOMEDIA SARL</span></footer>
324324
</div>
325-
<script src="assets/js/lib/jquery-2.1.3.min.js"></script>
325+
<script src="assets/js/lib/jquery.min.js"></script>
326326
<script src="assets/js/jquery.mousewheel.min.js"></script>
327327
<script src="assets/js/jquery.cookie.min.js"></script>
328328
<script src="assets/js/fastclick.min.js"></script>
329329
<script src="assets/js/bootstrap.min.js"></script>
330330
<script src="assets/js/clearmin.min.js"></script>
331331
<script src="assets/js/demo/popovers-tooltips.js"></script>
332332
</body>
333-
</html>
333+
</html>

‎demo/components-text.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,11 +364,11 @@ <h6>
364364
</div>
365365
<footer class="cm-footer"><span class="pull-left">Connected as John Smith</span><span class="pull-right">&copy; PAOMEDIA SARL</span></footer>
366366
</div>
367-
<script src="assets/js/lib/jquery-2.1.3.min.js"></script>
367+
<script src="assets/js/lib/jquery.min.js"></script>
368368
<script src="assets/js/jquery.mousewheel.min.js"></script>
369369
<script src="assets/js/jquery.cookie.min.js"></script>
370370
<script src="assets/js/fastclick.min.js"></script>
371371
<script src="assets/js/bootstrap.min.js"></script>
372372
<script src="assets/js/clearmin.min.js"></script>
373373
</body>
374-
</html>
374+
</html>

‎demo/dashboard-sales.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ <h4 class="list-group-item-heading">
224224
</div>
225225
<footer class="cm-footer"><span class="pull-left">Connected as John Smith</span><span class="pull-right">&copy; PAOMEDIA SARL</span></footer>
226226
</div>
227-
<script src="assets/js/lib/jquery-2.1.3.min.js"></script>
227+
<script src="assets/js/lib/jquery.min.js"></script>
228228
<script src="assets/js/jquery.mousewheel.min.js"></script>
229229
<script src="assets/js/jquery.cookie.min.js"></script>
230230
<script src="assets/js/fastclick.min.js"></script>
@@ -234,4 +234,4 @@ <h4 class="list-group-item-heading">
234234
<script src="assets/js/lib/c3.min.js"></script>
235235
<script src="assets/js/demo/dashboard.js"></script>
236236
</body>
237-
</html>
237+
</html>

‎demo/dashboard-server_stats.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,11 @@ <h4 class="list-group-item-heading">
129129
<footer class="cm-footer"><span class="pull-left">Connected as John Smith</span><span class="pull-right">&copy; PAOMEDIA SARL</span></footer>
130130
</div>
131131
<script src="assets/js/lib/jquery-2.1.3.min.js"></script>
132+
<script src="assets/js/lib/jquery.min.js"></script>
132133
<script src="assets/js/jquery.mousewheel.min.js"></script>
133134
<script src="assets/js/jquery.cookie.min.js"></script>
134135
<script src="assets/js/fastclick.min.js"></script>
135136
<script src="assets/js/bootstrap.min.js"></script>
136137
<script src="assets/js/clearmin.min.js"></script>
137138
</body>
138-
</html>
139+
</html>

‎demo/dashboard-visitors.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,11 +191,11 @@ <h3>Header Level 3</h3>
191191
</div>
192192
<footer class="cm-footer"><span class="pull-left">Connected as John Smith</span><span class="pull-right">&copy; PAOMEDIA SARL</span></footer>
193193
</div>
194-
<script src="assets/js/lib/jquery-2.1.3.min.js"></script>
194+
<script src="assets/js/lib/jquery.min.js"></script>
195195
<script src="assets/js/jquery.mousewheel.min.js"></script>
196196
<script src="assets/js/jquery.cookie.min.js"></script>
197197
<script src="assets/js/fastclick.min.js"></script>
198198
<script src="assets/js/bootstrap.min.js"></script>
199199
<script src="assets/js/clearmin.min.js"></script>
200200
</body>
201-
</html>
201+
</html>

‎demo/ico-fa.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -719,11 +719,11 @@ <h4 class="list-group-item-heading">
719719
</div>
720720
<footer class="cm-footer"><span class="pull-left">Connected as John Smith</span><span class="pull-right">&copy; PAOMEDIA SARL</span></footer>
721721
</div>
722-
<script src="assets/js/lib/jquery-2.1.3.min.js"></script>
722+
<script src="assets/js/lib/jquery.min.js"></script>
723723
<script src="assets/js/jquery.mousewheel.min.js"></script>
724724
<script src="assets/js/jquery.cookie.min.js"></script>
725725
<script src="assets/js/fastclick.min.js"></script>
726726
<script src="assets/js/bootstrap.min.js"></script>
727727
<script src="assets/js/clearmin.min.js"></script>
728728
</body>
729-
</html>
729+
</html>

0 commit comments

Comments
 (0)