Bootstrap Update, Modal Support

inc/scripts-and-styles.php

@@ -1,43 +1,43 @@
-<?php 
-function cs_scripts() {	
-
-	wp_enqueue_style( 'cs-glyph', site_url().'/wp-content/global/glyphicons_pro/glyphicons/web/html_css/css/glyphicons.css');
-	wp_enqueue_style( 'cs-glyph-filetypes', site_url().'/wp-content/global/glyphicons_pro/glyphicons_filetypes/web/html_css/css/glyphicons-filetypes.css');
-	wp_enqueue_style( 'cs-glyph-halflings', site_url().'/wp-content/global/glyphicons_pro/glyphicons_halflings/web/html_css/css/glyphicons-halflings.css');
-	wp_enqueue_style( 'cs-glyph-social', site_url().'/wp-content/global/glyphicons_pro/glyphicons_social/web/html_css/css/glyphicons-social.css');
-	wp_enqueue_style( 'cs-style', get_stylesheet_uri(), array( 'cs-glyph' ));
-
-	wp_enqueue_script( 'cs-bootstrap-js', site_url().'/wp-content/global/bootstrap-3.2.0-dist/js/bootstrap.min.js', array( 'jquery' ));
-	wp_enqueue_script( 'cs-modernizr', get_template_directory_uri() . '/js/cs-modernizr.js', array( 'jquery' ));
-	wp_enqueue_script( 'cs', get_template_directory_uri() . '/js/cs.js', array( 'jquery' ));
-	wp_enqueue_script( 'cs-navigation', get_template_directory_uri() . '/js/navigation.js', array( 'cs-bootstrap-js'), '20120206', true );
-	wp_enqueue_script( 'cs-skip-link-focus-fix', get_template_directory_uri() . '/js/skip-link-focus-fix.js', array(), '20130115', true );
-
-	$outboundtracking = get_option( 'outbound_tracking','');
-	if($outboundtracking == 'yes') wp_enqueue_script('uc-link-tracking', get_bloginfo('template_url').'/js/linktracking.js', array('jquery'));
-
-	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
-		wp_enqueue_script( 'comment-reply' );
-	}
-}
-
-add_action( 'wp_enqueue_scripts', 'cs_scripts' );
-
-
-function load_custom_wp_admin_style($hook) {
-    wp_register_style( 'custom_wp_admin_css', get_template_directory_uri() . '/css/admin.css' );
-    wp_enqueue_style( 'custom_wp_admin_css' );
-
-
-	wp_register_script('uc-admin-js', get_template_directory_uri() . '/js/admin-style.js' );
-	wp_enqueue_script('uc-admin-js');
-
-	if( 'widgets.php' != $hook )
-	    return;
-	wp_register_style( 'css-widgets-area', get_template_directory_uri().'/css/widgets-area.php' );
-	wp_enqueue_style( 'css-widgets-area' );
-}
-add_action( 'admin_enqueue_scripts', 'load_custom_wp_admin_style' );
-
-
+<?php 
+function cs_scripts() {	
+
+	wp_enqueue_style( 'cs-glyph', site_url().'/wp-content/global/glyphicons_pro/glyphicons/web/html_css/css/glyphicons.css');
+	wp_enqueue_style( 'cs-glyph-filetypes', site_url().'/wp-content/global/glyphicons_pro/glyphicons_filetypes/web/html_css/css/glyphicons-filetypes.css');
+	wp_enqueue_style( 'cs-glyph-halflings', site_url().'/wp-content/global/glyphicons_pro/glyphicons_halflings/web/html_css/css/glyphicons-halflings.css');
+	wp_enqueue_style( 'cs-glyph-social', site_url().'/wp-content/global/glyphicons_pro/glyphicons_social/web/html_css/css/glyphicons-social.css');
+	wp_enqueue_style( 'cs-style', get_stylesheet_uri(), array( 'cs-glyph' ));
+
+	wp_enqueue_script( 'cs-bootstrap-js', site_url().'/wp-content/global/bootstrap-3.3.4/javascripts/bootstrap.min.js', array( 'jquery' ));
+	wp_enqueue_script( 'cs-modernizr', get_template_directory_uri() . '/js/cs-modernizr.js', array( 'jquery' ));
+	wp_enqueue_script( 'cs', get_template_directory_uri() . '/js/cs.js', array( 'jquery' ));
+	wp_enqueue_script( 'cs-navigation', get_template_directory_uri() . '/js/navigation.js', array( 'cs-bootstrap-js'), '20120206', true );
+	wp_enqueue_script( 'cs-skip-link-focus-fix', get_template_directory_uri() . '/js/skip-link-focus-fix.js', array(), '20130115', true );
+
+	$outboundtracking = get_option( 'outbound_tracking','');
+	if($outboundtracking == 'yes') wp_enqueue_script('uc-link-tracking', get_bloginfo('template_url').'/js/linktracking.js', array('jquery'));
+
+	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
+		wp_enqueue_script( 'comment-reply' );
+	}
+}
+
+add_action( 'wp_enqueue_scripts', 'cs_scripts' );
+
+
+function load_custom_wp_admin_style($hook) {
+    wp_register_style( 'custom_wp_admin_css', get_template_directory_uri() . '/css/admin.css' );
+    wp_enqueue_style( 'custom_wp_admin_css' );
+
+
+	wp_register_script('uc-admin-js', get_template_directory_uri() . '/js/admin-style.js' );
+	wp_enqueue_script('uc-admin-js');
+
+	if( 'widgets.php' != $hook )
+	    return;
+	wp_register_style( 'css-widgets-area', get_template_directory_uri().'/css/widgets-area.php' );
+	wp_enqueue_style( 'css-widgets-area' );
+}
+add_action( 'admin_enqueue_scripts', 'load_custom_wp_admin_style' );
+
+
 ?>

sass/utilities.scss

@@ -13,4 +13,11 @@
 	-moz-hyphens: auto;
 	hyphens: auto;	
 	*/
-}			
+}
+
+//users can, and are adding bs modal windows in main content areas. 
+//However, the navigation z-index coflicts.
+// by adding this position:absolute; they get very close to the same effect as a normal modal, but doesn;t conflict with nav. 
+#content .modal {
+	position:absolute;
+}

sass/variables.scss

@@ -28,7 +28,7 @@ $nav-secondary-link-bg:						transparent			!default;
 $nav-secondary-link-hover-bg:				$nav-link-hover-bg	!default;
 $nav-secondary-link-color:					#428bca					!default;
 
-$nav-secondary-open-link-hover-color:		$nav-open-link-hover-color	!default;
+$nav-secondary-open-link-hover-color:		#fff	!default;
 
 $nav-secondary-active-link-hover-bg:   		$component-active-bg 		!default;
 $nav-secondary-active-link-hover-color:    	$component-active-color 	!default;