diff --git a/assets/css/style.css b/assets/css/style.css
index c602870..9baf9e3 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -568,7 +568,8 @@ a:hover {
.bg-2 {
background-repeat: no-repeat;
background-size: cover;
- background-attachment: fixed;
+ /* background-attachment: fixed; */
+ background-position: center;
}
.hero-area {
diff --git a/assets/sass/custom.scss b/assets/sass/custom.scss
index 49996e6..1d3128e 100644
--- a/assets/sass/custom.scss
+++ b/assets/sass/custom.scss
@@ -77,3 +77,10 @@ p, h3, h4 {
// width: auto;
// height: auto;
}
+
+#counter {
+ background-position: center;
+ background-repeat: no-repeat;
+ // background-size: auto;
+ // background-size: contain;
+}
diff --git a/config.toml b/config.toml
index 89ba559..f0a8183 100644
--- a/config.toml
+++ b/config.toml
@@ -48,7 +48,8 @@ custom_css = ["css/custom.css"]
# Banner Section
[params.banner]
enable = true
- bgImage = "images/slider/hero-area.webp"
+ # bgImage = "images/slider/hero-area.webp"
+ bgImage = "images/slider/hero-area.jpg"
# bgImage = "images/slider/eagle.png"
heading = "Ataraxy"
content= "NA, MP-focused clan that is currently looking for friendly and active clan members to play together with."
@@ -59,7 +60,7 @@ custom_css = ["css/custom.css"]
# counter
[params.counter]
enable = true
- bgImage = "images/backgrounds/codm-reddit-banner.webp"
+ bgImage = "images/backgrounds/codm-reddit-banner.jpg"
[[params.counter.counterItem]]
title = "Season 2 Ranking"
icon = "tf-ion-trophy"
diff --git a/data/team.yml b/data/team.yml
index f9bb261..ee17607 100644
--- a/data/team.yml
+++ b/data/team.yml
@@ -2,17 +2,17 @@ enable : true
heading : Our
headingSpan : Team
teamMember :
- - image : images/team/josh.webp
+ - imageName : josh
name : JoshuaAustin07
designation : Clan Master
description : Oversees entire clan's operations. Has final say on all major clan decisions.
- - image : images/team/bakkuteh.webp
+ - imageName : bakkuteh
name : bakkuteh
designation : Vice Master
description : In charge of player management. Created spreadsheet to help keep track of player performance metrics.
- - image : images/team/pistolfist.webp
+ - imageName : pistolfist
name : PistolFist
designation : Vice Master
description : In charge of recruiting and assists with player management. Created this site and co-designed clan logo. Founder of clan.
@@ -20,23 +20,24 @@ teamMember :
# - icon : tf-ion-social-facebook
# url : "#"
- # - image : images/team/hunter.webp
- - image : images/team/hunter-2.webp
+ - imageName : hunter
+ # - imageName : hunter-rs
name : Hunter
designation : MP Leader
description : Runs MP lobbies and go-to person for MP strategy.
- - image : images/team/duck.webp
+ - imageName : duck
name : Duckmaster
designation : BR Leader
description : Runs BR lobbies and go-to person for BR strategy.
- - image : images/team/slade.webp
+ - imageName : slade
+ # - imageName : slade-rs
name : Slade
designation : BR Leader
description : Runs BR lobbies and go-to person for BR strategy.
- - image : images/team/helen.webp
+ - imageName : helen
name : Heleners
designation : Discord Administrator
description : Manages Discord server. Co-founder of clan.
diff --git a/data/testimonial.yml b/data/testimonial.yml
index 8218462..96e88ad 100644
--- a/data/testimonial.yml
+++ b/data/testimonial.yml
@@ -1,15 +1,26 @@
heading: Our
headingSpan: Members
-# bgImage : "images/backgrounds/halloween-loading-screen.jpg"
-bgImage : "images/backgrounds/halloween-loading-screen.webp"
-enable : false
+bgImage : "images/backgrounds/halloween-loading-screen.jpg"
+# enable : false
+enable : true
testimonialItem :
- - name : bakkuteh
- image : images/team/bakkuteh.webp
- date : Nov 24, 2019
- content : Pigs go oink.
-
- name : PistolFist
- image : images/team/pistolfist.webp
- date : Nov 24, 2019
- content : Bang.
+ image : images/team/pistolfist.jpg
+ date : Oct 21, 2019
+ content : Hip-hop/trap EDM fan.
+
+ - name : Heleners
+ image : images/team/helen.jpg
+ date : Oct 22, 2019
+ content : Loves Frozen.
+
+ - name : JoshuaAustin07
+ image : images/team/josh.jpg
+ date : Nov 10, 2019
+ content : Likes to use dogs that aren't his as his profile picture.
+
+ - name : bakkutteh
+ image : images/team/bakkuteh.png
+ date : Nov 15, 2019
+ content : Name means pork bone tea.
+
diff --git a/layouts/partials/counter.html b/layouts/partials/counter.html
new file mode 100644
index 0000000..96ae4c7
--- /dev/null
+++ b/layouts/partials/counter.html
@@ -0,0 +1,19 @@
+{{ if .Site.Params.counter.enable }}
+{{"" | safeHTML}}
+
+
+
+ {{ range .Site.Params.counter.counterItem }}
+
+
+
+ {{ .count }}
+
{{ .title }}
+
+
+ {{ end }}
+
+
+
+{{"" | safeHTML}}
+{{ end }}
diff --git a/layouts/partials/hero-area.html b/layouts/partials/hero-area.html
new file mode 100644
index 0000000..3a17aea
--- /dev/null
+++ b/layouts/partials/hero-area.html
@@ -0,0 +1,18 @@
+{{ if .Site.Params.banner.enable }}
+{{"" | safeHTML}}
+
+
+ {{with .Site.Params.banner.icon}}
+
+
+
+ {{ end }}
+ {{with .Site.Params.banner.heading}}
{{ . }}
{{ end }}
+ {{with .Site.Params.banner.content}}
{{ . }}
{{ end }}
+ {{ if .Site.Params.banner.btn}}
+
{{ .Site.Params.banner.btnText}}
+ {{ end }}
+
+
+{{"" | safeHTML}}
+{{end}}
diff --git a/layouts/partials/team.html b/layouts/partials/team.html
index a6e7d66..4fad754 100644
--- a/layouts/partials/team.html
+++ b/layouts/partials/team.html
@@ -18,7 +18,13 @@
{{"" | safeHTML}}
-
+
{{"" | safeHTML}}
diff --git a/static/images/.gitattributes b/static/images/.gitattributes
index 46b27dd..4f6eb90 100644
--- a/static/images/.gitattributes
+++ b/static/images/.gitattributes
@@ -40,3 +40,5 @@ team/hunter.webp filter=lfs diff=lfs merge=lfs -text
clan-logo.png filter=lfs diff=lfs merge=lfs -text
mee6-icon.png filter=lfs diff=lfs merge=lfs -text
clan-logo-christmas.png filter=lfs diff=lfs merge=lfs -text
+backgrounds/codm-reddit-banner.jpg filter=lfs diff=lfs merge=lfs -text
+backgrounds/halloween-loading-screen.jpg filter=lfs diff=lfs merge=lfs -text
diff --git a/static/images/backgrounds/codm-reddit-banner.jpg b/static/images/backgrounds/codm-reddit-banner.jpg
new file mode 100644
index 0000000..ac9489d
Binary files /dev/null and b/static/images/backgrounds/codm-reddit-banner.jpg differ
diff --git a/static/images/backgrounds/codm-reddit-banner.webp b/static/images/backgrounds/codm-reddit-banner.webp
deleted file mode 100644
index 18814fc..0000000
--- a/static/images/backgrounds/codm-reddit-banner.webp
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cc7f3728aaa888610db4a9feda2376782f2837ca02a09e72e3915e9a5f749f61
-size 68324
diff --git a/static/images/backgrounds/halloween-loading-screen.jpg b/static/images/backgrounds/halloween-loading-screen.jpg
new file mode 100644
index 0000000..c0464df
Binary files /dev/null and b/static/images/backgrounds/halloween-loading-screen.jpg differ
diff --git a/static/images/backgrounds/halloween-loading-screen.webp b/static/images/backgrounds/halloween-loading-screen.webp
deleted file mode 100644
index dc763e6..0000000
--- a/static/images/backgrounds/halloween-loading-screen.webp
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6e63e13ae08d24ccd12094d5158b0885caae91514c87a822fef4df8f661561a3
-size 167104
diff --git a/static/images/slider/hero-area.jpg b/static/images/slider/hero-area.jpg
new file mode 100644
index 0000000..57032e5
Binary files /dev/null and b/static/images/slider/hero-area.jpg differ
diff --git a/static/images/slider/hero-area.webp b/static/images/slider/hero-area.webp
deleted file mode 100644
index 706a5a0..0000000
--- a/static/images/slider/hero-area.webp
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bdae913bf8ca0bf58a1ae8ef7ed8e4f8c1e6908c825532cb4c3437c2244bab86
-size 157022
diff --git a/static/images/team/.gitattributes b/static/images/team/.gitattributes
index aa51b57..b7270b8 100644
--- a/static/images/team/.gitattributes
+++ b/static/images/team/.gitattributes
@@ -4,3 +4,12 @@ slade.webp filter=lfs diff=lfs merge=lfs -text
bakkuteh.webp filter=lfs diff=lfs merge=lfs -text
duck.webp filter=lfs diff=lfs merge=lfs -text
helen.webp filter=lfs diff=lfs merge=lfs -text
+hunter.jpg filter=lfs diff=lfs merge=lfs -text
+slade.jpg filter=lfs diff=lfs merge=lfs -text
+bakkuteh.jpg filter=lfs diff=lfs merge=lfs -text
+bakkuteh.png filter=lfs diff=lfs merge=lfs -text
+duck.jpg filter=lfs diff=lfs merge=lfs -text
+helen.jpg filter=lfs diff=lfs merge=lfs -text
+josh.jpg filter=lfs diff=lfs merge=lfs -text
+pistolfist.jpg filter=lfs diff=lfs merge=lfs -text
+webp.fish filter=lfs diff=lfs merge=lfs -text
diff --git a/static/images/team/bakkuteh.jpg b/static/images/team/bakkuteh.jpg
new file mode 100644
index 0000000..88d6304
Binary files /dev/null and b/static/images/team/bakkuteh.jpg differ
diff --git a/static/images/team/bakkuteh.png b/static/images/team/bakkuteh.png
new file mode 100644
index 0000000..e7d18cb
Binary files /dev/null and b/static/images/team/bakkuteh.png differ
diff --git a/static/images/team/bakkuteh.webp b/static/images/team/bakkuteh.webp
index cff8fe8..937850c 100644
Binary files a/static/images/team/bakkuteh.webp and b/static/images/team/bakkuteh.webp differ
diff --git a/static/images/team/duck.jpg b/static/images/team/duck.jpg
new file mode 100644
index 0000000..e728245
Binary files /dev/null and b/static/images/team/duck.jpg differ
diff --git a/static/images/team/duck.webp b/static/images/team/duck.webp
index 4dd6c4c..0105a6a 100644
Binary files a/static/images/team/duck.webp and b/static/images/team/duck.webp differ
diff --git a/static/images/team/helen.jpg b/static/images/team/helen.jpg
new file mode 100644
index 0000000..3f7d1cc
Binary files /dev/null and b/static/images/team/helen.jpg differ
diff --git a/static/images/team/helen.webp b/static/images/team/helen.webp
index 08b8aa1..ab17765 100644
Binary files a/static/images/team/helen.webp and b/static/images/team/helen.webp differ
diff --git a/static/images/team/hunter-2.webp b/static/images/team/hunter-2.webp
deleted file mode 100644
index 9c63bbd..0000000
Binary files a/static/images/team/hunter-2.webp and /dev/null differ
diff --git a/static/images/team/hunter.jpg b/static/images/team/hunter.jpg
new file mode 100644
index 0000000..2cb95eb
Binary files /dev/null and b/static/images/team/hunter.jpg differ
diff --git a/static/images/team/hunter.webp b/static/images/team/hunter.webp
index e2bbe5a..25b5a3e 100644
Binary files a/static/images/team/hunter.webp and b/static/images/team/hunter.webp differ
diff --git a/static/images/team/josh.jpg b/static/images/team/josh.jpg
new file mode 100644
index 0000000..519bac3
Binary files /dev/null and b/static/images/team/josh.jpg differ
diff --git a/static/images/team/josh.webp b/static/images/team/josh.webp
index 53568bf..898987c 100644
Binary files a/static/images/team/josh.webp and b/static/images/team/josh.webp differ
diff --git a/static/images/team/pistolfist.jpg b/static/images/team/pistolfist.jpg
new file mode 100644
index 0000000..8570c4e
Binary files /dev/null and b/static/images/team/pistolfist.jpg differ
diff --git a/static/images/team/pistolfist.webp b/static/images/team/pistolfist.webp
index a405751..4630f65 100644
Binary files a/static/images/team/pistolfist.webp and b/static/images/team/pistolfist.webp differ
diff --git a/static/images/team/slade.jpg b/static/images/team/slade.jpg
new file mode 100644
index 0000000..15697ee
Binary files /dev/null and b/static/images/team/slade.jpg differ
diff --git a/static/images/team/slade.webp b/static/images/team/slade.webp
index 0d7b887..33514af 100644
Binary files a/static/images/team/slade.webp and b/static/images/team/slade.webp differ
diff --git a/static/images/team/webp.fish b/static/images/team/webp.fish
new file mode 100644
index 0000000..0c8cd3a
--- /dev/null
+++ b/static/images/team/webp.fish
@@ -0,0 +1,10 @@
+# regular
+# convert $argv[1].$argv[2] -resize 500x500 $argv[1]-rs.jpg
+# cwebp -q 80 $argv[1]-rs.jpg -o $argv[1].webp
+# mv $argv[1]-rs.jpg $argv[1].jpg
+# rm $argv[1].$argv[2]
+
+# png
+convert $argv[1].$argv[2] -resize 500x500 $argv[1]-rs.$argv[2]
+cwebp -q 80 $argv[1]-rs.$argv[2] -o $argv[1].webp
+mv $argv[1]-rs.$argv[2] $argv[1].$argv[2]