Merge branch 'fix/20210728' into fix/forms-seach-input-mods

This commit is contained in:
jorge 2021-07-28 12:30:42 +02:00
commit 0bffead98a
14 changed files with 22827 additions and 114 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 Normal file

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.95rem, small: 0.9rem,
default: 1.6rem, default: 1.6rem,
large: 2.4rem, large: 2.4rem,
); );

View File

@ -1,11 +1,26 @@
.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 {
@ -14,3 +29,4 @@
text-align:left; text-align:left;
} }
} }

View File

@ -1,6 +1,11 @@
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;
@ -18,6 +23,14 @@ 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,21 +358,23 @@ 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;
input, // margin: 0 (-.5 * $global-margin);
select, // font-size: .875 * $global-font-size;
button, //
.button { // input,
// 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 {
@ -383,7 +385,7 @@ body.vertical-menu header .desktop {
&.closed { &.closed {
display: none; display: none;
} }
//
// .sorting, // .sorting,
// .omeka-pagination, // .omeka-pagination,
// .advanced-search { // .advanced-search {
@ -394,6 +396,13 @@ 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 {
@ -505,20 +514,20 @@ body.vertical-menu header .desktop {
} }
.omeka-pagination { .omeka-pagination {
// @include breakpoint(medium) { @include breakpoint(medium) {
// @include xy-cell(4); @include xy-cell();
// } }
} }
.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,
@ -535,6 +544,15 @@ 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,9 +43,8 @@ main {
} }
section { section {
padding: $global-padding $global-padding*2; padding: $global-padding $global-padding*2;
//margin: $global-margin;
} }
.entry-content { .entry-content,.omekas-entry-content {
@include breakpoint(small){ @include breakpoint(small){
@include xy-cell(12); @include xy-cell(12);
padding: $global-padding*2 ; padding: $global-padding*2 ;
@ -69,6 +68,32 @@ 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
//-------------- //--------------
@ -152,12 +177,11 @@ main {
.collections-list { .collections-list {
@include xy-grid; @include xy-grid;
width:100vw; padding:0;
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;
@ -166,10 +190,15 @@ main {
} }
main { main {
@include xy-grid; @include xy-grid;
article{ padding: 0;
margin: 0;
article {
@include card-container(); @include card-container();
@include breakpoint(small){
@include xy-cell(); @include xy-cell();
width: 100%;
padding: 0;
margin: 0;
@include breakpoint(small){
font-size: $global-font-size*0.7; font-size: $global-font-size*0.7;
} }
@include breakpoint(medium){ @include breakpoint(medium){
@ -179,18 +208,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);
@ -199,6 +228,7 @@ 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);
@ -382,5 +412,4 @@ main {
width: 100%; width: 100%;
} }
//end omeka specific styles //end omeka specific styles

View File

@ -1,4 +1,5 @@
footer { footer {
margin-top: $global-margin;
background-color: $secondary-color; background-color: $secondary-color;
a { a {
color: $body-font-color; color: $body-font-color;
@ -24,7 +25,7 @@ footer {
.logo { .logo {
} }
.site-brand,.brand-logo { .site-brand,.brand-logo {
&.archive{ &.archive,&.arc-hive{
&::before { &::before {
margin-top:unset; margin-top:unset;
} }
@ -32,7 +33,6 @@ 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,7 +59,6 @@ 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,6 +28,7 @@ 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,6 +28,7 @@ $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']; ?>" />
@ -39,5 +40,6 @@ $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,8 +93,9 @@ 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,34 +7,29 @@ $itemMedia = $item->media();
$showLayout = $this->themeSetting('show_layout'); $showLayout = $this->themeSetting('show_layout');
?> ?>
<!-- arc-hive insert begins --> <!-- arc-hive page header-image insert begins -->
<?php <?php
//$site->pages(); $img_src = null;
// 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") { <style>
$image_height = "300px"; .arc-page-header-img {
} else { content: url("<?= $img_src ?>");
$image_height = "200px"; }
} </style>
<?php
?> ?>
<style>
#archive_header_img {
background: url("<?= $img_src ?>") no-repeat;
width: 100%;
height: <?= $image_height ?>;
}
</style>
<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 insert ends --> <!-- arc-hive page header-image insert ends -->
<div class="resource-title"> <div class="resource-title">

View File

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