Multiple jobs in one company #163
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
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -1,130 +1,76 @@ | ||||||||||||||
| {{ if .Site.Params.experience.enable | default false }} | ||||||||||||||
| <section id="experience" class="py-5"> | ||||||||||||||
| <div class="container"> | ||||||||||||||
| <h3 class="text-center">{{ .Site.Params.experience.title | default "Experience" }}</h3> | ||||||||||||||
| <div class="row justify-content-center"> | ||||||||||||||
| <div class="col-sm-12 col-md-8 col-lg-8 py-5"> | ||||||||||||||
| <div class="experience-container px-3 pt-2"> | ||||||||||||||
| <ul class="nav nav-pills mb-3 bg-transparent primary-font" id="pills-tab" role="tablist"> | ||||||||||||||
| {{ range $indexCompany, $company := .Site.Params.experience.companies }} | ||||||||||||||
| <li class="nav-item px-1 bg-transparent" role="presentation"> | ||||||||||||||
| <div | ||||||||||||||
| class="nav-link bg-transparent{{ if (eq $indexCompany 0) }} active{{end}}" | ||||||||||||||
| aria-selected="true" | ||||||||||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||||||||||
| role="tab" | ||||||||||||||
| data-bs-toggle="pill" | ||||||||||||||
| id='{{ replace .company " " "-" }}-tab' | ||||||||||||||
| data-bs-target='#pills-{{ replace .company " " "-" }}' | ||||||||||||||
| aria-controls='{{ replace .company " " "-" }}' | ||||||||||||||
|
Comment on lines
+16
to
+18
There was a problem hiding this comment. Define a variable to avoid code duplicity:
Suggested change
Reference: https://gohugo.io/templates/introduction/#variables |
||||||||||||||
| > | ||||||||||||||
| {{ .company }} | ||||||||||||||
| </div> | ||||||||||||||
| </li> | ||||||||||||||
| {{ end }} | ||||||||||||||
| </ul> | ||||||||||||||
| <div class="tab-content pb-5 pt-2 bg-transparent primary-font" id="pills-tabContent"> | ||||||||||||||
| {{ range $indexCompany, $company := .Site.Params.experience.companies }} | ||||||||||||||
| <div | ||||||||||||||
| class="tab-pane fade bg-transparent{{ if (eq $indexCompany 0) }} show active{{end}}" | ||||||||||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||||||||||
| role="tabpanel" | ||||||||||||||
| id='pills-{{ replace .company " " "-" }}' | ||||||||||||||
| aria-labelledby='pills-{{ replace .company " " "-" }}-tab' | ||||||||||||||
|
Comment on lines
+30
to
+31
There was a problem hiding this comment.
Suggested change
|
||||||||||||||
| > | ||||||||||||||
| {{ range $indexJob, $job := .jobs }} | ||||||||||||||
| <div class="job-container{{if (eq $indexJob 0) }}-first{{end}}"> | ||||||||||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||||||||||
| <div> | ||||||||||||||
| <span class="h4">{{ .job }}</span> | ||||||||||||||
| <small>-</small> | ||||||||||||||
| <a href="{{ $company.companyUrl }}" target="_blank">{{ $company.company }}</a> | ||||||||||||||
| <div class="pb-1"> | ||||||||||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||||||||||
| <small>{{ .date }}</small> | ||||||||||||||
| {{ if .info.enable | default true }} | ||||||||||||||
| <span class="p-2"> | ||||||||||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||||||||||
| <span | ||||||||||||||
| style="cursor: pointer;" | ||||||||||||||
| data-bs-toggle="tooltip" | ||||||||||||||
| data-bs-placement="top" | ||||||||||||||
| data-bs-original-title={{ .info.content | default (print "Working as a " .job " at " $company.company ) }} | ||||||||||||||
|
There was a problem hiding this comment. This needs to be fixed in order to keep previous behaviour (show
Suggested change
|
||||||||||||||
| > | ||||||||||||||
| <i class="fas fa-info-circle fa-xs"></i> | ||||||||||||||
| </span> | ||||||||||||||
| </span> | ||||||||||||||
| {{ end }} | ||||||||||||||
| </div> | ||||||||||||||
|
|
||||||||||||||
| {{ if .featuredLink.enable | default false }} | ||||||||||||||
| <div class="py-2 featuredLink"> | ||||||||||||||
| <a class="p-2 px-4 btn btn-outline-primary btn-sm" href={{ .featuredLink.url | default "#" }} target="_blank"> | ||||||||||||||
| {{ .featuredLink.name | default "Featured Link" }} | ||||||||||||||
| </a> | ||||||||||||||
| </div> | ||||||||||||||
| {{ end }} | ||||||||||||||
| </div> | ||||||||||||||
|
|
||||||||||||||
| {{ .content | markdownify}} | ||||||||||||||
|
Comment on lines
+63
to
+64
There was a problem hiding this comment. I think the code in the main branch has a bug related to this. The 1st tab (current job) doesn't include the top padding before the job content, whereas the rest include it. I think the intention was to always include this padding.
Suggested change
No padding
Padding
|
||||||||||||||
| </div> | ||||||||||||||
| {{ end }} | ||||||||||||||
| </div> | ||||||||||||||
|
|
||||||||||||||
| {{ end }} | ||||||||||||||
| </div> | ||||||||||||||
| </div> | ||||||||||||||
| </div> | ||||||||||||||
| </div> | ||||||||||||||
| </div> | ||||||||||||||
| </section> | ||||||||||||||
| {{ 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There 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.