Merge branch 'main' into main

This commit is contained in:
Emruz Hossain 2021-05-17 23:06:58 +06:00 committed by GitHub
commit 39812a1798
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 86 additions and 23 deletions

View file

@ -7,10 +7,12 @@
{{ $disclaimerEnabled := site.Params.footer.disclaimer.enable | default false }} {{ $disclaimerEnabled := site.Params.footer.disclaimer.enable | default false }}
{{/* Keep backward compatibility for the newsletter function */}} {{/* Keep backward compatibility for the newsletter function */}}
{{ if site.Params.newsletter.enable }} {{ if site.Params.newsletter }}
{{ $newsletterEnabled = true }} {{ if site.Params.newsletter.enable }}
{{ else }} {{ $newsletterEnabled = true }}
{{ $newsletterEnabled = false }} {{ else }}
{{ $newsletterEnabled = false }}
{{ end }}
{{ end }} {{ end }}
{{ if $footerEnabled }} {{ if $footerEnabled }}
@ -89,26 +91,46 @@
</ul> </ul>
</div> </div>
{{ end }} {{ end }}
<!-------------- Newsletter --------------->
{{ if $newsletterEnabled }} {{ if $newsletterEnabled }}
<div class="col-md-4 col-sm-12"> {{ $provider := site.Params.footer.newsletter.provider }}
<!-- <h5>Newsletter</h5> --> <div class="col-md-4 col-sm-12">
<p>{{ i18n "newsletter_text" }}</p> <p>{{ i18n "newsletter_text" }}</p>
<form> {{ if and (eq $provider "mailchimp") site.Params.footer.newsletter.mailchimpURL }} <!-- mailchimp -->
<div class="form-group"> <form
<input action="{{ site.Params.footer.newsletter.mailchimpURL }}"
type="email" method="post"
class="form-control" id="mc-embedded-subscribe-form"
id="exampleInputEmail1" name="mc-embedded-subscribe-form"
aria-describedby="emailHelp" class="validate"
placeholder="{{ i18n "newsletter_input_placeholder" }}" target="_blank"
/> novalidate >
<small id="emailHelp" class="form-text text-muted" <div class="form-group">
>{{ i18n "newsletter_warning" }}</small <input
> type="email"
</div> class="form-control"
<button type="submit" class="btn btn-info">{{ i18n "submit" }}</button> id="mce-EMAIL"
</form> name="EMAIL"
</div> aria-describedby="emailHelp"
placeholder="{{ i18n "newsletter_input_placeholder" }}"
/>
<small id="emailHelp" class="form-text text-muted"
>{{ i18n "newsletter_warning" }}</small
>
</div>
<button type="submit" class="btn btn-info">{{ i18n "submit" }}</button>
</form>
{{ else }}
<!-- a dummy form -->
<form>
<div class="form-group">
<input type="email" class="form-control" id="exampleInputEmail1" aria-describedby="emailHelp" placeholder="{{ i18n "newsletter_input_placeholder" }}"/>
<small id="emailHelp" class="form-text text-muted">{{ i18n "newsletter_warning" }}</small>
</div>
<button type="submit" class="btn btn-info">{{ i18n "submit" }}</button>
</form>
{{ end }}
</div>
{{ end }} {{ end }}
</div> </div>
</div> </div>

View file

@ -0,0 +1,35 @@
<div class="col-6 col-lg-4 p-2">
{{ if eq .type "certification" }}
{{/* Verifiable certificate badge from https://www.credly.com */}}
<div class="">
<a href="{{ .url }}" target="_blank" >
<img src="{{ .badge }}" alt="{{ .name }}" />
</a>
</div>
{{ else if eq .type "soft-skill-indicator" }}
{{/* Circular bar indicating the level of expertise in a skill */}}
{{ $predefinedColor:= true}}
{{ if hasPrefix .color "#"}}
{{ $predefinedColor = false }}
{{ end }}
<div class="circular-progress {{if $predefinedColor}}{{ .color }}{{end}}">
<span class="circular-progress-left">
<span
class="circular-progress-bar circular-progress-percentage-{{ .percentage }}"
{{ if not $predefinedColor }}
style="border-color: {{.color}};"
{{ end }}
></span>
</span>
<span class="circular-progress-right">
<span
class="circular-progress-bar"
{{ if not $predefinedColor }}
style="border-color: {{.color}};"
{{ end }}
></span>
</span>
<div class="circular-progress-value">{{ .name }}</div>
</div>
{{ end }}
</div>

View file

@ -1,3 +1,4 @@
{{/* TODO: Delete this file in version v4+ */}}
<div class="col-6 col-lg-4 p-2"> <div class="col-6 col-lg-4 p-2">
{{ $predefinedColor:= true}} {{ $predefinedColor:= true}}
{{ if hasPrefix .color "#"}} {{ if hasPrefix .color "#"}}

View file

@ -48,6 +48,11 @@
<!-- soft skills circular-progressbar --> <!-- soft skills circular-progressbar -->
<div class="col-sm-6 pt-5 pl-md-4 pl-sm-3 pt-sm-0"> <div class="col-sm-6 pt-5 pl-md-4 pl-sm-3 pt-sm-0">
<div class="row"> <div class="row">
{{ range .badges }}
{{ partial "misc/badge.html" . }}
{{ end }}
<!-- TODO: Remove this part in version v4+ -->
<!-- Keep backward compatibility with old configuration -->
{{ range .softSkills }} {{ range .softSkills }}
{{ partial "misc/soft-skills.html" . }} {{ partial "misc/soft-skills.html" . }}
{{ end }} {{ end }}