-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #128 from zetxek/breadcrumbs-experience
Simplify logic (breadcrumbs, experience)
- Loading branch information
Showing
11 changed files
with
49 additions
and
61 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,18 @@ | ||
| <!-- inject:../components/baseHead/baseHeadStart.html --> | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| {{ partial "head.html" . }} {{ partial "head_custom.html" . }} | ||
| </head> | ||
|
|
||
| <body> | ||
| {{ partial "header.html" . }} {{ partial "breadcrumb.html" . }} | ||
| <head> | ||
| {{ partial "head.html" . }} {{ partial "head_custom.html" . }} | ||
| </head> | ||
|
|
||
| <section | ||
| id="experience" | ||
| class="section section--border-bottom rad-animation-group" | ||
| > | ||
| <div class="container"> | ||
| <div class="row flex-column-reverse flex-md-row rad-fade-down"> | ||
| <div class="col-12 col-md-5 mt-5 mt-sm-0"> | ||
| {{ range where .Site.RegularPages.ByDate.Reverse "Type" "experience" }} | ||
| <body> | ||
| {{ partial "header.html" . }} | ||
|
|
||
| <div class="experience"> | ||
| <a href="{{.Permalink}}"> | ||
| {{/* The context, ".", is now each one of the pages as it goes | ||
| through the loop */}} | ||
| <div class="experience__date">{{ .Params.duration }}</div> | ||
| <div class="experience__title">{{ .Params.title }}</div> | ||
| <div class="experience__company"> | ||
| {{ .Params.company }}. | ||
| <span class="experience__location" | ||
| >{{ .Params.location }}</span | ||
| > | ||
| </div> | ||
| </a> | ||
| </div> | ||
| {{ end }} | ||
| </div> | ||
| <div class="col-12 col-md-7 mt-7 mt-sm-0"> | ||
| {{ partial "experience-description.html" . }} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </section> | ||
| {{ partial "experience.html" . }} | ||
|
|
||
| {{ partial "footer.html" . }} {{ partial "base-foot.html" . }} | ||
| </body> | ||
|
|
||
| {{ partial "footer.html" . }} {{ partial "base-foot.html" . }} | ||
| </body> | ||
| </html> | ||
| <!-- endinject --> | ||
| <!-- endinject --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,44 @@ | ||
| {{ if .Site.Data.homepage.experience.enable }} | ||
| <section id="experience" class="section section--border-bottom rad-animation-group"> | ||
| <section id="experience" class="section-experience section section--border-bottom rad-animation-group"> | ||
| <div class="container"> | ||
| <div class="row flex-column-reverse flex-md-row rad-fade-down"> | ||
| <div class="col-12 cold-md-12 col-sm-6 mt-5 mt-sm-0"> | ||
| {{ $xp := (where .Site.RegularPages.ByDate.Reverse "Type" "experience") }} | ||
| {{ $xpCount := len $xp }} | ||
| {{/* in the homepage we limit to the homepageExperienceCount param (6 by default) in the inner page (experience) we display the all */}} | ||
| {{ $totalCount := .Site.Params.homepageExperienceCount }} | ||
|
|
||
| {{ if not .IsHome }} | ||
| {{ $totalCount = len $xp }} | ||
| {{ end }} | ||
| {{ range first 6 $xp }} | ||
| <div class="experience"> | ||
| <div class="experience__date">{{ .Params.duration }}</div> | ||
| <div class="experience__title">{{ .Params.jobTitle }}</div> | ||
| <div class="experience__company">{{ .Params.company }}. <span class="experience__location">{{ .Params.location }}</span></div> | ||
| <a href="{{.Permalink}}"> | ||
| {{/* The context, ".", is now each one of the pages as it goes | ||
| through the loop */}} | ||
| <div class="experience__date">{{ .Params.duration }}</div> | ||
| <div class="experience__title">{{ .Params.jobTitle }}</div> | ||
| <div class="experience__company">{{ .Params.company }}. <span class="experience__location">{{ | ||
| .Params.location }}</span></div> | ||
| </a> | ||
| </div> | ||
| {{ end }} | ||
| {{ if gt $xpCount 6 }} | ||
| <div class="all-experience-container"> | ||
| {{ $xpExtra := sub $xpCount 6 }} | ||
| <em>And {{ $xpExtra }} more</em><br/> | ||
| <a href="{{ absURL "experience" }} " title="See additional {{ $xpExtra }} experience items" class="btn btn-primary btn-all-experience"> | ||
| <i class="{{ .Site.Data.homepage.experience.button3.icon }}"></i> | ||
| {{ .Site.Data.homepage.experience.button3.btnText }} | ||
| </a> | ||
| </div> | ||
| {{ if gt $xpCount $totalCount }} | ||
| <div class="all-experience-container"> | ||
| {{ $xpExtra := sub $xpCount $totalCount }} | ||
| <em>And {{ $xpExtra }} more</em><br /> | ||
| <a href="{{ absURL "experience" }} " title=" See additional {{ $xpExtra }} experience items" | ||
| class="btn btn-primary btn-all-experience"> | ||
| <i class="{{ .Site.Data.homepage.experience.button3.icon }}"></i> | ||
| {{ .Site.Data.homepage.experience.button3.btnText }} | ||
| </a> | ||
| </div> | ||
| {{ end }} | ||
| </div> | ||
| <div class="col-12 col-md-6"> | ||
| {{ partial "experience-description.html" . }} | ||
| {{ partial "experience-description.html" . }} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </section> | ||
| {{ end }} | ||
| {{ end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,3 +45,7 @@ | |
| </nav> | ||
| </div> | ||
| </header> | ||
|
|
||
| {{ if not .IsHome }} | ||
| {{ partial "breadcrumb.html" . }} | ||
| {{ end }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80262abThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Successfully deployed to the following URLs:
adrianmoreno-info – ./
adrianmoreno-info-git-master-zetxek.vercel.app
adrianmoreno-info-zetxek.vercel.app
adrianmoreno-info.vercel.app
www.adrianmoreno.info
adrianmoreno.info