Merge branch 'dev'

ntd · Oct 12, 2018 · c3bf20d · c3bf20d
2 parents f9c846f + 2dda1fc
commit c3bf20d
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -30,6 +30,11 @@
         "screenshots": [
             "http://silverstripe.entidi.com/assets/silverstrap.png",
             "http://silverstripe.entidi.com/assets/silverstrap-forms.jpeg"
+        ],
+        "expose": [
+            "css",
+            "js",
+            "fonts"
         ]
     },
     "suggest": {

diff --git a/css/bootstrap.min.css.map b/css/bootstrap.min.css.map
diff --git a/js/jquery.colorbox-min.js b/js/jquery.colorbox-min.js
diff --git a/js/jquery.min.js b/js/jquery.min.js
diff --git a/templates/Includes/JQuery.ss b/templates/Includes/JQuery.ss
@@ -1 +1 @@
-<% require javascript("//cdn.jsdelivr.net/jquery/1/jquery.min.js") %>
+<% require javascript("//cdn.jsdelivr.net/jquery/3/jquery.min.js") %>
diff --git a/templates/Includes/SilverstrapJsdelivr.ss b/templates/Includes/SilverstrapJsdelivr.ss
@@ -3,7 +3,7 @@
     This leverages the jsdelivr CDN network and it is the
     preferred approach to use in production.
  --%>
-<% require javascript("//cdn.jsdelivr.net/g/jquery@1,bootstrap@3,jquery.fotorama@4,colorbox@1") %>
+<% require javascript("//cdn.jsdelivr.net/g/jquery@3,bootstrap@3,jquery.fotorama@4,colorbox@1") %>
 <% require CSS("//cdn.jsdelivr.net/bootstrap/3/css/bootstrap.min.css") %>
 <% require CSS("//cdn.jsdelivr.net/jquery.fotorama/4/fotorama.min.css") %>
 <% require themedCSS("silverstrap") %>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<% require javascript("//cdn.jsdelivr.net/jquery/1/jquery.min.js") %>
		<% require javascript("//cdn.jsdelivr.net/jquery/3/jquery.min.js") %>