Compare commits

..

No commits in common. "0bffead98a8b22d03ab619f9320954d1834c2550" and "d0a193e5bad62a0ed541afea1617587582641fea" have entirely different histories.

14 changed files with 113 additions and 22826 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

22644
asset/js/foundation.js vendored

File diff suppressed because it is too large Load Diff

View File

@ -322,7 +322,7 @@ $button-border: 2px solid $button-color;//1px solid transparent;
$button-hollow-border-width: 2px; $button-hollow-border-width: 2px;
$button-sizes: ( $button-sizes: (
tiny: 0.7rem, tiny: 0.7rem,
small: 0.9rem, small: 0.95rem,
default: 1.6rem, default: 1.6rem,
large: 2.4rem, large: 2.4rem,
); );

View File

@ -1,26 +1,11 @@
.accordion-item { .accordion-item {
border-bottom: $global-border-archive; border-bottom: $global-border-archive;
&:first-of-type {
max-height: 5rem;
.is-active{
max-height: 5rem;
padding:0;
}
.accordion-title::before{
content:'';
}
a {
color: black;
&:hover,&:active,&:focus{
color: black;
cursor: not-allowed;
}
}
}
} }
.accordion-title { .accordion-title {
ul,ol { ul,ol {
list-style: none; list-style: none;
//@include flex;
//@include flex-align(justify,middle);
@include xy-grid; @include xy-grid;
} }
li { li {
@ -29,4 +14,3 @@
text-align:left; text-align:left;
} }
} }

View File

