Merge branch 'sass-conversion'

weblab · Jul 17, 2014 · 96c500b · 96c500b
2 parents 78dd962 + 886fce3
commit 96c500b
Show file tree

Hide file tree

Showing 3 changed files with 6,708 additions and 32 deletions.
diff --git a/functions.php b/functions.php
@@ -80,9 +80,16 @@ function cs_widgets_init() {
  * Enqueue scripts and styles.
  */
 function cs_scripts() {
+
+	// Without these random enqueue styles, the theme styles don't load for some reason. ????????????
+	wp_enqueue_style( 'xxxx',get_template_directory_uri() . '/aaaa.css' );
+	wp_enqueue_style( 'bbbb', get_stylesheet_uri(),array('xxxx') );
+
+	/*
 	wp_enqueue_style( 'cs-bootstrap-css',get_template_directory_uri() . '/bootstrap/css/bootstrap.min.css' );
 	wp_enqueue_style( 'cs-style', get_stylesheet_uri(),array('cs-bootstrap-css') );
-
+	*/
+
 	wp_enqueue_script( 'cs-bootstrap-js', get_template_directory_uri() . '/bootstrap/js/bootstrap.min.js', array( 'jquery' ));
 	wp_enqueue_script( 'cs-respond-js', get_template_directory_uri() . '/bootstrap/js/respond.js', array( 'jquery' ));
 	wp_enqueue_script( 'cs-modernizr', get_template_directory_uri() . '/js/cs-modernizr.js', array( 'jquery' ));