diff --git a/wp-content/themes/foundry0/header.php b/wp-content/themes/foundry0/header.php
index cf0ca154d655b1854814fd6d09ea05f820b7b103..82b707bd9555efb443c134f10508991b70d53114 100644
--- a/wp-content/themes/foundry0/header.php
+++ b/wp-content/themes/foundry0/header.php
@@ -13,6 +13,7 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
+<<<<<<< HEAD
<?php wp_head();?>
</head>
<body>
@@ -23,10 +24,24 @@
</video>
</div>
-->
+=======
+ <?php wp_head();?>
+ </head>
+ <body>
+
+ <div class="splash">
+ <video width="100%" height="100%" autoplay muted playsinline id="splash">
+ <source src="<?php echo $theme_path ?>/img/Neon-Splash.mp4" type="video/mp4">
+ </video>
+ </div>
+ <div class="logo" id="create">
+ </div>
+>>>>>>> cc98faba6808c6589cb0daebffac94f36e5daa5a
<div class="gris">
</div>
<div class="footage">
</div>
+<<<<<<< HEAD
<div id="menuTop animated fadeInDown displayNoneMob" class="menuTop animated fadeInDown displayNoneMob">
<?php
@@ -46,4 +61,23 @@
</div>
<div class="logo" id="create">
</div>
+=======
+
+ <div id="menuTop animated fadeInDown displayNoneMob" class="menuTop animated fadeInDown displayNoneMob">
+ <?php
+ $navItems = wp_get_nav_menu_items( 'primary', array(
+
+ ) );
+
+ foreach ($navItems as $m) {
+ ?>
+ <a href="<?=$m->url ?>" class="menuText">
+ <span class="menuIn"><?=$m->title ?></span>
+ </a>
+ </body>
+ <?php
+ }
+?>
+
+>>>>>>> cc98faba6808c6589cb0daebffac94f36e5daa5a
diff --git a/wp-content/themes/foundry0/page.php b/wp-content/themes/foundry0/page.php
index 315a3da70a188e6d71b58ca9b6cae330f732a22a..0447d68f437df985018b19116cd0ba7a6329e1cb 100644
--- a/wp-content/themes/foundry0/page.php
+++ b/wp-content/themes/foundry0/page.php
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
<?php
/**
* The template for displaying pages
@@ -39,3 +40,47 @@ get_header(); ?>
<?php get_sidebar(); ?>
<?php get_footer(); ?>
+=======
+<?php get_header(); ?>
+
+<?php
+ get_template_part('menu_section');
+if (have_posts()) : while (have_posts()) : the_post();
+
+ global $post;
+
+ $post_name = $post->post_name;
+
+ $post_id = get_the_ID();
+
+?>
+<div id="<?php echo $post_name; ?>" class="page<?php echo $post_id; ?> section<?php if((get_post_meta($post_id, "rnr_assign_home") == true) ){ echo ' fullscreen home';} else { echo ' '.$post_name; }?>"><!-- SECTION -->
+
+<?php if((get_post_meta( get_the_ID(), 'rnr_disable_title', true )!= true) && (get_post_meta($post_id, 'rnr_assign_home', true)!= true) ){ ?>
+ <div class="container">
+ <div class="row">
+ <div class="sixteen columns">
+ <!-- START TITLE -->
+ <div class="mainTitle">
+ <h1 class="header-text"><?php if(get_post_meta( get_the_ID(), 'rnr_alt_title', true )){ echo get_post_meta( get_the_ID(), 'rnr_alt_title', true ); } else { the_title(); } ?></h1>
+ <?php if(get_post_meta( get_the_ID(), 'rnr_subtitle', true )){ ?>
+ <div class="subtitle">
+ <p><?php echo get_post_meta( get_the_ID(), 'rnr_subtitle', true ); ?></p>
+ </div><!-- END SUBTITLE -->
+ <?php } ?>
+ </div><!-- END TITLE -->
+ </div><!-- END SIXTEEN COLUMNS -->
+ </div><!-- END ROW -->
+ </div><!-- END CONTAINER -->
+ <?php } ?>
+
+<?php
+
+ endwhile;
+ endif;
+ wp_reset_query();
+?>
+
+
+<?php get_footer(); ?>
+>>>>>>> cc98faba6808c6589cb0daebffac94f36e5daa5a
diff --git a/wp-content/themes/foundry0/sidebar.php b/wp-content/themes/foundry0/sidebar.php
index f48bdfe293f6540fe50802336f208e4b64acf720..b6b67573bae637fec5905fd527e4d02671af1fb0 100644
--- a/wp-content/themes/foundry0/sidebar.php
+++ b/wp-content/themes/foundry0/sidebar.php
@@ -14,10 +14,10 @@
<h1 class="numberPage linework animated fadeInUp" id="number1">
01
</h1>
- <a href="#eng">
+ <a href="#code">
<div class="nextPage animated fadeInUp" id="next1">
<p class="white nextText">
- ENGWEST
+ CODEWEST
</p>
<div class="nextPageLine">
</div>
@@ -41,10 +41,37 @@
<h1 class="numberPage linework animated fadeInUp" id="number2">
02
</h1>
- <a href="#code">
+ <a href="#eng">
<div class="nextPage animated fadeInUp" id="next2">
<p class="white nextText">
- CODEWEST
+ ENGWEST
+ </p>
+ <div class="nextPageLine">
+ </div>
+ <div class="nextLine pull-right">
+ </div>
+ </div>
+ </a>
+ </div>
+ <div class="section active" id="section3" data-anchor="des">
+ <h1 class="mainTitle" id="title3">
+ DESIGN<span class="west">WEST</span>
+ </h1>
+ <div class="buttonyellow landingButton animated fadeInRight" id="button3">
+ <p class="yellow displayNoneMob">
+ SEE PROJECTS
+ </p>
+ <p class=" displayNoneDesk">
+ SEE PROJECTS
+ </p>
+ </div>
+ <h1 class="numberPage linework animated fadeInUp" id="number3">
+ 03
+ </h1>
+ <a href="#des">
+ <div class="nextPage animated fadeInUp" id="next3">
+ <p class="white nextText">
+ DESIGNWEST
</p>
<div class="nextPageLine">
</div>
@@ -53,8 +80,67 @@
</div>
</a>
</div>
+<<<<<<< HEAD
</div>
<div class="hiddenBody animated fadeInUpBig">
+=======
+ <div class="section active" id="section4" data-anchor="place">
+ <h1 class="mainTitle" id="title4">
+ PLACE<span class="west">WEST</span>
+ </h1>
+ <div class="buttonyellow landingButton animated fadeInRight" id="button4">
+ <p class="yellow displayNoneMob">
+ SEE PROJECTS
+ </p>
+ <p class=" displayNoneDesk">
+ SEE PROJECTS
+ </p>
+ </div>
+ <h1 class="numberPage linework animated fadeInUp" id="number4">
+ 04
+ </h1>
+ <a href="#place">
+ <div class="nextPage animated fadeInUp" id="next4">
+ <p class="white nextText">
+ PLACEWEST
+ </p>
+ <div class="nextPageLine">
+ </div>
+ <div class="nextLine pull-right">
+ </div>
+ </div>
+ </a>
+ </div>
+ <div class="section active" id="section5" data-anchor="play">
+ <h1 class="mainTitle" id="title5">
+ PLAY<span class="west">WEST</span>
+ </h1>
+ <div class="buttonyellow landingButton animated fadeInRight" id="button5">
+ <p class="yellow displayNoneMob">
+ SEE PROJECTS
+ </p>
+ <p class=" displayNoneDesk">
+ SEE PROJECTS
+ </p>
+ </div>
+ <h1 class="numberPage linework animated fadeInUp" id="number5">
+ 05
+ </h1>
+ <a href="#play">
+ <div class="nextPage animated fadeInUp" id="next5">
+ <p class="white nextText">
+ PLAYWEST
+ </p>
+ <div class="nextPageLine">
+ </div>
+ <div class="nextLine pull-right">
+ </div>
+ </div>
+ </a>
+ </div>
+
+ <div class="hiddenBody animated fadeInUpBig">
+>>>>>>> cc98faba6808c6589cb0daebffac94f36e5daa5a
<div class="row paddedC paddingBottom0">
<h2 class="text-center titleMob animated fadeInDown">
Coding the future
diff --git a/wp-content/themes/foundry0/style.css b/wp-content/themes/foundry0/style.css
index 78f01cbab99143264cf7737913b64b6c33d60419..64c9af224ef39f621f532cb8c3bc30ab05ce2ee0 100644
--- a/wp-content/themes/foundry0/style.css
+++ b/wp-content/themes/foundry0/style.css
@@ -323,6 +323,18 @@ a:focus {
right: 7.5vw;
transition: 1s ease-in-out;
}
+.fp-viewing-des #title3 {
+ right: 7.5vw;
+ transition: 1s ease-in-out;
+}
+.fp-viewing-place #title4 {
+ right: 7.5vw;
+ transition: 1s ease-in-out;
+}
+.fp-viewing-play #title5 {
+ right: 7.5vw;
+ transition: 1s ease-in-out;
+}
.fp-viewing-code #button1 {
right: 9vw;
@@ -333,7 +345,18 @@ a:focus {
right: 9vw;
transition: 1s ease-in-out;
}
-
+.fp-viewing-des #button3 {
+ right: 9vw;
+ transition: 1s ease-in-out;
+}
+.fp-viewing-place #button4 {
+ right: 9vw;
+ transition: 1s ease-in-out;
+}
+.fp-viewing-play #button5 {
+ right: 9vw;
+ transition: 1s ease-in-out;
+}
.fp-viewing-code #number1 {
bottom: 5vh;
transition: 1s ease-in-out;
@@ -345,6 +368,27 @@ a:focus {
bottom: 5vh;
transition: 1s ease-in-out;
-webkit-text-stroke-width: 2px;
+<<<<<<< HEAD
+=======
+ -webkit-text-stroke-color: #ffffff;
+}
+.fp-viewing-des #number3 {
+ bottom: 5vh;
+ transition: 1s ease-in-out;
+ -webkit-text-stroke-width: 2px;
+ -webkit-text-stroke-color: #ffffff;
+}
+.fp-viewing-place #number4 {
+ bottom: 5vh;
+ transition: 1s ease-in-out;
+ -webkit-text-stroke-width: 2px;
+ -webkit-text-stroke-color: #ffffff;
+}
+.fp-viewing-play #number5 {
+ bottom: 5vh;
+ transition: 1s ease-in-out;
+ -webkit-text-stroke-width: 2px;
+>>>>>>> cc98faba6808c6589cb0daebffac94f36e5daa5a
-webkit-text-stroke-color: #ffffff;
}
@@ -360,6 +404,21 @@ a:focus {
transition: 1s ease-in-out;
-webkit-text-stroke-color: #ffffff;
}
+.fp-viewing-des #next3 {
+ bottom: 0vh;
+ transition: 1s ease-in-out;
+ -webkit-text-stroke-color: #ffffff;
+}
+.fp-viewing-place #next4 {
+ bottom: 0vh;
+ transition: 1s ease-in-out;
+ -webkit-text-stroke-color: #ffffff;
+}
+.fp-viewing-play #next5 {
+ bottom: 0vh;
+ transition: 1s ease-in-out;
+ -webkit-text-stroke-color: #ffffff;
+}
.fp-viewing-code .footage {
transition: 1s ease-in-out;
@@ -370,6 +429,18 @@ a:focus {
transition: 1s ease-in-out;
background-image: url(./img/design2.jpg);
}
+.fp-viewing-des .footage {
+ transition: 1s ease-in-out;
+ background-image: url(./img/design.jpg);
+}
+.fp-viewing-place .footage {
+ transition: 1s ease-in-out;
+ background-image: url(./img/design2.jpg);
+}
+.fp-viewing-play .footage {
+ transition: 1s ease-in-out;
+ background-image: url(./img/design.jpg);
+}
.west {
color: transparent;
diff --git a/wp-content/themes/foundry0/template-parts/page/content.php b/wp-content/themes/foundry0/template-parts/page/content.php
new file mode 100644
index 0000000000000000000000000000000000000000..a545d9e9772dc80edc10451b209dd4bb942d5573
--- /dev/null
+++ b/wp-content/themes/foundry0/template-parts/page/content.php
@@ -0,0 +1,39 @@
+<div id="post-<?php the_ID(); ?>" <?php post_class('post clearfix'); ?>>
+
+ <?php if ( has_post_thumbnail() ) { ?>
+
+ <div class="post-media">
+ <a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__('Permalink to %s', 'rocknrolla'), the_title_attribute('echo=0') ); ?>" rel="bookmark">
+ <?php the_post_thumbnail('blog-standard'); ?>
+ </a>
+ </div>
+
+ <?php } if ( has_post_thumbnail() == '' ) { ?>
+
+ <div class="post-media">
+ <a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__('Permalink to %s', 'rocknrolla'), the_title_attribute('echo=0') ); ?>" rel="bookmark"><div class="no-post-image"></div></a>
+ </div>
+ <?php } ?>
+
+ <div class="post-title">
+ <a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__('Permalink to %s', 'rocknrolla'), the_title_attribute('echo=0') ); ?>" rel="bookmark"><h2><?php the_title(); ?></h2></a>
+ </div><!-- End of Title -->
+
+ <div class="post-meta">
+ <?php _e('<i class="fa fa-tasks"></i> ', 'rocknrolla'); the_category(', '); ?>, <i class="fa fa-time"></i> <?php the_time('d'); ?> <?php the_time('M'); ?>, <?php the_time('Y'); ?> <span><?php if ( comments_open() ) { comments_popup_link(__('<i class="fa fa-comments-o"></i> 0', 'rocknrolla'), __('<i class="fa fa-comments-o"></i> 1', 'rocknrolla'), __('<i class="fa fa-comments-o"></i> %', 'rocknrolla'), 'comments-link', ''); } ?></span>
+ </div><!-- End of Meta Date -->
+
+ <div class="post-content">
+ <?php the_excerpt(); ?>
+ <?php wp_link_pages(array('before' => 'Pages: ', 'next_or_number' => 'number')); ?>
+ </div><!-- End of Content -->
+
+ <div class="post-tags styled-list">
+ <ul>
+ <?php the_tags( '<ul> <li><i class="fa fa-tags"></i> ', ', </li><li><i class="fa fa-tags"></i> ', ' </li> </ul>'); ?>
+ </ul>
+ </div><!-- End of Tags -->
+
+</div><!-- End of Post -->
+
+