Merge pull request 'Last minute pre production changes' (#65) from develop into main
Reviewed-on: #65
This commit is contained in:
commit
3b526e98a7
File diff suppressed because one or more lines are too long
Binary file not shown.
After Width: | Height: | Size: 897 KiB |
|
@ -550,10 +550,11 @@ main {
|
|||
.slides {
|
||||
background-color: $secondary-color;
|
||||
.slide {
|
||||
height: 10rem;
|
||||
flex-direction: column;
|
||||
align-content: center;
|
||||
align-self: center;
|
||||
margin: $global-margin auto;
|
||||
margin: 0 auto;
|
||||
&:first-child {
|
||||
color: unset;
|
||||
background-color: unset;
|
||||
|
@ -565,6 +566,16 @@ main {
|
|||
justify-content: center;
|
||||
}
|
||||
}
|
||||
.image-background {
|
||||
width: 100%;
|
||||
background-color: rgb(250,250,220);
|
||||
background-image: url("../img/header_collections.jpg");
|
||||
background-repeat: no-repeat;
|
||||
background-size: cover;
|
||||
background-position: center 75%;
|
||||
}
|
||||
&.collections-all{
|
||||
}
|
||||
}
|
||||
}
|
||||
aside {
|
||||
|
|
|
@ -59,10 +59,7 @@
|
|||
|
||||
<section class="hero omeka collections-all">
|
||||
<main class="slides">
|
||||
<section class="slide">
|
||||
<figure>
|
||||
<img src="asset/img/ARC-HIVE-logo.svg?v=2.0.0" title="an arc-hive project" alt="arc-hive logo" class="logo">
|
||||
</figure>
|
||||
<section class="slide image-backgroud">
|
||||
</section>
|
||||
|
||||
</main>
|
||||
|
|
|
@ -19,6 +19,9 @@ foreach($sites as $site){
|
|||
if (!isset($site_data['currator'])) {
|
||||
$site_data['currator'] = "";
|
||||
}
|
||||
if (isset($site_data['project_date'])) {
|
||||
$site_data['project_date'] = substr($site_data['project_date'], 0, 4);
|
||||
}
|
||||
array_push($projects, $site_data);
|
||||
}
|
||||
//$collections = json_encode($collections, JSON_UNESCAPED_SLASHES);
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
Hosted, maintained and coded by <a href="https://hangar.org">Hangar</a>
|
||||
</aside>
|
||||
<aside class="double copyright">
|
||||
<?php echo $this->translate('Powered by Omeka S'); ?>
|
||||
Powered by <a href="https://omeka.org/">Omeka</a>
|
||||
</aside>
|
||||
<aside class="legal-credits">
|
||||
Visual identity by <a href="http://oficinadedisseny.net/">Oficina de disseny</a>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<main class="">
|
||||
<!-- <a href="<?php echo $site->url(); ?>" class="site-brand arc-hive-off"> -->
|
||||
<a href="/" class="site-brand arc-hive-off">
|
||||
<a href="https://arc-hive.zone/" class="site-brand arc-hive-off">
|
||||
<?php if ($this->themeSetting('logo')): ?>
|
||||
<img src="<?php echo $this->themeSettingAssetUrl('logo'); ?>"
|
||||
alt="<?php echo $site->title(); ?>"
|
||||
|
|
|
@ -19,7 +19,7 @@ $img_src = null;
|
|||
|
||||
<main class="">
|
||||
<!-- <a href="<?php echo $site->url(); ?>" class="site-brand arc-hive-off"> -->
|
||||
<a href="/" class="site-brand arc-hive-off">
|
||||
<a href="https://arc-hive.zone/" class="site-brand arc-hive-off">
|
||||
<?php if ($this->themeSetting('logo')): ?>
|
||||
<img src="<?php echo $this->themeSettingAssetUrl('logo'); ?>"
|
||||
alt="<?php echo $site->title(); ?>"
|
||||
|
|
|
@ -1,25 +1,13 @@
|
|||
<section class="hero omeka collections-all">
|
||||
<main class="slides">
|
||||
<?php if ($this->themeSetting('logo')): ?>
|
||||
<section class="slide">
|
||||
<figure>
|
||||
<img src="<?php echo $this->themeSettingAssetUrl('logo'); ?>"
|
||||
title="<?php echo $site->title(); ?>"
|
||||
alt="<?php echo $site->title(); ?>"
|
||||
class="logo" />
|
||||
</figure>
|
||||
</section>
|
||||
<?php else: ?>
|
||||
<section class="slide">
|
||||
<figure>
|
||||
<img src="<?php echo $this->assetUrl('img/ARC-HIVE-logo.svg');?>"
|
||||
<section class="slide image-background">
|
||||
<!-- <figure> -->
|
||||
<!-- <img src=""
|
||||
title="an arc-hive project"
|
||||
alt="arc-hive logo"
|
||||
class="logo" />
|
||||
</figure>
|
||||
class="logo" /-->
|
||||
<!-- </figure> -->
|
||||
</section>
|
||||
<?php endif; ?>
|
||||
|
||||
</main>
|
||||
<aside>
|
||||
<h2 class="site-title">
|
||||
|
|
|
@ -12,7 +12,7 @@ $items[0] = new ArrayObject(); // top level menu items go here
|
|||
if ($wordpress_endpoint) {
|
||||
try {
|
||||
$client = new Client($wordpress_endpoint);
|
||||
$client->setOptions(array("timeout"=>1));
|
||||
$client->setOptions(array("timeout"=>2));
|
||||
$response = $client->send();
|
||||
}
|
||||
catch (exception $e) {
|
||||
|
@ -29,6 +29,7 @@ if ($wordpress_endpoint) {
|
|||
$item_url = "/login";
|
||||
}
|
||||
$item_title = $menu_item->title;
|
||||
/*
|
||||
if ($lowered_title == 'collections') {
|
||||
if ($wordpress_site) {
|
||||
// change Collections item
|
||||
|
@ -38,13 +39,13 @@ if ($wordpress_endpoint) {
|
|||
continue; // do not render the Collections item
|
||||
}
|
||||
}
|
||||
*/
|
||||
$item = [
|
||||
"id" => $menu_item->ID,
|
||||
"title" => $item_title,
|
||||
"url" => $item_url
|
||||
];
|
||||
if (!isset($items[$menu_item->menu_item_parent])) {
|
||||
//if (!array_key_exists($menu_item->menu_item_parent, $items)) {
|
||||
$items[$menu_item->menu_item_parent] = new ArrayObject();
|
||||
}
|
||||
$items[$menu_item->menu_item_parent][$menu_item->ID] =$item;
|
||||
|
@ -90,7 +91,6 @@ if (!function_exists('render_menu')) {
|
|||
}
|
||||
echo '<a role="" href="'.$menu_item['url'].'">'.$menu_item['title'].'</a>'.PHP_EOL;
|
||||
if (isset($items[$menu_item['id']])) {
|
||||
//if (array_key_exists($menu_item['id'], $items)) {
|
||||
render_menu($items, $menu_item['id']); // render sub menu
|
||||
}
|
||||
echo '</li>' . PHP_EOL;
|
||||
|
|
Loading…
Reference in New Issue