no longer using bower for package management; using npm for all packa…

…ge management; recompiling to fix a bug when dropping new pages in the menu. Reference rgcarrasqueira#5

Gruntfile.coffee

@@ -61,15 +61,11 @@ module.exports = (grunt) ->
         resolve:
           extensions: ['.coffee', '.js', '']
           modulesDirectories: [
+            'node_modules'
             './cms_named_menus/static/cmsnamedmenus/coffee/'
-            './cms_named_menus/static/cmsnamedmenus/vendor/'
           ]
           alias:
-            'jquery': 'jquery/dist/jquery.min'
-            'underscore': 'underscore/underscore'
-            'backbone': 'backbone/backbone'
-            'jquery-ui': 'jquery-ui/ui/jquery-ui'
-            'jquery-nestable':'jquery.nestable/jquery.nestable'
+            'jquery-nestable':'jquery-nestable/jquery.nestable'
         module:
           loaders: [
             {test: /jquery\.js$/, loader: 'expose?$!expose?jQuery'}

cms_named_menus/static/cmsnamedmenus/css/admin.css

@@ -16,6 +16,34 @@
   box-sizing: border-box;
   font-size: 100%;
 }
+/*! ------------------------------------------------
+ *	Bedrock
+ *	https://github.com/aebsr/bedrock
+ *
+ *	Copyright 2012-2013 Antoine Butler
+ *	Licensed WTF Public License
+ *	http://www.wtfpl.net/about/
+ *
+ *	Built by @aebsr
+ * -------------------------------------------------
+ */
+* {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -ms-box-sizing: border-box;
+  box-sizing: border-box;
+  font-size: 100%;
+}
+.triangle {
+  width: 0;
+  height: 0;
+  display: inline-block;
+}
+.triangle {
+  width: 0;
+  height: 0;
+  display: inline-block;
+}
 .dd {
   position: relative;
   display: block;
@@ -60,9 +88,9 @@
   font-weight: bold;
   border: 1px solid #ccc;
   background: #fafafa;
-  background: -webkit-linear-gradient(top, #fafafa 0%, #eeeeee 100%);
-  background: -moz-linear-gradient(top, #fafafa 0%, #eeeeee 100%);
-  background: linear-gradient(top, #fafafa 0%, #eeeeee 100%);
+  background: -webkit-linear-gradient(top, #fafafa 0%, #eee 100%);
+  background: -moz-linear-gradient(top, #fafafa 0%, #eee 100%);
+  background: linear-gradient(top, #fafafa 0%, #eee 100%);
   -webkit-border-radius: 3px;
   border-radius: 3px;
   box-sizing: border-box;
@@ -111,9 +139,9 @@
   border: 1px dashed #bbb;
   min-height: 100px;
   background-color: #e5e5e5;
-  background-image: -webkit-linear-gradient(45deg, #ffffff 25%, transparent 25%, transparent 75%, #ffffff 75%, #ffffff), -webkit-linear-gradient(45deg, #ffffff 25%, transparent 25%, transparent 75%, #ffffff 75%, #ffffff);
-  background-image: -moz-linear-gradient(45deg, #ffffff 25%, transparent 25%, transparent 75%, #ffffff 75%, #ffffff), -moz-linear-gradient(45deg, #ffffff 25%, transparent 25%, transparent 75%, #ffffff 75%, #ffffff);
-  background-image: linear-gradient(45deg, #ffffff 25%, transparent 25%, transparent 75%, #ffffff 75%, #ffffff), linear-gradient(45deg, #ffffff 25%, transparent 25%, transparent 75%, #ffffff 75%, #ffffff);
+  background-image: -webkit-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff), -webkit-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
+  background-image: -moz-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff), -moz-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
+  background-image: linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff), linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
   background-size: 60px 60px;
   background-position: 0 0, 30px 30px;
 }
@@ -140,6 +168,14 @@
 .pages:after {
   clear: both;
 }
+.pages:before,
+.pages:after {
+  display: table;
+  content: "";
+}
+.pages:after {
+  clear: both;
+}
 .pages aside {
   width: 48%;
   float: left;

cms_named_menus/static/cmsnamedmenus/less/admin.less

@@ -1,4 +1,4 @@
-@import '../vendor/bedrock/bedrock';
+@import '../../../../node_modules/granite-less/granite';
 @import 'nestable';
 
 

package.json

@@ -2,22 +2,29 @@
   "name": "django-cms-named-menus",
   "version": "v0.1.0",
   "dependencies": {
-    "bower": "^1.3.5",
-    "requirejs": "^2.1.14",
+    "backbone": "^1.2.3",
+    "bedrock": "[email protected]:hzdg/bedrock.git#18ec65a7d8a17325719df89d60c0cdc383255d9f",
+    "coffee-loader": "^0.7.2",
     "coffee-script": "^1.7.1",
-    "grunt-contrib-watch": "^0.6.1",
+    "expose-loader": "^0.5.3",
+    "granite-less": "^1.2.7",
+    "grunt": "^0.4.5",
     "grunt-cli": "^0.1.13",
-    "grunt-contrib-uglify": "^0.5.0",
     "grunt-contrib-coffee": "^0.10.1",
-    "grunt": "^0.4.5",
+    "grunt-contrib-less": "1.0.0",
+    "grunt-contrib-uglify": "^0.5.0",
+    "grunt-contrib-watch": "^0.6.1",
+    "grunt-webpack": "^1.0.11",
+    "imports-loader": "^0.6.3",
+    "jquery": "^2.1.4",
+    "jquery-ui": "^1.10.5",
+    "napa": "^2.0.1",
     "shelljs": "^0.3.0",
+    "underscore": "^1.8.3",
     "webpack": "^1.4.0-beta3",
-    "webpack-dev-server": "^1.6.3",
-    "grunt-webpack": "^1.0.8",
-    "coffee-loader": "^0.7.2",
-    "jquery-loader": "^2.0.0",
-    "expose-loader": "^0.5.3",
-    "imports-loader": "^0.6.3",
-    "grunt-contrib-less": "^0.11.4"
+    "webpack-dev-server": "^1.6.3"
+  },
+  "scripts": {
+    "install": "napa dbushell/Nestable:jquery-nestable"
   }
 }