@@ -375,10 +383,12 @@ class Subtemplate {
public function team($subtemplateTitle) {
$content = get_sub_field('content');
$meetTeamLink = get_sub_field('meet_the_team_link');
+ $numberOfPeople = get_sub_field('number_of_people_to_display');
$args = array(
'post_type' => 'team',
- 'order' => 'ASC'
+ 'order' => 'DESC',
+ 'posts_per_page' => $numberOfPeople
);
$teamMembers = get_posts($args);
@@ -389,6 +399,10 @@ class Subtemplate {
$name = $teamMember->post_title;
$role = get_field('role',$id);
$image = get_field('image',$id)['url'];
+ $hoverimage = get_field('hover_image',$id)['url'];
+ if (!$hoverimage) {
+ $hoverimage = $image;
+ }
$facebook = get_field('facebook_link',$id);
$themeUrl = WPTHEME_TEMPLATE_URL . '/';
@@ -418,7 +432,7 @@ class Subtemplate {
}
$teamMemberMarkup .= "
-
+
{$name}
{$role}
{$facebook}
@@ -442,11 +456,11 @@ class Subtemplate {
}
public function teamGeneral($subtemplateTitle) {
$content = get_sub_field('content');
- $meetTeamLink = get_sub_field('meet_the_team_link');
$args = array(
'post_type' => 'team',
- 'order' => 'ASC'
+ 'order' => 'DESC',
+ 'posts_per_page' => -1
);
$teamMembers = get_posts($args);
@@ -864,8 +878,8 @@ class Subtemplate {
- {$existing}
- {$new}
+ Existing Marketplace
{$existing}
+ New Marketplace
{$new}
";
diff --git a/images/logo/ascribeicon-black.svg b/images/logo/ascribeicon-black.svg
new file mode 100644
index 0000000..4c7b3fe
--- /dev/null
+++ b/images/logo/ascribeicon-black.svg
@@ -0,0 +1,11 @@
+
+
+
+
diff --git a/images/logo/ascribeicon-white.svg b/images/logo/ascribeicon-white.svg
new file mode 100644
index 0000000..2a90a3c
--- /dev/null
+++ b/images/logo/ascribeicon-white.svg
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/images/svg/hamburger.svg b/images/svg/hamburger.svg
new file mode 100644
index 0000000..bd8ff43
--- /dev/null
+++ b/images/svg/hamburger.svg
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/sftpCache.json b/sftpCache.json
index 2bab080..b5d21ba 100644
--- a/sftpCache.json
+++ b/sftpCache.json
@@ -1 +1 @@
-{"/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//ascribe.css":"2015-10-16T03:02:08.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//ascribe.min.css":"2015-10-16T03:02:08.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//readme.md":"2015-09-17T22:31:35.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//less/ascribe.less":"2015-10-16T03:02:04.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//ascribe.js":"2015-10-16T02:40:57.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//ascribe.min.js":"2015-10-16T02:40:57.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//src/ascribe.js":"2015-10-16T02:40:48.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//vendor/readme.md":"2015-09-17T22:31:35.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//helpers/helpers.less":"2015-10-16T00:06:34.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//less/branding.less":"2015-10-16T00:59:03.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//vendor/colorbox.css":"2015-08-30T20:38:35.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//vendor/normalize.less":"2015-08-25T22:42:14.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//vendor/print.less":"2015-07-02T21:25:38.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//vendor/retina/retina.min.js":"2015-08-18T23:30:10.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/controller//controller.inc.php":"2015-09-17T22:47:24.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/controller//init.php":"2015-09-25T23:50:20.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/controller//classes/Subtemplate.php":"2015-10-15T21:24:37.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//ajax-pagination.js":"2015-09-25T04:46:45.000Z"}
\ No newline at end of file
+{"/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//ascribe.css":"2015-10-17T00:31:30.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//ascribe.min.css":"2015-10-17T00:31:31.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//readme.md":"2015-09-17T22:31:35.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//less/ascribe.less":"2015-10-17T00:31:26.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//ascribe.js":"2015-10-17T00:13:07.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//ascribe.min.js":"2015-10-17T00:13:07.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//src/ascribe.js":"2015-10-17T00:12:07.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//vendor/readme.md":"2015-09-17T22:31:35.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//helpers/helpers.less":"2015-10-16T20:25:19.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//less/branding.less":"2015-10-16T21:10:09.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//vendor/colorbox.css":"2015-08-30T20:38:35.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//vendor/normalize.less":"2015-08-25T22:42:14.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//vendor/print.less":"2015-07-02T21:25:38.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//vendor/retina/retina.min.js":"2015-08-18T23:30:10.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/controller//controller.inc.php":"2015-09-17T22:47:24.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/controller//init.php":"2015-09-25T23:50:20.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/controller//classes/Subtemplate.php":"2015-10-17T00:09:35.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//ajax-pagination.js":"2015-09-25T04:46:45.000Z"}
\ No newline at end of file
diff --git a/template-blogheader.php b/template-blogheader.php
index f8cb872..b1669be 100644
--- a/template-blogheader.php
+++ b/template-blogheader.php
@@ -8,15 +8,20 @@
?>
ascribe blog
diff --git a/template-header.php b/template-header.php
index 769b580..6fd14f3 100644
--- a/template-header.php
+++ b/template-header.php
@@ -10,16 +10,27 @@ require 'controller/init.php';
?>