Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fix(menu): hide divider when no menus #307

Merged
merged 11 commits into from
May 4, 2020
Merged

fix(menu): hide divider when no menus #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
967f707
Release v0.2.2 #286 from dillonzq/develop
dillonzq Apr 29, 2020
64ee4e6
Merge branch 'develop'
dillonzq Apr 29, 2020
9816cff
Merge branch 'develop'
dillonzq Apr 29, 2020
971e713
Merge branch 'develop'
dillonzq Apr 29, 2020
f8ab15b
Merge branch 'develop'
dillonzq Apr 29, 2020
1e7dab4
Merge branch 'develop'
dillonzq Apr 29, 2020
63d04c7
Merge pull request #295 from dillonzq/develop
dillonzq Apr 30, 2020
bbea71f
Merge branch 'develop'
dillonzq Apr 30, 2020
e3d774f
Merge pull request #303 from dillonzq/develop
dillonzq May 1, 2020
53315de
fix(menu): hide divider and avatar link if no menus
May 2, 2020
d8f5dfc
Merge branch 'develop' into fix/menus_disabled
dillonzq May 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions assets/css/_page/_home.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
@include border-radius(100%);
@include box-shadow(0 0 0 .3618em rgba(0, 0, 0, .05));
@include transition(all 0.4s ease);
}

a img {
cursor: pointer;

&:hover {
Expand Down
4 changes: 3 additions & 1 deletion layouts/partials/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@
{{- .Pre | safeHTML }} {{ .Name }} {{ .Post | safeHTML -}}
</a>
{{- end -}}
<span class="menu-item delimiter"></span>
{{- if .Site.Menus.main -}}
<span class="menu-item delimiter"></span>
{{- end -}}
{{- if .Site.IsMultiLingual -}}
<a href="javascript:void(0);" class="menu-item language" title="{{ T "selectLanguage" }}">
{{- .Language.LanguageName -}}
Expand Down
18 changes: 14 additions & 4 deletions layouts/partials/home/profile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,21 @@
{{- with .Site.Params.home.profile.gravatarEmail -}}
{{- $avatar = md5 . | printf "https://www.gravatar.com/avatar/%s?s=240&d=mp" -}}
{{- end -}}
{{- with $avatar -}}
{{- if $avatar -}}
<div class="home-avatar">
<a href="/posts" title="{{ T `home` }}">
{{- dict "src" . "alt" (T "home") | partial "plugin/image.html" -}}
</a>
{{- $firstMenu := "" -}}
{{- if .Site.Menus.main -}}
{{- range first 1 $.Site.Menus.main -}}
{{- $firstMenu = . -}}
{{- end -}}
{{- end -}}
{{- with $firstMenu -}}
<a href="{{- .URL -}}" title="{{- .Name -}}">
{{- dict "src" $avatar "alt" .Name | partial "plugin/image.html" -}}
</a>
{{- else -}}
{{- dict "src" $avatar "alt" " " | partial "plugin/image.html" -}}
{{- end -}}
</div>
{{- end -}}

Expand Down