Skip to content

Commit

Permalink
Merge branch 'stage'
Browse files Browse the repository at this point in the history
  • Loading branch information
@antongit
antongit committed May 3, 2024
2 parents 1fbbaca + 5d26003 commit 0024dc7
Show file tree
Hide file tree
Showing 5 changed files with 92 additions and 89 deletions.
38 changes: 9 additions & 29 deletions assets/scss/_showcase.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,16 @@

button
{
background: inherit;
// background: inherit;
border: none;
background-color: #333;
color: #bbb;

&.active
{
color: #333;
background-color: #ddd;
}
}

.carousel-control-prev
Expand Down Expand Up @@ -101,34 +109,6 @@

box-shadow: 0 0 12px 5px rgba(0,0,0,0.2);

// @media (min-width: 786px) {
// max-height: 400px;
// }

// &.card-has-bg{
// transition: all 500ms cubic-bezier(0.19, 1, 0.22, 1);
// background-size:120%;
// background-repeat:no-repeat;
// background-position: center center;
// bacgk

// &:before
// {
// content: '';
// position: absolute;
// top: 0;
// right: 0;
// bottom: 0;
// left: 0;
// background: inherit;
// }

// &:hover
// {
// background-size:130%;
// }
// }

.card-meta{color:orange}

.card-body{
Expand Down
12 changes: 9 additions & 3 deletions config.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,15 @@ blog = '/blog/:sections[1]/:slug'

[params.Showcase]
headline = "Showcase"
showreelHeadline = "Showreel 2002 - 2019"
showreelSubline = "Projects in this showreel were realized mostly with vvvv beta within the past few years."
vimeo = 371511910
[params.Showcase.Showreel2]
title = "Projects 2018 ~ 2024"
alt = "Works in this reel were realized in the past ~6 years and thus include both vvvv beta as well as pure vvvv gamma projects."
vimeo = 930568091

[params.Showcase.Showreel1]
title = "Projects 2002 ~ 2019"
alt = "Projects in this showreel were realized mostly with vvvv beta within the past few years."
vimeo = 371511910

[params.Blog]
Title = "Blog"
Expand Down
32 changes: 32 additions & 0 deletions layouts/partials/showcase-projects.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<div class="row justify-content-center mb-3 mb-md-1">
<div class="col-11 col-xl-9">
<div class="row">
<div class="col d-flex">
<div class="label py-1 px-2 text-center">Recent</div>
</div>
</div>
</div>
</div>
<div class="row justify-content-center mb-5">
<div class="col-11 col-xl-9">
{{ $pages := ((where site.RegularPages "Section" "madewithgamma").ByParam "id").Reverse }}

<div class="swiper">
<!-- Additional required wrapper -->
<div class="swiper-wrapper">
<!-- Slides -->
{{ range $index, $elem:= $pages }}
{{ partial "madeWithGammaCard" (dict "context" $elem "index" $index) }}
{{ end }}
</div>
</div>

<!-- If we need pagination -->
<div class="swiper-pagination"></div>

<!-- If we need navigation buttons -->
<div class="swiper-button-prev"></div>
<div class="swiper-button-next"></div>

</div>
</div>
33 changes: 33 additions & 0 deletions layouts/partials/showcase-showreels.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<div class="row justify-content-center mb-3">
<div class="col-11 col-xl-9">
<div class="row">
<div class="col d-flex">
<div class="label py-1 px-2 text-center">Showreels</div>
</div>
</div>
</div>
<div class="col-11 col-xl-9 mt-2">
<ul class="nav nav-pills" id="showreel-pills" role="tablist">
{{ with .Showreel2}}
<li class="nav-item" role="presentation">
<button class="nav-link active mr-2" href="#showreel-2" data-toggle="pill" data-target="#showreel-2" role="tab" aria-controls="showreel-2" aria-selected="true" alt="{{ .alt }}">{{ .title }}</button >
</li>
{{ end }}
{{ with .Showreel1}}
<li class="nav-item" role="presentation">
<button class="nav-link" href="#showreel-1" data-toggle="pill" data-target="#showreel-1" role="tab" aria-controls="showreel-1" aria-selected="false" alt="{{ .alt }}">{{ .title }}</button >
</li>
{{ end }}
</ul>
</div>
</div>
<div class="row mt-2 px-3 mb-5 justify-content-center" id="showreel-content">
<div class="tab-content col-11 col-xl-9 mx-2 text-center px-0">
<div class="mediaShadow tab-pane fade show active" id="showreel-2" role="tabpanel" aria-labelledby="pills-showreel2-tab">
{{ partial "vimeo" .Showreel2.vimeo }}
</div>
<div class="mediaShadow tab-pane fade" id="showreel-1" role="tabpanel" aria-labelledby="pills-showreel1-tab">
{{ partial "vimeo" .Showreel1.vimeo }}
</div>
</div>
</div>
66 changes: 9 additions & 57 deletions layouts/partials/showcase.html
View file
Original file line number Diff line number Diff line change
@@ -1,63 +1,15 @@
{{ "<!-- MADE WITH GAMMA -->" | safeHTML }}
<section id="Showcase">
<div class="container-fluid">
{{ with .Site.Params.Showcase }}
<div class="row justify-content-center">
<div class="col-lg-8 col-lg-offset-2 text-center">
<h2 class="section-heading">{{ .headline }}</h2>
<hr class="primary">
</div>
</div>
{{ end }}


<div class="row justify-content-center mb-3 mb-md-1">
<div class="col-11 col-xl-9">
<div class="row">
<div class="col d-flex">
<div class="label py-1 px-2 text-center">Recent</div>
</div>
{{ with .Site.Params.Showcase }}
<div class="row justify-content-center">
<div class="col-lg-8 col-lg-offset-2 text-center">
<h2 class="section-heading">{{ .headline }}</h2>
<hr class="primary">
</div>
</div>
</div>
<div class="row justify-content-center mb-5">
<div class="col-11 col-xl-9">
{{ $pages := ((where .Site.RegularPages "Section" "madewithgamma").ByParam "id").Reverse }}

<div class="swiper">
<!-- Additional required wrapper -->
<div class="swiper-wrapper">
<!-- Slides -->
{{ range $index, $elem:= $pages }}
{{ partial "madeWithGammaCard" (dict "context" $elem "index" $index) }}
{{ end }}
</div>
</div>

<!-- If we need pagination -->
<div class="swiper-pagination"></div>

<!-- If we need navigation buttons -->
<div class="swiper-button-prev"></div>
<div class="swiper-button-next"></div>

</div>
</div>
<div class="row justify-content-center mb-3">
<div class="col-11 col-xl-9">
<div class="row">
<div class="col d-flex">
<div class="label py-1 px-2 text-center">Past</div>
</div>
</div>
</div>
</div>
{{ with .Site.Params.Showcase }}
<div class="row mt-2 px-3 justify-content-center">
<div class="col-11 col-xl-9 mx-2 text-center px-0 mediaShadow">
{{ partial "vimeo" .vimeo }}
</div>
</div>
{{ end }}
{{ partial "showcase-showreels" . }}
{{ partial "showcase-projects" . }}
{{ end }}
</div>
</section>
</section>

0 comments on commit 0024dc7

Please sign in to comment.