windhamdavid 10 years ago
parent
commit
3a6b948344
2 changed files with 16 additions and 16 deletions
  1. 15 15
      functions.php
  2. 1 1
      gruntfile.js

+ 15 - 15
functions.php

@@ -18,24 +18,24 @@ add_image_size( 'post-large', 770, 577, true );
 
 function dw_scripts() {
 	global $post;
-	//wp_enqueue_style( 'style', get_stylesheet_uri() );
-	wp_enqueue_style( 'style-min', get_template_directory_uri() . '/css/style.min.css');
-	//wp_enqueue_style( 'boot', get_template_directory_uri() . '/css/bootstrap.css');
+	wp_enqueue_style( 'style', get_stylesheet_uri() );
+	//wp_enqueue_style( 'style-min', get_template_directory_uri() . '/css/style.min.css');
+	wp_enqueue_style( 'boot', get_template_directory_uri() . '/css/bootstrap.css');
 	//wp_enqueue_style( 'jasny', get_template_directory_uri() . '/css/jasny-bootstrap.css');
-	//wp_enqueue_style( 'font', get_template_directory_uri() . '/css/font-awesome.css');
-	//wp_enqueue_style( 'cal', get_template_directory_uri() . '/css/fullcalendar.css');
-	//wp_enqueue_style( 'ani', get_template_directory_uri() . '/css/animate.css');
+	wp_enqueue_style( 'font', get_template_directory_uri() . '/css/font-awesome.css');
+	wp_enqueue_style( 'cal', get_template_directory_uri() . '/css/fullcalendar.css');
+	wp_enqueue_style( 'ani', get_template_directory_uri() . '/css/animate.css');
 	
 	wp_deregister_script('jquery');
-	//wp_enqueue_script('jquery', get_template_directory_uri() . '/js/jquery-2.1.1.min.js', array(), false, true);
-	//wp_enqueue_script( 'boostrap', get_template_directory_uri() . '/js/bootstrap.min.js', 'jquery', '', true );
-	//wp_enqueue_script( 'offcanvas', get_template_directory_uri() . '/js/jasny-canvas.js', 'jquery', '', true );
-	//wp_enqueue_script( 'trans', get_template_directory_uri() . '/js/smooth.js', 'jquery', '', true );
-	//wp_enqueue_script( 'time', get_template_directory_uri() . '/js/moment.min.js', 'jquery', '', true );
-	//wp_enqueue_script( 'cal', get_template_directory_uri() . '/js/fullcalendar.min.js', 'jquery', '', true );
-	//wp_enqueue_script( 'valid', get_template_directory_uri() . '/js/validate.js', 'jquery', '', true );
-	//wp_enqueue_script( 'scripts', get_template_directory_uri() . '/js/scripts.js', 'jquery', '', true );
-	wp_enqueue_script( 'script', get_template_directory_uri() . '/js/script.min.js', 'jquery', '', true );
+	wp_enqueue_script('jquery', get_template_directory_uri() . '/js/jquery-2.1.1.min.js', array(), false, true);
+	wp_enqueue_script( 'boostrap', get_template_directory_uri() . '/js/bootstrap.min.js', 'jquery', '', true );
+	wp_enqueue_script( 'offcanvas', get_template_directory_uri() . '/js/jasny-canvas.js', 'jquery', '', true );
+	wp_enqueue_script( 'trans', get_template_directory_uri() . '/js/smooth.js', 'jquery', '', true );
+	wp_enqueue_script( 'time', get_template_directory_uri() . '/js/moment.min.js', 'jquery', '', true );
+	wp_enqueue_script( 'cal', get_template_directory_uri() . '/js/fullcalendar.min.js', 'jquery', '', true );
+	wp_enqueue_script( 'valid', get_template_directory_uri() . '/js/validate.js', 'jquery', '', true );
+	wp_enqueue_script( 'scripts', get_template_directory_uri() . '/js/scripts.js', 'jquery', '', true );
+	//wp_enqueue_script( 'script', get_template_directory_uri() . '/js/script.min.js', 'jquery', '', true );
 	//wp_enqueue_script( 'script', get_template_directory_uri() . '/js/script.js', 'jquery', '', true );
 
 

+ 1 - 1
gruntfile.js

@@ -23,7 +23,7 @@ module.exports = function(grunt) {
 				separator: ';',
 			},
 			dist: {
-				src: ['js/jquery-2.1.1.min.js', 'js/bootstrap.min.js', 'js/jasny-canvas.js', 'js/scripts.js', 'js/moment.min.js', 'js/fullcalendar.min.js'],
+				src: ['js/jquery-2.1.1.min.js', 'js/bootstrap.min.js', 'js/jasny-canvas.js', 'js/moment.min.js', 'js/fullcalendar.min.js', 'js/validate.js', 'js/scripts.js', ],
 				dest: 'js/script.js',
 			},
 		},