Fix for CSS

TheModFather · Sep 14, 2013 · 706d981 · 706d981
1 parent 9bfc26d
commit 706d981
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -102,6 +102,14 @@ module.exports = function(grunt) {
 		      }
 		    }
 		  },
+		  connect: {
+		    server: {
+		      options: {
+		        port: 9001,
+		        base: '.'
+		      }
+		    }
+		  },
 		clean: {
 			default: ['bower_components', 'lib'],
 			dist: ['dist'],
@@ -116,9 +124,11 @@ module.exports = function(grunt) {
 	grunt.loadNpmTasks('grunt-contrib-less');
 	grunt.loadNpmTasks('grunt-contrib-requirejs');
 	grunt.loadNpmTasks('grunt-contrib-uglify');
+	grunt.loadNpmTasks('grunt-contrib-watch');
+	grunt.loadNpmTasks('grunt-contrib-connect');
 
 	// Default task.
 	grunt.registerTask('default', ['clean', 'bower', 'jshint', 'qunit', 'requirejs', 'uglify', 'less']);
-	//grunt.registerTask('devserver', ['bower', 'lint', 'qunit', 'recess', 'server', 'watch']); // development server
+	grunt.registerTask('devserver', ['bower', 'jshint', 'qunit', 'connect', 'watch']); // development server
 
 };
diff --git a/index.html b/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
-<html lang="en" class="fuelux">
+<html lang="en" class="dieselui">
 <head>
 	<meta charset="utf-8">
 	<title>Fuel UX 2</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-	<link href="dist/css/fuelux.css" rel="stylesheet">
+	<link href="dist/css/dieselui.css" rel="stylesheet">
 
-	<script src="lib/require.js"></script>
+	<script src="lib/requirejs/require.js"></script>
 
 	<style type="text/css">
 		body {
@@ -48,14 +48,14 @@
 	<script>
 		requirejs.config({
 			paths: {
-				'jquery': 'lib/jquery',
+				'jquery': 'lib/jquery/jquery',
 				'underscore': 'http://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.3.3/underscore-min',
-				'bootstrap': 'lib/bootstrap/js',
-				'fuelux': 'src'
+				'bootstrap': 'lib/bootstrap/bootstrap',
+				'dieselui': 'src'
 			}
 		});
 
-		require(['jquery', 'sample/data', 'sample/datasource', 'sample/datasourceTree', 'fuelux/all'], function ($, sampleData, StaticDataSource, DataSourceTree) {
+		require(['jquery', 'sample/data', 'sample/datasource', 'sample/datasourceTree', 'dieselui/all'], function ($, sampleData, StaticDataSource, DataSourceTree) {
 
 			// COMBOBOX
 			$('#btnComboboxDisable').on('click', function () {

diff --git a/package.json b/package.json
@@ -37,7 +37,9 @@
     "grunt-bower-task": "~0.3.2",
     "grunt-contrib-less": "~0.7.0",
     "grunt-contrib-requirejs": "~0.4.1",
-    "grunt-contrib-uglify": "~0.2.4"
+    "grunt-contrib-uglify": "~0.2.4",
+    "grunt-contrib-watch": "~0.5.3",
+    "grunt-contrib-connect": "~0.5.0"
   },
   "keywords": [
     "dieselui",

diff --git a/src/less/dieselui.less b/src/less/dieselui.less
@@ -1,4 +1,4 @@
-.fuelux {
+.dieselui {
 
 	// Core variables and mixins
 	@import "variables.less"; // Modify this for custom colors, font-sizes, etc