windhamdavid 4 years ago
parent
commit
6e3b8ff0a9
11 changed files with 227 additions and 12 deletions
  1. 3 2
      archive.php
  2. 27 0
      category.php
  3. 1 1
      footer-studio.php
  4. 7 2
      functions.php
  5. 0 1
      inc/template.php
  6. 94 0
      js/desk.js
  7. 46 0
      js/scripts.js
  8. 1 1
      page-contact.php
  9. 28 1
      page-desk.php
  10. 17 4
      page-studio.php
  11. 3 0
      style.css

+ 3 - 2
archive.php

@@ -1,10 +1,11 @@
 <?php get_header(); ?>
+<?php get_template_part( 'underscore' ); ?>
 	<div class="container">
 		<div id="content" role="main">
 			<div class="entry-content archive">
 				<?php if ( have_posts() ) : ?>
 				<header class="page-header">
-					<h1 class="page-title">Archive: <?php the_time('Y'); ?></h1>
+					<h1 class="super cm-sans wow fadeInLeft">Archive: <?php the_time('Y'); ?></h1>
 				</header>
 				<?php while ( have_posts() ) : the_post();?>
 				<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'dw' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
@@ -24,4 +25,4 @@
 			</div>
 		</div>
 	</div>
-<?php get_footer(); ?>
+<?php get_footer('studio'); ?>

+ 27 - 0
category.php

@@ -0,0 +1,27 @@
+<?php get_header(); ?>
+	<div class="container">
+		<div id="content" role="main">
+			<div class="entry-content archive">
+				<?php if ( have_posts() ) : ?>
+				<header class="page-header">
+					<h1 class="super cm-sans wow fadeInLeft">Category: <?php single_cat_title(); ?></h1>
+				</header>
+				<?php while ( have_posts() ) : the_post();?>
+				<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'dw' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
+				<div class="entry-meta">
+					<div class="date">
+						<?php the_date(); ?>
+					</div>
+				</div>
+				<?php the_excerpt(); ?>
+				<?php endwhile;
+					dw_paging_nav();
+				else :
+					printf( __( 'Nothing Found', 'dw' ));		
+					get_search_form();
+				endif;
+				?>
+			</div>
+		</div>
+	</div>
+<?php get_footer('studio'); ?>

+ 1 - 1
footer-studio.php

@@ -10,7 +10,7 @@
 				<ul>
 					<li><a href="<?php echo home_url( '/' ); ?>studio"><span class="fa fa-flask fa-fw"></span> Studio</a></li>
 					<li><a href="<?php echo home_url( '/' ); ?>contact"><span class="fa fa-envelope-o fa-fw"></span> Contact</a></li>
-					<li><a href="<?php echo home_url( '/' ); ?>sitemap"><span class="fa fa-sitemap fa-fw"></span> Sitemap</a></li>
+					<li><a href="<?php echo home_url( '/' ); ?>shop"><span class="fa fa-credit-card fa-fw"></span> Shop</a></li>
 				</ul>
 			</div>
 		</div>

+ 7 - 2
functions.php

