Merge pull request #16 from BridgeCityBicycleCoop/development

One day this will work!

bikeshop_project/bikeshop/settings/base.py

@@ -123,10 +123,10 @@ STATICFILES_FINDERS = (
     'compressor.finders.CompressorFinder',
 )
 STATICFILES_DIRS = [
-    ('vendor', os.path.join(BASE_DIR, 'vendor')),
+    ('vendor', os.path.join(BASE_DIR, '../vendor')),
-    os.path.join(BASE_DIR, 'assets')
+    os.path.join(BASE_DIR, '../assets')
 ]
-STATIC_ROOT = 'STATIC'
+STATIC_ROOT = 'static'
 STATIC_URL = '/static/'
 
 AUTH_USER_MODEL = 'registration.CustomUser'

bower.json

@@ -9,6 +9,7 @@
   "license": "MIT",
   "homepage": "",
   "private": true,
+  "directory": "vendor",
   "ignore": [
     "**/.*",
     "node_modules",