Merge pull request gridstack#97 from rcuddy/master

troolee · troolee · commit 310c854d8ca0 · 2015-03-20T23:23:45.000-07:00
Update bower.json main files to match "standards"
diff --git a/bower.json b/bower.json
@@ -6,7 +6,10 @@
     "Pavel Reznikov <pashka.reznikov@gmail.com>"
   ],
   "description": "gridstack.js is a jQuery plugin for widget layout",
-  "main": "dist/gridstack.min.js",
+  "main": [
+    "dist/gridstack.js",
+    "dist/gridstack.css"
+  ],
   "moduleType": [
     "amd"
   ],
diff --git a/demo/float.html b/demo/float.html
@@ -12,13 +12,13 @@
 
     <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
     <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.2.0/css/font-awesome.min.css"/>
-    <link rel="stylesheet" href="../src/gridstack.css"/>
+    <link rel="stylesheet" href="../dist/gridstack.css"/>
 
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.0/jquery-ui.js"></script>
     <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/3.5.0/lodash.min.js"></script>
-    <script src="../src/gridstack.js"></script>
+    <script src="../dist/gridstack.js"></script>
 
     <style type="text/css">
         .grid-stack {
diff --git a/demo/knockout.html b/demo/knockout.html
@@ -12,14 +12,14 @@
 
     <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
     <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.2.0/css/font-awesome.min.css"/>
-    <link rel="stylesheet" href="../src/gridstack.css"/>
+    <link rel="stylesheet" href="../dist/gridstack.css"/>
 
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.0/jquery-ui.js"></script>
     <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/3.5.0/lodash.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/knockout/3.2.0/knockout-min.js"></script>
-    <script src="../src/gridstack.js"></script>
+    <script src="../dist/gridstack.js"></script>
 
     <style type="text/css">
         .grid-stack {
diff --git a/demo/knockout2.html b/demo/knockout2.html
@@ -12,14 +12,14 @@
 
     <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
     <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.2.0/css/font-awesome.min.css"/>
-    <link rel="stylesheet" href="../src/gridstack.css"/>
+    <link rel="stylesheet" href="../dist/gridstack.css"/>
 
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.0/jquery-ui.js"></script>
     <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/3.5.0/lodash.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/knockout/3.2.0/knockout-min.js"></script>
-    <script src="../src/gridstack.js"></script>
+    <script src="../dist/gridstack.js"></script>
 
     <style type="text/css">
         .grid-stack {
diff --git a/demo/nested.html b/demo/nested.html
@@ -12,13 +12,13 @@
 
     <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
     <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.2.0/css/font-awesome.min.css"/>
-    <link rel="stylesheet" href="../src/gridstack.css"/>
+    <link rel="stylesheet" href="../dist/gridstack.css"/>
 
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.0/jquery-ui.js"></script>
     <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/3.5.0/lodash.min.js"></script>
-    <script src="../src/gridstack.js"></script>
+    <script src="../dist/gridstack.js"></script>
 
     <style type="text/css">
         .grid-stack {
diff --git a/demo/serialization.html b/demo/serialization.html
@@ -12,13 +12,13 @@
 
     <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
     <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.2.0/css/font-awesome.min.css"/>
-    <link rel="stylesheet" href="../src/gridstack.css"/>
+    <link rel="stylesheet" href="../dist/gridstack.css"/>
 
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.0/jquery-ui.js"></script>
     <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/3.5.0/lodash.min.js"></script>
-    <script src="../src/gridstack.js"></script>
+    <script src="../dist/gridstack.js"></script>
 
     <style type="text/css">
         .grid-stack {
diff --git a/dist/gridstack.css b/dist/gridstack.css
diff --git a/dist/gridstack.js b/dist/gridstack.js
