diff --git a/assets/scss/footer.scss b/assets/scss/footer.scss
index 58b0039..77d196f 100644
--- a/assets/scss/footer.scss
+++ b/assets/scss/footer.scss
@@ -1,3 +1,5 @@
+$color: {{ .Param "color" }};
+
.footer {
margin: auto;
padding: 1.5rem 0rem;
@@ -14,11 +16,7 @@
justify-content: center;
flex-wrap: wrap;
font-size: 2em;
- color: {{ .Site.Params.color.primary }};
-}
-
-.social-media-footer a {
- color: {{ .Site.Params.color.primary }};
+ color: $color;
}
.links {
@@ -38,10 +36,6 @@
padding: 0px 24px;
}
-.link a {
- color: inherit;
-}
-
.copyright {
margin-top: 2rem;
width: 100%;
diff --git a/assets/scss/hero.scss b/assets/scss/hero.scss
deleted file mode 100644
index e3f36bb..0000000
--- a/assets/scss/hero.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-.hero {
- height: 700px;
- background-image: url({{ .hero.background }}) !important;
- background-size: cover;
- background-repeat: no-repeat;
- background-position: center center;
-}
-
-.hero-icon-container {
- padding: 1rem;
-}
-
-.hero-button {
- background-color: {{ .color.primary }};
- color: white;
- border: 2px solid {{ .color.primary }};
- border-radius: 4px;
- padding: 0.5rem 1.5rem;
- text-align: center;
- text-decoration: none;
- display: inline-block;
- font-size: 1rem;
- margin-top: 1rem;
-}
\ No newline at end of file
diff --git a/assets/scss/index.scss b/assets/scss/index.scss
index bbb81df..bc126de 100644
--- a/assets/scss/index.scss
+++ b/assets/scss/index.scss
@@ -1,3 +1,4 @@
+$color: {{ .Param "color" }};
$font: {{ .Param "font" }};
@font-face {
@@ -7,10 +8,6 @@ $font: {{ .Param "font" }};
font-style: normal;
}
-* {
- box-sizing: border-box;
-}
-
html {
scroll-behavior: smooth;
}
@@ -42,7 +39,7 @@ p {
a {
text-decoration: none;
- color: {{ .Site.Params.color.secondary }};
+ color: inherit;
}
button {
@@ -69,6 +66,14 @@ button {
[class*="col-"] {
float: left;
+ padding: 1.5rem 1.5rem;
+}
+
+@media screen and (max-width: 600px) {
+ [class*="col-"] {
+ width: 100%;
+ max-width: 100%;
+ }
}
.row {
@@ -84,15 +89,10 @@ button {
margin: 0;
}
-.content p img {
- width: 100%;
- // height: 500px;
-}
-
.divider {
height: 3px;
border-radius: 50px;
- background: {{ .Site.Params.color.primary }};
+ background: $color;
width: 60px;
}
@@ -111,7 +111,7 @@ button {
.video {
position: absolute;
margin: 0 auto;
- border: 5px dotted {{ .Site.Params.color.primary }};
+ border: 5px dotted $color;
top: 0;
left: 0;
width: 100%;
@@ -134,43 +134,25 @@ button {
}
.section-highlight {
- background-color: {{ .Site.Params.color.primary }};
+ background-color: $color;
}
.section-content {
- width: 100%;
+ /* width: 100%; */
max-width: 1152px;
margin: auto;
justify-content: center;
}
-.content {
+.article {
padding-top: 9rem;
padding-bottom: 2rem;
- padding-right: 1.5rem;
- padding-left: 1.5rem;
- width: 100%;
+ // padding-right: 1.5rem;
+ // padding-left: 1.5rem;
max-width: 1152px;
+ width: 100%;
margin: 0;
align-self: center;
- flex-grow: 1;
-}
-
-.notfound {
- display: flex;
- padding-right: 1.5rem;
- padding-left: 1.5rem;
- width: 100%;
- max-width: 1152px;
- margin: 0;
- align-self: center;
- justify-content: center;
- flex-grow: 1;
-}
-
-.notfoundimage {
- width: 100%;
- max-width: 912px;
}
/* Team */
@@ -180,38 +162,19 @@ button {
text-align: center;
}
-.team-list {
- display: flex;
- flex-direction: row;
- flex-wrap: wrap;
-}
-
-.team-list a {
- color: inherit;
-}
-
.teammember {
display: inline-block;
align-items: center;
text-align: center;
margin: 0 auto;
- padding: 1rem;
+ padding: 1.5rem;
}
.avatar {
width: 15rem;
height: 15rem;
border-radius: 50%;
- border: 2px solid {{ .Site.Params.color.primary }};
- object-fit: cover;
- margin: 0 auto;
-}
-
-.avatar-small {
- width: 10rem;
- height: 10rem;
- border-radius: 50%;
- border: 2px solid {{ .Site.Params.color.primary }};
+ border: 2px solid $color;
object-fit: cover;
margin: 0 auto;
}
@@ -221,79 +184,31 @@ button {
padding-bottom: 0.1rem;
}
-.teammember-header {
- display: flex;
- justify-content: left;
- margin-bottom: 2rem;
-}
-
-.teammember-header-avatar {
- width: 10rem;
- height: 10rem;
- border-radius: 50%;
- border: 2px solid {{ .Site.Params.color.primary }};
- object-fit: cover;
-}
-
-.teammember-header-title {
- font-size: x-large;
- padding-bottom: 0.1rem;
- margin: auto 1rem;
-}
-
-.teammember-header-social-media {
- display: flex;
- flex-wrap: wrap;
- color: #333;
- margin-top: -0.5rem
-}
-
-.teammember-header-social-media a {
- color: inherit;
-}
-
-.teammember-posts {
- margin-top: 2rem;
-}
-
.social-media {
+ display: flex;
+ justify-content: center;
+ flex-wrap: wrap;
font-size: 1.5em;
-}
-
-.author {
- width: 100%;
- display: inline-block;
- align-items: center;
- text-align: center;
- margin: 0 auto;
- padding-top: 2rem;
-}
-
-.author a {
- color: inherit;
-}
-
-.author-title {
- font-size: x-large;
- padding-bottom: 0.1rem;
- margin: 0;
+ padding-top: 1rem;
+ color: #333;
+ min-height: 2em;
}
/* Funding */
.funding-logo {
- width: 9rem;
- padding: 1rem;
+ width: 14rem;
+ padding: 1.5rem;
}
.services {
- display: inherit;
padding: 1.5rem 0rem;
}
.service-icon-container {
- padding: 1.5rem;
- margin: auto;
+ /* min-width: 300px; */
+ /* margin: 0 auto;
+ align-self: center; */
}
.service-icon {
@@ -303,8 +218,8 @@ button {
.service-button {
background-color: transparent;
- color: {{ .Site.Params.color.primary }};
- border: 2px solid {{ .Site.Params.color.primary }};
+ color: $color;
+ border: 2px solid $color;
border-radius: 4px;
padding: 0.5rem 1.5rem;
text-align: center;
@@ -315,7 +230,7 @@ button {
}
.service-button:hover {
- background-color: {{ .Site.Params.color.primary }};
+ background-color: $color;
color: white;
}
@@ -332,7 +247,7 @@ button {
.contact-button {
background-color: white;
- color: {{ .Site.Params.color.primary }};
+ color: $color;
border-radius: 4px;
padding: 0.5rem 1.5rem;
text-align: center;
@@ -345,120 +260,4 @@ button {
.contact-text {
text-align: center;
color: white;
-}
-
-.cardList {
- display: flex;
- flex-direction: row;
- flex-wrap: wrap;
- justify-content: flex-start;
- width: 100%;
-}
-
-.cardList a {
- color: inherit;
-}
-
-.smallCard {
- display: flex;
- flex-direction: column;
- border-radius: 5px;
- box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
- width: 360px;
- height: 100px;
- margin: 10px;
- justify-content: center;
-}
-
-.mediumCard {
- display: flex;
- flex-direction: column;
- border-radius: 5px;
- box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
- width: 360px;
- height: 200px;
- margin: 10px;
- justify-content: center;
-}
-
-.card {
- display: flex;
- flex-direction: column;
- border-radius: 5px;
- box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
- max-width: 350px;
- height: 400px;
- margin: 5px;
- justify-content: center;
-}
-.cardImage {
- display: flex;
- width: 100%;
- height: 150px;
- border-radius: 5px 5px 0px 0px;
- object-fit: cover;
- flex-shrink: 0;
- flex-grow: 1;
-}
-
-.cardIcon {
- margin: auto;
- font-size: 8em;
- color: {{ .Site.Params.color.secondary }};
-}
-
-.cardTitle {
- text-align: center;
- font-size: 18px;
- font-weight: 600;
- padding-top: 1rem;
- padding-bottom: 0.5rem;
-}
-.cardDescription {
- flex-grow: 1;
- overflow: hidden;
- text-overflow: ellipsis;
- padding: 6px;
- padding-top: 0px;
- word-wrap: break-word;
- //white-space: -moz-pre-wrap;
- //white-space: pre-wrap;
- height: 100%;
-}
-
-.cardDetail {
- padding: 6px;
- font-size: 12px;
- text-align: right;
-}
-
-.post-detail {
- margin-top: -6px;
- padding-bottom: 6px;
- font-size: 14px;
-}
-
-.coverimage {
- height: 60vh;
- min-width: 100%;
- padding-top: 68px;
- object-fit: cover;
-}
-
-.more-button {
- padding-top: 1rem;
- text-align: center;
- color: {{ .Site.Params.color.primary }};
-}
-
-@media screen and (max-width: 600px) {
- [class*="col-"] {
- display: block;
- width: 100%;
- max-width: 100%;
- }
-
- .services {
- display: inline-block;
- }
}
\ No newline at end of file
diff --git a/assets/scss/progressbar.scss b/assets/scss/progressbar.scss
index fbaa42a..8386e00 100644
--- a/assets/scss/progressbar.scss
+++ b/assets/scss/progressbar.scss
@@ -1,5 +1,6 @@
+$color: {{ .Param "color" }};
.progress {
- background: linear-gradient(to right, {{ .Site.Params.color.primary }} var(--scroll), transparent 0);
+ background: linear-gradient(to right, $color var(--scroll), transparent 0);
background-repeat: no-repeat;
position: fixed;
width: 100%;
diff --git a/assets/scss/slider.scss b/assets/scss/slider.scss
index a57fc78..f1f61e3 100644
--- a/assets/scss/slider.scss
+++ b/assets/scss/slider.scss
@@ -1,3 +1,5 @@
+$color: {{ .Param "color" }};
+
* {
box-sizing: border-box;
}
@@ -65,7 +67,7 @@
display: inline-flex;
width: 1rem;
height: 1rem;
- background: {{ .color.primary }};
+ background: $color;
text-decoration: none;
align-items: center;
justify-content: center;
@@ -98,7 +100,7 @@
left: 0;
top: 0;
z-index: 2;
- color: {{ .color.primary }};
+ color: $color;
font-size: 3.5em;
}
@@ -117,7 +119,7 @@
top: 0;
right: 0;
z-index: 2;
- color: {{ .color.primary }};
+ color: $color;
font-size: 3.5em;
}
diff --git a/assets/scss/totop.scss b/assets/scss/totop.scss
index ac56da7..83e177c 100644
--- a/assets/scss/totop.scss
+++ b/assets/scss/totop.scss
@@ -1,6 +1,7 @@
+$color: {{ .Param "color" }};
.totop {
display: inline-flex;
- background-color: {{ .Site.Params.color.primary }};
+ background-color: $color;
color: #f2f2f2;
width: 50px;
height: 50px;
diff --git a/layouts/404.html b/layouts/404.html
index 25db2e6..9ac434d 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,5 +1,5 @@
-{{ define "main" }}
-
-
-
-{{ end }}
\ No newline at end of file
+
+
+
+
+
\ No newline at end of file
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 4b874c1..e69de29 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{- $favIcon := .Site.Params.favIcon }}
-
-
- {{ block "title" . }}{{ .Site.Title }}{{ end }}
-
- {{ $template := resources.Get "scss/index.scss" }}
- {{ if $template }}
- {{ $index := $template | resources.ExecuteAsTemplate "css/index.scss" . | resources.ToCSS (dict "outputStyle" "compressed") | fingerprint }}
-
- {{ end }}
- {{ block "styling" . }}
- {{ end }}
- {{ $template := resources.Get "scss/totop.scss" }}
- {{ if $template }}
- {{ $totop := $template | resources.ExecuteAsTemplate "css/totop.scss" . | resources.ToCSS (dict "outputStyle" "compressed") | fingerprint }}
-
- {{ end }}
-
-
- {{ block "header" . }}
- {{- partial "header.html" . -}}
- {{ end }}
- {{ block "main" . }}
-
- {{ end }}
- {{ block "footer" . }}
- {{- partial "footer.html" . -}}
- {{ end }}
-
-
\ No newline at end of file
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 62aa147..e69de29 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,26 +0,0 @@
-{{ define "main" }}
-{{ if .Params.id }}
-{{- partial "hero.html" (dict "hero" .Params "color" .Site.Params.color "odd" 0) -}}
-{{ end }}
-{{.Content}}
-
- {{- range $index, $page := .Pages }}
- {{ $odd := mod (add $index 1) 2 }}
- {{ if eq .Params.type "slider" }}
- {{- partial "slider.html" (dict "id" $page.File.ContentBaseName "slider" .Params "color" $.Site.Params.color "odd" $odd) -}}
- {{ else if eq .Params.type "hero" }}
- {{- partial "hero.html" (dict "id" $page.File.ContentBaseName "hero" .Params "color" $.Site.Params.color "odd" $odd) -}}
- {{ else if eq .Params.type "video" }}
- {{- partial "video.html" (dict "id" $page.File.ContentBaseName "video" .Params "odd" $odd) -}}
- {{ else if eq .Params.type "service" }}
- {{- partial "service.html" (dict "id" $page.File.ContentBaseName "service" .Params "content" .Content "odd" $odd) -}}
- {{ else if eq .Params.type "contact" }}
- {{- partial "contact.html" (dict "id" $page.File.ContentBaseName "contact" .Params "odd" $odd) -}}
- {{ else if eq .Params.type "logos" }}
- {{- partial "logos.html" (dict "id" $page.File.ContentBaseName "logos" .Params "odd" $odd) -}}
- {{ else if eq .Params.type "links" }}
- {{- partial "links.html" (dict "id" $page.File.ContentBaseName "links" .Params "defaultimage" $.Site.Params.defaultimage "odd" $odd) -}}
- {{ end }}
- {{ end }}
-
-{{ end }}
\ No newline at end of file
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index ee772a6..bfc5d40 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,15 +1,18 @@
-{{ define "main" }}
- {{ with .Params.image }}
-
- {{ end }}
-
- {{ with .Title }}
+
+
+ {{- partial "head.html" . -}}
+
+ {{- partial "header.html" . -}}
+ {{ block "main" . }}
+
{{ end }}
-
- {{ .Content }}
-
-{{ end }}
\ No newline at end of file
+ {{- partial "footer.html" . -}}
+
+
\ No newline at end of file
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
deleted file mode 100644
index 90d6075..0000000
--- a/layouts/_default/terms.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{{ define "main" }}
-
-
-
-
-
-
- {{ range .Pages }}
-
-
-
- {{ end }}
-
-
-{{ end }}
\ No newline at end of file
diff --git a/layouts/index.html b/layouts/index.html
index e90803c..3c18038 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,24 +1,24 @@
-{{ define "main" }}
- {{- range $index, $section := .Site.Params.sections }}
- {{ $odd := mod $index 2 }}
- {{ if eq .type "slider" }}
- {{- partial "slider.html" (dict "slider" $section "color" $.Site.Params.color "odd" $odd) -}}
- {{ else if eq .type "hero" }}
- {{- partial "hero.html" (dict "hero" $section "color" $.Site.Params.color "odd" $odd) -}}
- {{ else if eq .type "video" }}
- {{- partial "video.html" (dict "video" $section "odd" $odd) -}}
- {{ else if eq .type "service" }}
- {{- partial "service.html" (dict "service" $section "content" $section.description "odd" $odd) -}}
- {{ else if eq .type "team" }}
- {{ $pages := where $.Site.RegularPages "Section" $section.id }}
- {{- partial "team.html" (dict "team" $section "pages" $pages "defaultimage" $.Site.Params.defaultimage "odd" $odd) -}}
- {{ else if eq .type "contact" }}
- {{- partial "contact.html" (dict "contact" $section "odd" $odd) -}}
- {{ else if eq .type "logos" }}
- {{- partial "logos.html" (dict "logos" $section "odd" $odd) -}}
- {{ else if eq .type "posts" }}
- {{ $pages := where $.Site.RegularPages "Section" $section.id }}
- {{- partial "posts.html" (dict "posts" $section "pages" $pages "defaultimage" $.Site.Params.defaultimage "odd" $odd) -}}
- {{ end }}
- {{- end }}
-{{ end }}
\ No newline at end of file
+
+
+ {{- partial "head.html" . -}}
+
+ {{- partial "header.html" . -}}
+ {{- range $index, $section := .Site.Params.sections }}
+ {{ $odd := mod $index 2 }}
+ {{if eq .type "slider" }}
+ {{- partial "slider.html" (dict "slider" $section "odd" $odd) -}}
+ {{ else if eq .type "video" }}
+ {{- partial "video.html" (dict "video" $section "odd" $odd) -}}
+ {{ else if eq .type "service" }}
+ {{- partial "service.html" (dict "service" $section "odd" $odd) -}}
+ {{ else if eq .type "team" }}
+ {{- partial "team.html" (dict "team" $section "odd" $odd) -}}
+ {{ else if eq .type "contact" }}
+ {{- partial "contact.html" (dict "contact" $section "odd" $odd) -}}
+ {{ else if eq .type "logos" }}
+ {{- partial "logos.html" (dict "logos" $section "odd" $odd) -}}
+ {{end}}
+ {{- end }}
+ {{- partial "footer.html" . -}}
+
+
\ No newline at end of file
diff --git a/layouts/partials/contact.html b/layouts/partials/contact.html
index 4779a01..862f55a 100644
--- a/layouts/partials/contact.html
+++ b/layouts/partials/contact.html
@@ -1,11 +1,5 @@
{{- $contact := .contact }}
-{{- $id := "contact"}}
-{{if $contact.id}}
- {{- $id := $contact.id}}
-{{else if .id}}
- {{- $id := .id }}
-{{end}}
-