diff options
| author | Hadi Sinaee <sinaee@cs.ubc.ca> | 2021-06-13 23:11:58 +0300 |
|---|---|---|
| committer | Hadi Sinaee <sinaee@cs.ubc.ca> | 2021-06-13 23:11:58 +0300 |
| commit | 1a34ce7e6145e5bca45211e673646bd84a7f0f40 (patch) | |
| tree | c355443136660649fc9726948dd352f03399f910 | |
| parent | 6770c86af2a4845e6a910fe7d0436bffcbca658b (diff) | |
| parent | e9616f412d31fcea232ff962014550317d62d834 (diff) | |
Merge branch 'develop'
| -rw-r--r-- | exampleSite/content/about/_index.md | 1 | ||||
| -rw-r--r-- | exampleSite/content/projects/proj1.md | 2 | ||||
| -rw-r--r-- | layouts/_default/baseof.html | 5 | ||||
| -rw-r--r-- | layouts/partials/about/introduction.html | 16 | ||||
| -rw-r--r-- | layouts/partials/projects/projects.html | 5 |
5 files changed, 20 insertions, 9 deletions
diff --git a/exampleSite/content/about/_index.md b/exampleSite/content/about/_index.md index 43a2218..1ef7274 100644 --- a/exampleSite/content/about/_index.md +++ b/exampleSite/content/about/_index.md @@ -12,6 +12,7 @@ socials: twitter: "HadiSinaee" github: "hadisinaee" facebook: "hadisinaee" + linkedin: "hadisinaee" twitch: "hadisinaee" google_scholar: "hadisinaee" diff --git a/exampleSite/content/projects/proj1.md b/exampleSite/content/projects/proj1.md index f0b8759..1ce3d59 100644 --- a/exampleSite/content/projects/proj1.md +++ b/exampleSite/content/projects/proj1.md @@ -5,6 +5,8 @@ date: "2018-05-18" links: website: 'https://github.com/hadisinaee/avicenna' + alias: link_name_here + --- [See the wiki page for tutorial!](https://github.com/hadisinaee/avicenna/wiki)
\ No newline at end of file diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 2ae78d5..ef94fe9 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,10 +1,9 @@ <!DOCTYPE html> -<html> + +<html lang="{{ with .Site.LanguageCode }}{{.}}{{ else }}en-us{{end}}"> {{- partial "core/head.html" . -}} <body class="container d-flex flex-column min-vh-100"> - - {{- block "main" . }}{{- end }} {{- partial "core/footer.html" . -}} diff --git a/layouts/partials/about/introduction.html b/layouts/partials/about/introduction.html index 5eaab79..89f617c 100644 --- a/layouts/partials/about/introduction.html +++ b/layouts/partials/about/introduction.html @@ -43,36 +43,42 @@ {{ $twitter := index $aboutPage.Params.socials "twitter"}} {{ $twitch := index $aboutPage.Params.socials "twitch"}} {{ $github := index $aboutPage.Params.socials "github"}} + {{ $linkedin := index $aboutPage.Params.socials "linkedin"}} {{ $cv := $aboutPage.Params.cv }} {{if $google_scholar}} - <a class="main_color" href='https://scholar.google.com/{{$google_scholar}}' target="_blank"> + <a class="main_color" rel="me" href='https://scholar.google.com/{{$google_scholar}}' target="_blank"> <i class="ai ai-2x ai-google-scholar academic_icons_customize"></i> </a> {{end}} {{ if $github }} - <a class="main_color" href='https://github.com/{{$github}}' target="_blank"> + <a class="main_color" rel="me" href='https://github.com/{{$github}}' target="_blank"> <i data-feather="github"></i> </a> {{end}} {{ if $twitter }} - <a class="main_color" href='https://twitter.com/{{$twitter}}' target="_blank"> + <a class="main_color" rel="me" href='https://twitter.com/{{$twitter}}' target="_blank"> <i data-feather="twitter"></i> </a> {{end}} {{ if $facebook }} - <a class="main_color" href='https://facebook.com/{{$facebook}}' target="_blank"> + <a class="main_color" rel="me" href='https://facebook.com/{{$facebook}}' target="_blank"> <i data-feather="facebook"></i> </a> {{end}} + {{ if $linkedin }} + <a class="main_color" rel="me" href='https://linkedin.com/in/{{$linkedin}}' target="_blank"> + <i data-feather="linkedin"></i> + </a> + {{end}} {{ if $twitch }} - <a class="main_color" href='https://twitch.com/{{$twitch}}' target="_blank"> + <a class="main_color" rel="me" href='https://twitch.com/{{$twitch}}' target="_blank"> <i data-feather="twitch"></i> </a> {{end}} diff --git a/layouts/partials/projects/projects.html b/layouts/partials/projects/projects.html index 7cc04a5..5711eeb 100644 --- a/layouts/partials/projects/projects.html +++ b/layouts/partials/projects/projects.html @@ -18,7 +18,10 @@ {{ if $links }} <div class="section-2 w-100"> {{ if $links.website }} - <a class="main_color text-decoration-none rounded " href="{{$links.git}}" target="_blank">website</a> + <a class="main_color text-decoration-none rounded " href="{{$links.website}}" target="_blank"> + {{if $links.alias}} {{$links.alias}} {{else}} website {{end}} + + </a> {{end}} </div> {{end}} |