Skip to content

Commit

Permalink
Merge remote-tracking branch 'hugo-toha/main' into statcounter
Browse files Browse the repository at this point in the history
  • Loading branch information
davidgs committed Oct 18, 2024
2 parents 95cc59d + bc67ca1 commit 934c85c
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/autoprefixer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout to latest commit
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.1

- name: Setup Node
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.1

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
# checkout to the commit that has been pushed
- uses: actions/checkout@v4.1.7
- uses: actions/checkout@v4.2.1

- name: Setup Node
uses: actions/setup-node@v4
Expand All @@ -35,7 +35,7 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4.1.7
- uses: actions/checkout@v4.2.1

- name: Setup Node
uses: actions/setup-node@v4
Expand Down Expand Up @@ -78,6 +78,6 @@ jobs:
runs-on: ubuntu-latest
steps:
# checkout to latest commit
- uses: actions/checkout@v4.1.7
- uses: actions/checkout@v4.2.1
# run markdown linter
- uses: gaurav-nelson/[email protected]
9 changes: 9 additions & 0 deletions assets/styles/components/cards.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
box-shadow: $box-shadow;
border: 1px solid get-light-color('bg-primary');
@include transition();
.card-img-top {
transform: scale(1.2);
object-fit: cover;
@include transition();
}
}

.card-head {
Expand All @@ -17,6 +22,10 @@
overflow: hidden;
}

.card-title {
font-size: large;
}

.card-body {
text-align: left;
}
Expand Down
4 changes: 4 additions & 0 deletions i18n/zh-cn.toml
Original file line number Diff line number Diff line change
Expand Up @@ -124,3 +124,7 @@ other = "免责声明"

[search]
other = "搜索"

[minute]
one = "分钟"
other = "分钟"
4 changes: 4 additions & 0 deletions i18n/zh-tw.toml
Original file line number Diff line number Diff line change
Expand Up @@ -124,3 +124,7 @@ other = "免責聲明"

[search]
other = "搜尋"

[minute]
one = "分鐘"
other = "分鐘"
56 changes: 35 additions & 21 deletions layouts/partials/cards/project.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,48 @@
>
<div class="card mt-1">
<div class="card">
<a class="card-header" href="{{ if .repo }}{{ .repo }}{{ else if .url }}{{ .url }}{{ else }}javascript:void(0){{ end }}" {{ if or .repo .url }}target="_blank" rel="noopener"{{ end }}>
<div>
<div class="d-flex">
{{ if .logo }}
<a href="{{ if .repo }}{{ .repo }}{{ else if .url }}{{ .url }}{{ else }}javascript:void(0){{ end }}" {{ if or .repo .url }}target="_blank" rel="noopener"{{ end }}>
{{ if .image }}
<div class="card-head">
{{ $imageImage:= resources.Get .image}}
{{ if $imageImage }}
{{/* svg don't support "Fit" operation */}}
{{ if ne $imageImage.MediaType.SubType "svg" }}
{{ $imageImage = $imageImage.Fit "1000x1000" }}
{{ end }}
<img class="card-img-top" src="{{ $imageImage.RelPermalink }}" alt="{{ .name }}" />
{{ end }}
</div>
{{ end }}
<div class="card-header">
<div>
<div class="d-flex">
{{ if .logo }}

{{ if eq (len (findRE ".*/.*" .logo) ) 0 }}
{{ if eq (len (findRE ".*/.*" .logo) ) 0 }}

<i style="padding-right: 0.25em" class="{{.logo}} h4"></i>
<i style="padding-right: 0.25em" class="{{.logo}} h4"></i>

{{ else }}
{{ else }}

{{ $logoImage:= resources.Get .logo}}
{{ if $logoImage }}
{{/* svg don't support "Fit" operation */}}
{{ if ne $logoImage.MediaType.SubType "svg" }}
{{ $logoImage = $logoImage.Fit "24x24" }}
{{ $logoImage:= resources.Get .logo}}
{{ if $logoImage }}
{{/* svg don't support "Fit" operation */}}
{{ if ne $logoImage.MediaType.SubType "svg" }}
{{ $logoImage = $logoImage.Fit "24x24" }}
{{ end }}
<img class="card-img-xs" src="{{ $logoImage.RelPermalink }}" alt="{{ .name }}" />
{{ end }}
<img class="card-img-xs" src="{{ $logoImage.RelPermalink }}" alt="{{ .name }}" />
{{ end }}
{{ end }}

{{ end }}

<h5 class="card-title mb-0">{{ .name }}</h5>
</div>
<div class="sub-title">
<span>{{ .role }}</span>
<span>{{ .timeline }}</span>
{{ end }}

<h5 class="card-title mb-0">{{ .name }}</h5>
</div>
<div class="sub-title">
<span>{{ .role }}</span>
<span>{{ .timeline }}</span>
</div>
</div>
</div>
</a>
Expand Down

0 comments on commit 934c85c

Please sign in to comment.