[#2618] Fix relative path issues and select2

ckan · Aug 17, 2012 · c5274a4 · c5274a4
1 parent e3d8cc9
commit c5274a4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/ckan/public/base/less/main.less b/ckan/public/base/less/main.less
@@ -56,7 +56,5 @@
 // Font Icons
 @import "../vendor/font-awesome/less/font-awesome.less";
 
-@import "../vendor/select2/select2.css";
-
 // CKAN
 @import "ckan.less";
diff --git a/ckan/public/base/less/variables.less b/ckan/public/base/less/variables.less
@@ -1,7 +1,7 @@
 // Base variables
-@imagePath: "../images";
+@imagePath: "../../../base/images";
 @spritePath: "@{imagePath}/sprite-ckan-icons.png";
-@fontAwesomePath: "../vendor/font-awesome/fonts";
+@fontAwesomePath: "../../../base/vendor/font-awesome/fonts";
 
 // Layout Variables
 @layoutFontFamily: Arial, sans-serif;

diff --git a/ckan/public/base/vendor/resource.config b/ckan/public/base/vendor/resource.config
@@ -17,6 +17,7 @@ IE 7 = font-awesome/css/font-awesome-ie7.css
 
 block_html5_shim = 1
 html5.js = 2
+select2/select2.css = 9
 
 [inline scripts]
 
@@ -34,6 +35,7 @@ vendor =
     jed.js
     html5.js
     select2/select2.js
+    select2/select2.css
     bootstrap/js/bootstrap-transition.js
     bootstrap/js/bootstrap-modal.js
     bootstrap/js/bootstrap-alert.js