@@ -106,8 +106,13 @@ function dw_scripts() {
 	elseif ( is_page('desk') || is_archive() || is_search() ) {	
 		global $wp_rewrite;
 		//wp_enqueue_script( 'jquery', get_template_directory_uri() . '/js/jquery-2.1.1.min.js', array(), false, true); //jquery dependents
-		wp_enqueue_script( 'jquery', get_template_directory_uri() . '/js/script-o.js', '', '', true );
-		wp_enqueue_script( 'init-o', get_template_directory_uri() . '/js/init-o.js', '', '', true );
+		wp_enqueue_style( 'ani', get_template_directory_uri() . '/css/animate.css');
+		wp_enqueue_script('jquery', get_template_directory_uri() . '/js/jquery-2.1.1.min.js', array(), false, true);
+		wp_enqueue_script( 'modern', get_template_directory_uri() . '/js/modernizr.js', 'jquery', '', 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-bootstrap.js', 'jquery', '', true );
+		wp_enqueue_script( 'scripts', get_template_directory_uri() . '/js/scripts.js', 'jquery', '', true );
+		wp_enqueue_script( 'desk', get_template_directory_uri() . '/js/desk.js', '', '', true );
 		wp_enqueue_script( '_s_backbone-loop', get_template_directory_uri() . '/js/loop.js', array( 'jquery', 'backbone', 'underscore', 'wp-api'  ), '1.0', true );
 		$queried_object = get_queried_object();
 		$local = array(

+ 0 - 1
inc/template.php

@@ -117,7 +117,6 @@ function dw_paging_nav() {
 
 	?>
 	<nav class="navigation pagination paging-navigation" role="navigation">
-		<h1 class="screen-reader-text"><?php _e( 'Posts navigation', 'dw' ); ?></h1>
 		<div class="pagination loop-pagination">
 			<?php echo $links; ?>
 		</div>

+ 94 - 0
js/desk.js

@@ -0,0 +1,94 @@
+new WOW().init();
+
+jQuery(document).ready(function($) {
+	
+	$(window).bind('load', function() {
+		$('#loader').fadeOut(100);
+	});
+
+	$('.nav-toggle').on('touchstart click', function(e) {
+		e.preventDefault();
+		$( this ).toggleClass( 'active' );
+	});
+
+	$(function dw_hidenav() {
+		var headerHeight = $('.navbar').height();
+		$(window).on('scroll', { previousTop: 0 },
+			function() {
+			var currentTop = $(window).scrollTop();
+			if (currentTop < this.previousTop) {
+				if (currentTop > 0 && $('.navbar').hasClass('fixed')) {
+						$('.navbar').addClass('visible');
+						$('.site-title a').removeClass('light');
+					} else {
+						$('.navbar').removeClass('visible fixed');
+					}
+			} 
+			else {
+				$('.navbar').removeClass('visible');
+				if (currentTop > headerHeight && !$('.navbar').hasClass('fixed')) $('.navbar').addClass('fixed');
+			}
+			this.previousTop = currentTop;
+			}  
+		);
+	});
+	
+	$("#studio-caro").wallpaper({source: "../wp-content/themes/dw/img/clou.jpg"});
+
+	$('#caro').carousel({
+		interval: false,
+		wrap: true,
+	});
+	
+	$(document).bind('keyup', function(e) {
+	    if(e.which === 39){
+			$('#caro').carousel('next');
+	    }
+	    else if(e.which === 37){
+			$('#caro').carousel('prev');
+	    }
+	});
+	
+	$('.studio-subnav a').click(function (e) {
+	  e.preventDefault()
+	  $(this).tab('show')
+	})
+
+	$('#caro').on('slid.bs.carousel', function(event) {
+		var consta = $(event.target);
+		setTimeout(function() {
+			if (consta.find('.item.active').data('id') === 0) {
+				$('.studio-subnav a[href="#studio"]').tab('show')
+				$('#studio-caro').addClass('caro-grad5').removeClass('caro-grad caro-grad3 caro-grad2 caro-grad5');
+				$('.carousel-indicators li').addClass('darken-carousel-indicators');
+				$("#studio-caro").wallpaper("destroy");
+				$("#studio-caro").wallpaper({source: "../wp-content/themes/dw/img/desk2.jpg"});
+			}
+			if (consta.find('.item.active').data('id') === 1) {
+				$('.studio-subnav a[href="#webdev"]').tab('show')
+				$('.active #svg-imac.screen').delay(2500).queue(function(screenit){
+				    $(this).attr('class', 'bg');
+				    screenit();
+				});
+				$('#studio-caro').addClass('caro-grad').removeClass('caro-grad3 caro-grad2 caro-grad5');
+				$('.site-title a').addClass('light');
+				$('.carousel-indicators li').removeClass('darken-carousel-indicators');
+				$("#studio-caro").wallpaper("destroy");
+			}
+		}, 10);
+	});
+	
+
+	$('#caro').on('slid.bs.carousel', function() {
+		$('.active .animac').removeClass('hide-svg fade-svg');
+		var animac = new DrawFillSVG({elementId: 'svg-imac'});
+		var animac1 = new DrawFillSVG({elementId: 'sv'});
+		var animac2 = new DrawFillSVG({elementId: 'svg-mac'});
+		var animac3 = new DrawFillSVG({elementId: 'svg-device'});
+		animac.replay();
+		animac1.replay();
+		animac2.replay();
+		animac3.replay();
+	});
+			
+});

File diff suppressed because it is too large
+ 46 - 0
js/scripts.js


+ 1 - 1
page-contact.php

@@ -45,4 +45,4 @@
 		</div>
 	</div>
 
-<?php get_footer(); ?>
+<?php get_footer('studio'); ?>

File diff suppressed because it is too large
+ 28 - 1
page-desk.php


File diff suppressed because it is too large
+ 17 - 4
page-studio.php


+ 3 - 0
style.css

@@ -201,6 +201,9 @@ em {
 h5.contact {
 	margin: 0 0 5px !important;
 }
+h4.spread {
+	line-height: 24px;
+}
 .conq {
 	font-family: "aw-conqueror-didot",serif;
 	font-style: normal;