From 436746b1701f5983c17f8c90ff2b4445c176678c Mon Sep 17 00:00:00 2001 From: Jason Tipton Date: Tue, 30 Jun 2020 19:39:47 -0800 Subject: [PATCH 1/5] Allow a shorter 'nickname' for the initial home greeting (#23) --- exampleSite/config.yaml | 1 + layouts/partials/home.html | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/exampleSite/config.yaml b/exampleSite/config.yaml index 8132b96..2cd6e1d 100644 --- a/exampleSite/config.yaml +++ b/exampleSite/config.yaml @@ -41,6 +41,7 @@ params: # some information about you author: name: "Jane Doe" + nickname: "Jane" image: "images/avatar.png" # give your some contact information. they will be used in the footer contactInfo: diff --git a/layouts/partials/home.html b/layouts/partials/home.html index d87a3fb..90e3dd7 100644 --- a/layouts/partials/home.html +++ b/layouts/partials/home.html @@ -7,7 +7,14 @@ -

Hi, I am {{ if .Site.Params.author.name }}{{ .Site.Params.author.name }}{{ else }}Jane Doe{{ end }} +

Hi, I am + {{ if .Site.Params.author.nickname }} + {{ .Site.Params.author.nickname }} + {{ else if .Site.Params.author.name }} + {{ .Site.Params.author.name }} + {{ else }} + Jane Doe + {{ end }}

diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html index 253c54d..00570c7 100644 --- a/layouts/partials/navbar.html +++ b/layouts/partials/navbar.html @@ -21,7 +21,7 @@ {{- if .Site.Data.sections }} {{- range sort .Site.Data.sections "section.weight" }} - {{ if .section.showOnNavbar }} + {{ if (and .section.enable .section.showOnNavbar) }} From 2936164cc16e4cd05b13795dec7193dade089761 Mon Sep 17 00:00:00 2001 From: Jason Tipton Date: Thu, 2 Jul 2020 19:57:27 -0800 Subject: [PATCH 3/5] Make soft skill's color configurable + add 'sky' and 'orange' colors (#22) * Add about circle colors for 'sky' and 'orange' * Make color configurable Co-authored-by: hossainemruz --- exampleSite/data/sections/about.yaml | 17 +++++++++++++++-- layouts/partials/progress/soft-skills.html | 16 ++++++++++++++-- static/assets/css/about.css | 10 +++++++++- 3 files changed, 38 insertions(+), 5 deletions(-) diff --git a/exampleSite/data/sections/about.yaml b/exampleSite/data/sections/about.yaml index 8ae9359..048bff1 100644 --- a/exampleSite/data/sections/about.yaml +++ b/exampleSite/data/sections/about.yaml @@ -47,7 +47,7 @@ socialLinks: # your soft skills # give the percentage between 50 to 100 with 5 intervals. -# currently supported color: blue, yellow, pink, green +# currently supported colors: blue, yellow, pink, green, sky, orange softSkills: - name: Leadership percentage: 85 @@ -60,4 +60,17 @@ softSkills: color: pink - name: Hard Working percentage: 85 - color: green \ No newline at end of file + color: green +- name: Fast Learner + percentage: 85 + color: sky +- name: Problem Solving + percentage: 85 + color: orange +# you can also provide color code instead of pre-defined color name +# - name: Example 1 +# percentage: 75 +# color: "#00adb5" +# - name: Example 2 +# percentage: 65 +# color: "#8b8383" diff --git a/layouts/partials/progress/soft-skills.html b/layouts/partials/progress/soft-skills.html index 4c32067..cbdc0ae 100644 --- a/layouts/partials/progress/soft-skills.html +++ b/layouts/partials/progress/soft-skills.html @@ -1,12 +1,24 @@
-
+ {{ $predefinedColor:= true}} + {{ if hasPrefix .color "#"}} + {{ $predefinedColor = false }} + {{ end }} +
- +
{{ .name }}
diff --git a/static/assets/css/about.css b/static/assets/css/about.css index a125768..96ce207 100644 --- a/static/assets/css/about.css +++ b/static/assets/css/about.css @@ -100,7 +100,7 @@ } .circular-progress.yellow .circular-progress-bar { - border-color: #ffc212; + border-color: #eebb4d; } .circular-progress.pink .circular-progress-bar { @@ -111,6 +111,14 @@ border-color: #2dca73; } +.circular-progress.sky .circular-progress-bar { + border-color: #00c9e3; +} + +.circular-progress.orange .circular-progress-bar { + border-color: #ff7c7c; +} + .circular-progress-percentage-50 { animation: circular-loading-50 0s linear forwards 1.8s; } From a83b1c5658c5bcb3f82a794b249cda8bd58e1550 Mon Sep 17 00:00:00 2001 From: Jason Tipton Date: Fri, 3 Jul 2020 11:04:30 -0800 Subject: [PATCH 4/5] Allow section titles to be hidden inline (#24) * Allow section titles to be hidden within the section themselves * Show sections in footer to match navbar --- exampleSite/data/sections/achievements.yaml | 2 ++ exampleSite/data/sections/experiences.yaml | 3 ++- exampleSite/data/sections/projects.yaml | 2 ++ exampleSite/data/sections/recent-posts.yaml | 2 ++ exampleSite/data/sections/skills.yaml | 2 ++ layouts/partials/achievements.html | 4 +++- layouts/partials/experiences.html | 4 +++- layouts/partials/footer.html | 2 +- layouts/partials/navbar.html | 2 +- layouts/partials/projects.html | 4 +++- layouts/partials/recent-posts.html | 4 +++- layouts/partials/skills.html | 4 +++- 12 files changed, 27 insertions(+), 8 deletions(-) diff --git a/exampleSite/data/sections/achievements.yaml b/exampleSite/data/sections/achievements.yaml index 5877753..eee213b 100644 --- a/exampleSite/data/sections/achievements.yaml +++ b/exampleSite/data/sections/achievements.yaml @@ -4,6 +4,8 @@ section: enable: true weight: 6 showOnNavbar: true + # Can optionally hide the title in sections + # hideTitle: true # Your achievements achievements achievements: diff --git a/exampleSite/data/sections/experiences.yaml b/exampleSite/data/sections/experiences.yaml index 3ed8349..b5366d6 100644 --- a/exampleSite/data/sections/experiences.yaml +++ b/exampleSite/data/sections/experiences.yaml @@ -4,7 +4,8 @@ section: enable: true weight: 3 showOnNavbar: true - + # Can optionally hide the title in sections + # hideTitle: true # Your experiences experiences: diff --git a/exampleSite/data/sections/projects.yaml b/exampleSite/data/sections/projects.yaml index 0d84565..ea0c02e 100644 --- a/exampleSite/data/sections/projects.yaml +++ b/exampleSite/data/sections/projects.yaml @@ -4,6 +4,8 @@ section: enable: true weight: 4 showOnNavbar: true + # Can optionally hide the title in sections + # hideTitle: true # filter buttons buttons: diff --git a/exampleSite/data/sections/recent-posts.yaml b/exampleSite/data/sections/recent-posts.yaml index 9fb496a..357e99f 100644 --- a/exampleSite/data/sections/recent-posts.yaml +++ b/exampleSite/data/sections/recent-posts.yaml @@ -4,5 +4,7 @@ section: enable: true weight: 5 showOnNavbar: true + # Can optionally hide the title in sections + # hideTitle: true # no other configuration is required diff --git a/exampleSite/data/sections/skills.yaml b/exampleSite/data/sections/skills.yaml index 05730d8..8a8aaac 100644 --- a/exampleSite/data/sections/skills.yaml +++ b/exampleSite/data/sections/skills.yaml @@ -4,6 +4,8 @@ section: enable: true weight: 2 showOnNavbar: true + # Can optionally hide the title in sections + # hideTitle: true # Your Skills. # Give a summary of you each skill in the summary section. diff --git a/layouts/partials/achievements.html b/layouts/partials/achievements.html index 1805631..75995a9 100644 --- a/layouts/partials/achievements.html +++ b/layouts/partials/achievements.html @@ -1,5 +1,7 @@
-

{{ .section.name }}

+ {{ if not (.section.hideTitle) }} +

{{ .section.name }}

+ {{ end }}
diff --git a/layouts/partials/experiences.html b/layouts/partials/experiences.html index 5c63d14..d63b319 100644 --- a/layouts/partials/experiences.html +++ b/layouts/partials/experiences.html @@ -1,5 +1,7 @@
-

{{ .section.name }}

+ {{ if not (.section.hideTitle) }} +

{{ .section.name }}

+ {{ end }}
{{ $totalExperiences:= len .experiences }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 8c8649a..77693ce 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -6,7 +6,7 @@ {{ if .Site.Data.sections }}
    {{- range sort .Site.Data.sections "section.weight" }} - {{ if .section.enable }} + {{ if and (.section.enable) (.section.showOnNavbar)}} diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html index 00570c7..dc1b872 100644 --- a/layouts/partials/navbar.html +++ b/layouts/partials/navbar.html @@ -21,7 +21,7 @@ {{- if .Site.Data.sections }} {{- range sort .Site.Data.sections "section.weight" }} - {{ if (and .section.enable .section.showOnNavbar) }} + {{ if and (.section.enable) (.section.showOnNavbar)}} diff --git a/layouts/partials/projects.html b/layouts/partials/projects.html index e8a9f35..fc23c72 100644 --- a/layouts/partials/projects.html +++ b/layouts/partials/projects.html @@ -1,5 +1,7 @@
    -

    {{ .section.name }}

    + {{ if not (.section.hideTitle) }} +

    {{ .section.name }}

    + {{ end }}
    {{ range .buttons }} diff --git a/layouts/partials/recent-posts.html b/layouts/partials/recent-posts.html index 03142fc..2d0cc87 100644 --- a/layouts/partials/recent-posts.html +++ b/layouts/partials/recent-posts.html @@ -1,5 +1,7 @@
    -

    {{ .section.name }}

    + {{ if not (.section.hideTitle) }} +

    {{ .section.name }}

    + {{ end }}
    {{ range first 3 (where site.RegularPages.ByDate.Reverse "Type" "in" site.Params.mainSections )}} diff --git a/layouts/partials/skills.html b/layouts/partials/skills.html index 5fab89a..8790be6 100644 --- a/layouts/partials/skills.html +++ b/layouts/partials/skills.html @@ -1,5 +1,7 @@
    -

    {{ .section.name }}

    + {{ if not (.section.hideTitle) }} +

    {{ .section.name }}

    + {{ end }}
    {{ range .skills }} From 26ef9aa35129c8e03b3625640c5007461daf81ea Mon Sep 17 00:00:00 2001 From: "Md. Emruz Hossain" Date: Sat, 4 Jul 2020 02:18:01 +0600 Subject: [PATCH 5/5] Don't open custom menus in a new tab (#27) --- layouts/partials/navbar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html index dc1b872..fba1b31 100644 --- a/layouts/partials/navbar.html +++ b/layouts/partials/navbar.html @@ -44,7 +44,7 @@ {{ end }} {{ range site.Params.customMenus }} {{ end }}