arcHIVE-tech/Arc-hive-omeka-theme
arcHIVE-tech
/
Arc-hive-omeka-theme
4
0
Fork 0
Code Issues 9 Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
jorge 2021-07-28 12:30:42 +02:00
parent d0a193e5ba dd781f6f1d
commit 0bffead98a
14 changed files with 22827 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asset/css/default.css
View File

File diff suppressed because one or more lines are too long

2
asset/css/editor.css
View File

File diff suppressed because one or more lines are too long

22644
asset/js/foundation.js vendored Normal file
View File

File diff suppressed because it is too large Load Diff

2
asset/scss/_settings.scss
View File

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

20
asset/scss/components/_accordion.scss
View File

@ -1,11 +1,26 @@
.accordion-item {
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 {
ul,ol {
list-style: none;
//@include flex;
//@include flex-align(justify,middle);
@include xy-grid;
}
li {
@ -14,3 +29,4 @@
text-align:left;
}
}

45
asset/scss/components/_buttons.scss
View File

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

94
asset/scss/global/_omeka.scss
View File

@ -322,12 +322,12 @@ body.vertical-menu header .desktop {
}
.browse-control-mobile {
// display: none;
//
// @include breakpoint(small down) {
// display: inline-block;
display: none;
@include breakpoint(small down) {
display: inline-block;
// float: right;
// }
}
}
.browse-toggle {
@ -355,35 +355,37 @@ body.vertical-menu header .desktop {
}
.browse-controls {
@include xy-grid;
justify-content: space-between;
align-items: center;
input,
select,
button,
.button {
@include xy-grid;
justify-content: space-between;
align-items: center;
// margin: 0 (-.5 * $global-margin);
// font-size: .875 * $global-font-size;
//
// input,
// select,
// button,
// .button {
// font-size: .875 * $global-font-size;
// padding: (.5 * $global-padding);
width: auto;
}
.sorting select {
// margin-right: .5 * $global-margin;
}
@include breakpoint(small down) {
margin: 0;
display: none;
&.open {
display: flex;
align-items: stretch;
}
&.closed {
display: none;
}
// }
//
// .sorting select {
// margin-right: .5 * $global-margin;
// }
//
@include breakpoint(small down) {
// margin: 0;
display: none;
&.open {
display: flex;
align-items: stretch;
}
&.closed {
display: none;
}
// .sorting,
// .omeka-pagination,
// .advanced-search {
@ -393,6 +395,13 @@ body.vertical-menu header .desktop {
// .advanced-search {
// 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;
}
}
@ -505,20 +514,20 @@ body.vertical-menu header .desktop {
}
.omeka-pagination {
// @include breakpoint(medium) {
// @include xy-cell(4);
// }
@include breakpoint(medium) {
@include xy-cell();
}
}
.omeka-pagination,
.omeka-pagination form {
// display: flex;
// align-items: center;
display: flex;
align-items: center;
}
.omeka-pagination .button-group {
// flex-wrap: nowrap;
// flex-grow: 0;
flex-wrap: nowrap;
flex-grow: 0;
}
.omeka-pagination form,
@ -535,6 +544,15 @@ body.vertical-menu header .desktop {
// margin-bottom: 0;
}
.sorting {
display: flex;
}
.sorting select {
width: 100%;
height: 100%;
margin-bottom: 0;
}
.sorting {
display: flex;

53
asset/scss/modules/_content.scss
View File

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

5
asset/scss/modules/_footer.scss
View File

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

1
gulpfile.js
View File

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

2
view/common/site-list-entry.phtml
View File

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

3
view/layout/layout.phtml
View File

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

35
view/omeka/site/item/show.phtml
View File

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

33
view/omeka/site/media/show.phtml
View File

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