Compare commits

...

21 Commits

Author SHA1 Message Date
jorge 592bf8cb10 removed grey color from figure in accordion 2021-07-28 10:59:16 +02:00
jorge f6e7d03232 removed styles to first line in accordion list titles 2021-07-28 10:53:16 +02:00
jorge 3f860c2be1 revert previous commits apply 100vw only to .index, apply max 50vw to .page content 2021-07-28 09:56:49 +02:00
jorge 0f8ecd621a case .page article to xy-grid-container width 2021-07-28 09:44:28 +02:00
jorge 6e1ee18151 div .blocks to xy-grid-container width 2021-07-28 09:38:42 +02:00
jorge 456c1456e5 div .blocks to xy-grid width 2021-07-28 09:35:42 +02:00
jorge 8282977921 modyfied padding in small button sizes such as accordion list 2021-07-27 14:42:20 +02:00
jorge 3b4c6cb0ba fixed width for main content, accordion width so it will be contained in bib screens 2021-07-27 14:33:52 +02:00
jorge 58d6edbbf1 Merge branch 'fix/accordion-issue07' into fix/content-section-width
to be able to fix accordion-content layout
2021-07-27 14:18:34 +02:00
jorge 2ee608a16b added `<section>` to `.accordion-content` to be able to lay content propperly 2021-07-27 14:17:52 +02:00
chris 71e6d35c2c Merge pull request 'fix/accordion-issue07' (#12) from fix/accordion-issue07 into develop
Reviewed-on: #12
2021-07-23 20:05:58 +02:00
jorge ff273f2274 añadido el js de foundation al footer 2021-07-21 16:27:51 +02:00
jorge 5196290f91 added support for foundation js 2021-07-21 16:13:36 +02:00
jorge 81dff27d00 Merge pull request 'recovers header image on item and media pages' (#10) from fix/item-media-header into develop
Reviewed-on: #10
2021-07-21 10:37:56 +02:00
buttle 80d30b5369 recovers header image on item and media pages 2021-07-20 11:49:59 +02:00
chris 364d45d7fe Merge pull request 'mods in gulpfile so `npm start` will track all .scss files inside `assets/scss`' (#9) from fix/gulpfile-scss into develop
Reviewed-on: #9
2021-07-18 14:47:23 +02:00
jorge 4d6e898e74 mods in gulpfile so `npm start` will track all .scss files inside `assets/scss` 2021-07-15 17:36:47 +02:00
chris b27ed67638 Merge pull request 'fix/content-section-width' (#8) from fix/content-section-width into develop
Reviewed-on: #8
2021-07-15 17:33:43 +02:00
jorge 8ea4b85d9c commented specificall _omeka styles interfearing with ach-hive.zone scss 2021-07-15 17:24:15 +02:00
jorge 0f90fb0c1e main content width padding fix 2021-07-15 17:21:21 +02:00
jorge 6f77deb6ed Merge pull request 'recupera las header images de las páginas. separa los partials de Collections y default en ficheros distintos.' (#3) from fix/header-image into develop
Reviewed-on: #3
I can't see any inconvenients to proceed.
2021-07-09 14:30:13 +02:00
13 changed files with 23353 additions and 661 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;

File diff suppressed because it is too large Load Diff

View File

@ -41,7 +41,10 @@ main {
text-align: center; text-align: center;
} }
} }
.entry-content { section {
padding: $global-padding $global-padding*2;
}
.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 ;
@ -65,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
//-------------- //--------------
@ -148,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;
@ -162,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){
@ -175,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);
@ -195,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);
@ -378,5 +412,4 @@ main {
width: 100%; width: 100%;
} }
//end omeka specific styles //end omeka specific styles

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">