@ -1,11 +1,6 @@
button,.button { button,.button {
&.small{
padding: $global-padding*0.5 $global-padding*1.5;
}
&.tiny{
padding: $global-padding*0.3 $global-padding*1.1;
}
&:not(.large,.small,.tiny){ &:not(.large,.small,.tiny){
// min-width: 20rem;
} }
&.primary { &.primary {
color: $white; color: $white;
@ -23,14 +18,6 @@ button,.button {
&.secondary { &.secondary {
border-color: $secondary-color; border-color: $secondary-color;
} }
&.inactive {
color: $light-gray;
border-color: $light-gray;
cursor: not-allowed ;
&:hover {
background-color: unset;
}
}
} }
.hero { .hero {
button,.button { button,.button {

View File

@ -322,12 +322,12 @@ body.vertical-menu header .desktop {
} }
.browse-control-mobile { .browse-control-mobile {
display: none; // display: none;
//
@include breakpoint(small down) { // @include breakpoint(small down) {
display: inline-block; // display: inline-block;
// float: right; // float: right;
} // }
} }
.browse-toggle { .browse-toggle {
@ -358,23 +358,21 @@ body.vertical-menu header .desktop {
@include xy-grid; @include xy-grid;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
// margin: 0 (-.5 * $global-margin); input,
// font-size: .875 * $global-font-size; select,
// button,
// input, .button {
// select,
// button,
// .button {
// font-size: .875 * $global-font-size; // font-size: .875 * $global-font-size;
// padding: (.5 * $global-padding); // padding: (.5 * $global-padding);
// } width: auto;
// }
// .sorting select {
.sorting select {
// margin-right: .5 * $global-margin; // margin-right: .5 * $global-margin;
// } }
//
@include breakpoint(small down) { @include breakpoint(small down) {
// margin: 0; margin: 0;
display: none; display: none;
&.open { &.open {
@ -385,7 +383,7 @@ body.vertical-menu header .desktop {
&.closed { &.closed {
display: none; display: none;
} }
//
// .sorting, // .sorting,
// .omeka-pagination, // .omeka-pagination,
// .advanced-search { // .advanced-search {
@ -396,13 +394,6 @@ body.vertical-menu header .desktop {
// order: 3; // order: 3;
// } // }
} }
.button-group {
margin-bottom: 0;
}
button,.button{
font-size: $global-font-size * 0.9;
padding: $global-padding*0.7 $global-padding*1.7;
}
} }
.filter { .filter {
@ -514,20 +505,20 @@ body.vertical-menu header .desktop {
} }
.omeka-pagination { .omeka-pagination {
@include breakpoint(medium) { // @include breakpoint(medium) {
@include xy-cell(); // @include xy-cell(4);
} // }
} }
.omeka-pagination, .omeka-pagination,
.omeka-pagination form { .omeka-pagination form {
display: flex; // display: flex;
align-items: center; // align-items: center;
} }
.omeka-pagination .button-group { .omeka-pagination .button-group {
flex-wrap: nowrap; // flex-wrap: nowrap;
flex-grow: 0; // flex-grow: 0;
} }
.omeka-pagination form, .omeka-pagination form,
@ -544,15 +535,6 @@ body.vertical-menu header .desktop {
// margin-bottom: 0; // margin-bottom: 0;
} }
.sorting {
display: flex;
}
.sorting select {
width: 100%;
height: 100%;
margin-bottom: 0;
}
.sorting { .sorting {
display: flex; display: flex;

View File

@ -43,8 +43,9 @@ main {
} }
section { section {
padding: $global-padding $global-padding*2; padding: $global-padding $global-padding*2;
//margin: $global-margin;
} }
.entry-content,.omekas-entry-content { .entry-content {
@include breakpoint(small){ @include breakpoint(small){
@include xy-cell(12); @include xy-cell(12);
padding: $global-padding*2 ; padding: $global-padding*2 ;
@ -68,32 +69,6 @@ main {
} }
//
// page category
//--------------
.index{
main {
article {
header {
.entry-title {
}
}
section {
}
.entry-content,.omekas-entry-content {
@include breakpoint(small){
}
@include breakpoint(medium){
max-width: unset;
}
@include breakpoint(xlarge){
max-width: unset;
}
}
}
}
}
// //
// news category // news category
//-------------- //--------------
@ -177,11 +152,12 @@ main {
.collections-list { .collections-list {
@include xy-grid; @include xy-grid;
padding:0; width:100vw;
header,main{ header,main{
@include xy-cell(12); @include xy-cell(12);
@include flex; @include flex;
@include flex-align(center,top); @include flex-align(center,top);
padding: $global-padding*2 0;
} }
header { header {
margin-top: 2*$global-margin; margin-top: 2*$global-margin;
@ -190,15 +166,10 @@ main {
} }
main { main {
@include xy-grid; @include xy-grid;
padding: 0;
margin: 0;
article{ article{
@include card-container(); @include card-container();
@include xy-cell();
width: 100%;
padding: 0;
margin: 0;
@include breakpoint(small){ @include breakpoint(small){
@include xy-cell();
font-size: $global-font-size*0.7; font-size: $global-font-size*0.7;
} }
@include breakpoint(medium){ @include breakpoint(medium){
@ -208,18 +179,18 @@ main {
} }
margin-bottom:0; margin-bottom:0;
} }
table {
thead,tbody,tfoot {
margin: $global-padding*2;
}
}
} }
.accordion-content { .accordion-content {
padding-top: 0;
section { section {
@include xy-grid; @include xy-grid;
padding-top: 0;
padding-bottom: 0;
@include breakpoint(small){ @include breakpoint(small){
figure { figure {
@include xy-cell(12); @include xy-cell(12);
margin-left:0;
margin-right:0;
} }
p { p {
@include xy-cell(12); @include xy-cell(12);
@ -228,7 +199,6 @@ main {
@include breakpoint(medium){ @include breakpoint(medium){
figure { figure {
@include xy-cell(3); @include xy-cell(3);
margin-left: 0;
} }
p { p {
@include xy-cell(9); @include xy-cell(9);
@ -412,4 +382,5 @@ main {
width: 100%; width: 100%;
} }
//end omeka specific styles //end omeka specific styles

View File

@ -1,5 +1,4 @@
footer { footer {
margin-top: $global-margin;
background-color: $secondary-color; background-color: $secondary-color;
a { a {
color: $body-font-color; color: $body-font-color;
@ -25,7 +24,7 @@ footer {
.logo { .logo {
} }
.site-brand,.brand-logo { .site-brand,.brand-logo {
&.archive,&.arc-hive{ &.archive{
&::before { &::before {
margin-top:unset; margin-top:unset;
} }
@ -33,6 +32,7 @@ footer {
&.eu { &.eu {
&::before { &::before {
@include breakpoint(small) { @include breakpoint(small) {
// background-image: url('../img/eu_flag_creative_europe_co_funded_black_right.svg');
background-position-x: right; background-position-x: right;
max-width: 50vw; max-width: 50vw;
margin-top:unset; margin-top:unset;
@ -59,6 +59,7 @@ footer {
padding: $global-padding; padding: $global-padding;
font-size: $global-font-size * 0.8; font-size: $global-font-size * 0.8;
&:first-child { &:first-child {
//padding-top: $global-padding*3;
} }
.co-founded { .co-founded {
text-align:right; text-align:right;

View File

@ -28,7 +28,6 @@ function serve() {
}); });
gulp.watch("asset/scss/*.scss", sass); gulp.watch("asset/scss/*.scss", sass);
gulp.watch("asset/scss/*/*.scss", sass);
gulp.watch("*.html").on('change', browserSync.reload); gulp.watch("*.html").on('change', browserSync.reload);
} }

View File

@ -28,7 +28,6 @@ $summary = $showSummary ? $site->summary() : null;
</ul> </ul>
</a> </a>
<aside class="accordion-content" data-tab-content> <aside class="accordion-content" data-tab-content>
<section>
<figure> <figure>
<?php if ($site_meta_values != null): ?> <?php if ($site_meta_values != null): ?>
<img src="<?= $site_meta_values['thumbnail']; ?>" /> <img src="<?= $site_meta_values['thumbnail']; ?>" />
@ -40,6 +39,5 @@ $summary = $showSummary ? $site->summary() : null;
<?php endif; ?> <?php endif; ?>
<a class="button small" href="<?= $site->siteUrl() ?>">View</a> <a class="button small" href="<?= $site->siteUrl() ?>">View</a>
</p> </p>
</section>
</aside> </aside>
</li> </li>

View File

@ -93,9 +93,8 @@ endif;
<!-- </div> --> <!-- </div> -->
</content> </content>
<script> <script>
// $(document).foundation(); $(document).foundation();
</script> </script>
<script src="<?php echo $this->assetUrl('js/foundation.js'); ?>"></script>
</body> </body>
</html> </html>

View File

@ -7,29 +7,34 @@ $itemMedia = $item->media();
$showLayout = $this->themeSetting('show_layout'); $showLayout = $this->themeSetting('show_layout');
?> ?>
<!-- arc-hive page header-image insert begins --> <!-- arc-hive insert begins -->
<?php <?php
$img_src = null; //$site->pages();
// set header image
$img_src = $this->getHelperPluginManager()->get('archiveSiteMeta')->getSiteImage($site); $img_src = $this->getHelperPluginManager()->get('archiveSiteMeta')->getSiteImage($site);
if (!$img_src) { if (!$img_src) {
$img_src = $this->assetUrl('img/ARC-HIVE-logo.svg'); $img_src = '/themes/archive/asset/img/default-header-image.jpg';
}
if ($this->site->title() == "Collections") {
$image_height = "300px";
} else {
$image_height = "200px";
} }
?> ?>
<style> <style>
.arc-page-header-img { #archive_header_img {
content: url("<?= $img_src ?>"); background: url("<?= $img_src ?>") no-repeat;
width: 100%;
height: <?= $image_height ?>;
} }
</style> </style>
<?php
?>
<script> <script>
<?php <?php
$_html = '<a href="'.$this->site->url().'">'.$this->site->title().'</a>'; $_html = '<a href="'.$this->site->url().'">'.$this->site->title().'</a>';
?> ?>
$("#archive_page_title").html('<?php echo $_html ?>'); $("#archive_page_title").html('<?php echo $_html ?>');
</script> </script>
<!-- arc-hive page header-image insert ends --> <!-- arc-hive insert ends -->
<div class="resource-title"> <div class="resource-title">

View File

@ -3,28 +3,33 @@ $translate = $this->plugin('translate');
?> ?>
<?php $this->htmlElement('body')->appendAttribute('class', 'media resource show'); ?> <?php $this->htmlElement('body')->appendAttribute('class', 'media resource show'); ?>
<!-- arc-hive page header-image insert begins --> <!-- arc-hive insert begins -->
<?php <?php
$img_src = null; //$site->pages();
$img_src = $this->getHelperPluginManager()->get('archiveSiteMeta')->getSiteImage($site); $img_src = $this->getHelperPluginManager()->get('archiveSiteMeta')->getSiteImage($site);
if (!$img_src) { if (!$img_src) {
$img_src = $this->assetUrl('img/ARC-HIVE-logo.svg'); $img_src = '/themes/archive/asset/img/default-header-image.jpg';
}
if ($this->site->title() == "Collections") {
$image_height = "300px";
} else {
$image_height = "200px";
} }
?> ?>
<style> <style>
.arc-page-header-img { #archive_header_img {
content: url("<?= $img_src ?>"); background: url("<?= $img_src ?>") no-repeat;
width: 100%;
height: <?= $image_height ?>;
} }
</style> </style>
<?php
?>
<script> <script>
<?php <?php
$_html = '<a href="'.$this->site->url().'">'.$this->site->title().'</a>'; $_html = '<a href="'.$this->site->url().'">'.$this->site->title().'</a>';
?> ?>
$("#archive_page_title").html('<?php echo $_html ?>'); $("#archive_page_title").html('<?php echo $_html ?>');
</script> </script>
<!-- arc-hive page header-image insert ends --> <!-- arc-hive insert ends -->
<div class="resource-title"> <div class="resource-title">