From 672bb5a0bc98734a35c77e0e44b1f3062c5de69b Mon Sep 17 00:00:00 2001 From: Ryan Holder Date: Tue, 7 Dec 2021 13:32:59 +0000 Subject: [PATCH] theme updates --- config/_default/config.toml | 3 + content/boardofdirectors/jameskulina.md | 1 - content/join/_index.md | 8 + content/join/benefits.md | 30 ++++ content/members/google.md | 1 + content/members/inspurpowersystems.md | 1 + content/members/kardinal.md | 11 +- content/members/raptorcomputingsystems.md | 1 + content/members/universityoforegon.md | 1 + content/persons/jameshuang.md | 2 +- content/persons/jameskulina.md | 2 +- content/persons/sameershende.md | 2 +- content/persons/timothypearson.md | 2 +- .../openpowerfoundation/assets/css/bod.scss | 3 + .../assets/css/header.scss | 52 +++--- .../openpowerfoundation/assets/css/main.css | 57 ++++--- .../openpowerfoundation/assets/css/pages.scss | 159 ++++++++++++++++-- .../assets/css/variables.scss | 7 +- .../layouts/boardofdirectors/list.html | 26 ++- .../layouts/join/single.html | 37 ++-- .../layouts/members/list.html | 10 +- .../layouts/partials/footer.html | 10 +- .../layouts/partials/header.html | 9 +- .../layouts/partials/navbar.html | 29 ++-- .../layouts/steeringcommittee/list.html | 6 +- 25 files changed, 330 insertions(+), 140 deletions(-) create mode 100644 content/join/benefits.md create mode 100644 themes/openpowerfoundation/assets/css/bod.scss diff --git a/config/_default/config.toml b/config/_default/config.toml index 5a72fb3..bd414bb 100644 --- a/config/_default/config.toml +++ b/config/_default/config.toml @@ -22,3 +22,6 @@ enableRobotsTXT = true mediatype = "application/rss" baseName = "feed" suffix = "xml" + +[markup.goldmark.renderer] +unsafe = true diff --git a/content/boardofdirectors/jameskulina.md b/content/boardofdirectors/jameskulina.md index a08cdef..3434d68 100644 --- a/content/boardofdirectors/jameskulina.md +++ b/content/boardofdirectors/jameskulina.md @@ -1,7 +1,6 @@ --- title: "James Kulina" position: "Executive Director" -member: linuxfoundation weight: 100 date: 2021-03-03 draft: false diff --git a/content/join/_index.md b/content/join/_index.md index 99f40da..f11fef7 100644 --- a/content/join/_index.md +++ b/content/join/_index.md @@ -60,3 +60,11 @@ become-member: draft: false --- + +| Membership Level | Annual Fee | Technical Steering Committee | Board of Directors | +|----------------------|------------|---------------------------------|------------------------------------------------------------------| +| Platinum | $100k | 1 voting participant per member | 1 voting participant per member | +| Gold | $60k | If a WG lead | 1 elected voting participant per three gold member level | +| Silver | $20k | If a WG lead | 1 elected voting participant for all silver members | +| Associate / Academic | $0 | If a WG lead | 1 elected non-voting observer for all associate/acedemic members | + diff --git a/content/join/benefits.md b/content/join/benefits.md new file mode 100644 index 0000000..351235b --- /dev/null +++ b/content/join/benefits.md @@ -0,0 +1,30 @@ +--- +title: 'Membership Benefits' +date: 2021-07-17 +type: join +draft: false +--- + + +| OpenPOWER Foundation Membership Matrix | Associate | ISV | Silver | Gold | Platinum | +|------------------------------------------------------------|-----------|-----|---------|------|----------| +| Working Group Participation | x | x | x | x | x | +| Marketing Committee Participation | x | x | x | x | x | +| Access to Specifications Approved by the Board | x | x | x | x | x | +| Access to Draft Specifications in development | x | x | x | x | x | +| Petition TSC to create a new workgroup or project | x | x | x | x | x | +| Exhibit opportunities as OPF-hosted and exhibiting events | x | x | x | x | x | +| Participate in OpenPOWER Ambassador Program | x | x | x | x | x | +| Speaker Opportunities at OPF-hosted events | x | | 1+ | 2+ | 2+ | +| Keynote Opportunities at OPF-hosted events | | | | | x | +| Registration/exibit at OPF events | | | 5% | 10% | 20% | +| Member logo featured on the website | x | x | x | x | x | +| Member logo featured on the website homepage | | | | x | x | +| Member logo featured on event signage | | | | x | x | +| Member profile featured on website spotlight | | | | x | x | +| Member name inclusion in Press Releases | | | | 1x/yr| 2x/yr | +| Final Approval of New Projects | Board membership required | +| Final Approval and Voting of IP and Specifications | Board membership required | +| Manage the Future Direction of the Organization | Board membership required | + + diff --git a/content/members/google.md b/content/members/google.md index 48af50e..535ed41 100644 --- a/content/members/google.md +++ b/content/members/google.md @@ -1,6 +1,7 @@ --- title: "Google" image: "google.png" +link: https://www.google.com level: platinum country: "United States of America" joined: 2013 diff --git a/content/members/inspurpowersystems.md b/content/members/inspurpowersystems.md index 5ee7742..2fd6447 100644 --- a/content/members/inspurpowersystems.md +++ b/content/members/inspurpowersystems.md @@ -3,6 +3,7 @@ title: "Inspur Power Systems" image: "inspur-power-systems.png" level: platinum country: "China" +link: https://www.inspursystems.com joined: 2017 date: 2021-03-03 draft: false diff --git a/content/members/kardinal.md b/content/members/kardinal.md index 7b977b3..3ae80a7 100755 --- a/content/members/kardinal.md +++ b/content/members/kardinal.md @@ -1,11 +1,10 @@ - - - -title: KARDINAL, INC. -image: KARDINAL, INC. +--- +title: "KARDINAL, INC." +image: "" country: France -link: https://kardinal.ai/ +link: https://kardinal.ai level: Silver joined: 2019 date: 2021-03-31 draft: false +--- \ No newline at end of file diff --git a/content/members/raptorcomputingsystems.md b/content/members/raptorcomputingsystems.md index f9bfdcb..d9f6620 100644 --- a/content/members/raptorcomputingsystems.md +++ b/content/members/raptorcomputingsystems.md @@ -1,6 +1,7 @@ --- title: "Raptor Computing Systems" image: "raptorcomputingsystems.png" +link: https://www.raptorcs.com level: silver country: "United States of America" joined: 2018 diff --git a/content/members/universityoforegon.md b/content/members/universityoforegon.md index 4638d03..ac0c2b1 100644 --- a/content/members/universityoforegon.md +++ b/content/members/universityoforegon.md @@ -1,6 +1,7 @@ --- title: "University of Oregon" image: "universityoforegon.jpg" +link: https://www.uoregon.edu level: academic country: "United States of America" date: 2021-03-03 diff --git a/content/persons/jameshuang.md b/content/persons/jameshuang.md index bf92d62..5046f3f 100644 --- a/content/persons/jameshuang.md +++ b/content/persons/jameshuang.md @@ -1,6 +1,6 @@ --- title: "James Huang" -member: inspurpowersystems +member: Inspur Power Systems image: "jameshuang-200.jpg" date: 2021-03-03 draft: false diff --git a/content/persons/jameskulina.md b/content/persons/jameskulina.md index fed850b..3ce90bc 100644 --- a/content/persons/jameskulina.md +++ b/content/persons/jameskulina.md @@ -1,7 +1,7 @@ --- title: "James Kulina" image: "jameskulina-200.jpg" -member: "openpowerfoundation" +member: "OpenPOWER Foundation" date: 2021-03-03 draft: false --- diff --git a/content/persons/sameershende.md b/content/persons/sameershende.md index 1109668..bce911f 100644 --- a/content/persons/sameershende.md +++ b/content/persons/sameershende.md @@ -1,7 +1,7 @@ --- title: "Sameer Shende" image: "sameershende-200.jpg" -member: universityoforegon +member: University of Oregon date: 2021-03-03 draft: false --- diff --git a/content/persons/timothypearson.md b/content/persons/timothypearson.md index e441ac1..e628ae8 100644 --- a/content/persons/timothypearson.md +++ b/content/persons/timothypearson.md @@ -1,7 +1,7 @@ --- title: "Timothy Pearson" image: "timothypearson-200.jpg" -member: "raptorcomputingsystems" +member: "Raptor Computing Systems" date: 2021-03-03 draft: false --- diff --git a/themes/openpowerfoundation/assets/css/bod.scss b/themes/openpowerfoundation/assets/css/bod.scss new file mode 100644 index 0000000..0ff0059 --- /dev/null +++ b/themes/openpowerfoundation/assets/css/bod.scss @@ -0,0 +1,3 @@ +.post__article:nth-child(even) { + background-color: #f7f7f7; +} \ No newline at end of file diff --git a/themes/openpowerfoundation/assets/css/header.scss b/themes/openpowerfoundation/assets/css/header.scss index 3e5f6e6..ef49941 100644 --- a/themes/openpowerfoundation/assets/css/header.scss +++ b/themes/openpowerfoundation/assets/css/header.scss @@ -18,9 +18,9 @@ body { .header { padding: 10px 0; - @media screen and (max-width: $lg) { - padding-top:17px; - } + @media screen and (max-width: $lg) { + padding-top:17px; + } border-bottom: 1px solid #1b1c1f; position: fixed; width: 100vw; @@ -29,10 +29,8 @@ body { z-index: 100; &__logo { text-decoration: none; - &-col { flex-grow: 0; - } } &__menu { @@ -43,8 +41,7 @@ body { text-align: center; &.join { display: none; - } - + } &.menu-has-children { position: relative; ul { @@ -81,7 +78,7 @@ body { transition: width .2s ease-out; } &:hover { - color: #1595b1; + color: #2566f4; } } } @@ -89,12 +86,12 @@ body { &__contact-col { flex-grow: 0; } - &__contact-btn { - min-width: 120px; - margin-left: 2em; + &__contact-btn, + &__login-btn { + min-width: 80px; + margin-left: 1.5em; white-space: nowrap; } - } @@ -195,6 +192,9 @@ body { border-bottom: 1px solid #e8e8e8; border-right: 1px solid #e8e8e8; border-left: 1px solid #e8e8e8;; + @media screen and (min-width: $lg) { + margin-top:1em; + } // -webkit-box-shadow: 5px 5px 5px -1px rgba(0, 0, 0, 0.4); // box-shadow: 5px 5px 5px -1px rgba(0, 0, 0, 0.4); @@ -273,26 +273,24 @@ body { } } - .join-us-button { +.join-us-button, +.login-button { &.desktop-view { @media screen and (max-width: $lg) { display: none; } a { - @media screen and (min-width:$lg) and (max-width: $xxl) { - max-width:80px; - height: auto; - padding:0.375rem 0; - } - } - + @media screen and (min-width:$lg) and (max-width: $xxl) { + max-width:80px; + height: auto; + padding:0.375rem 0; + } + } } - &.mobile-view { - margin:auto; - width: 97px; - min-width: 97px; - - } - + &.mobile-view { + margin:auto; + width: 97px; + min-width: 97px; + } } diff --git a/themes/openpowerfoundation/assets/css/main.css b/themes/openpowerfoundation/assets/css/main.css index 176facc..1054be2 100644 --- a/themes/openpowerfoundation/assets/css/main.css +++ b/themes/openpowerfoundation/assets/css/main.css @@ -35,7 +35,7 @@ --bs-yellow: #ffc107; --bs-green: #198754; --bs-teal: #20c997; - --bs-cyan: #71d8ee; + --bs-cyan: #2566f4; --bs-white: #fff; --bs-gray: #6c757d; --bs-gray-dark: #343a40; @@ -48,7 +48,7 @@ --bs-gray-700: #495057; --bs-gray-800: #343a40; --bs-gray-900: #212529; - --bs-primary: #71d8ee; + --bs-primary: #2566f4; --bs-secondary: #6c757d; --bs-success: #198754; --bs-info: #2666f5; @@ -208,10 +208,12 @@ sup { top: -.5em; } a { - color: #71d8ee; + color: #2566f4; text-decoration: none; } a:hover { - color: #1595b1; } + color: #2566f4; + text-decoration: none; + } a:not([href]):not([class]), a:not([href]):not([class]):hover { color: inherit; @@ -1460,15 +1462,15 @@ textarea.form-control-lg { outline: 0; box-shadow: 0 0 0 0.25rem rgba(113, 216, 238, 0.25); } .form-check-input:checked { - background-color: #71d8ee; - border-color: #71d8ee; } + background-color: #2566f4; + border-color: #2566f4; } .form-check-input:checked[type="checkbox"] { background-image: url("data:image/svg+xml,%3csvg xmlns=%27http://www.w3.org/2000/svg%27 viewBox=%270 0 20 20%27%3e%3cpath fill=%27none%27 stroke=%27%23fff%27 stroke-linecap=%27round%27 stroke-linejoin=%27round%27 stroke-width=%273%27 d=%27M6 10l3 3l6-6%27/%3e%3c/svg%3e"); } .form-check-input:checked[type="radio"] { background-image: url("data:image/svg+xml,%3csvg xmlns=%27http://www.w3.org/2000/svg%27 viewBox=%27-4 -4 8 8%27%3e%3ccircle r=%272%27 fill=%27%23fff%27/%3e%3c/svg%3e"); } .form-check-input[type="checkbox"]:indeterminate { - background-color: #71d8ee; - border-color: #71d8ee; + background-color: #2566f4; + border-color: #2566f4; background-image: url("data:image/svg+xml,%3csvg xmlns=%27http://www.w3.org/2000/svg%27 viewBox=%270 0 20 20%27%3e%3cpath fill=%27none%27 stroke=%27%23fff%27 stroke-linecap=%27round%27 stroke-linejoin=%27round%27 stroke-width=%273%27 d=%27M6 10h8%27/%3e%3c/svg%3e"); } .form-check-input:disabled { pointer-events: none; @@ -1526,7 +1528,7 @@ textarea.form-control-lg { width: 1rem; height: 1rem; margin-top: -0.25rem; - background-color: #71d8ee; + background-color: #2566f4; border: 0; border-radius: 1rem; transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; @@ -1547,7 +1549,7 @@ textarea.form-control-lg { .form-range::-moz-range-thumb { width: 1rem; height: 1rem; - background-color: #71d8ee; + background-color: #2566f4; border: 0; border-radius: 1rem; transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; @@ -1864,8 +1866,8 @@ textarea.form-control-lg { .btn-primary { color: #000; - background-color: #71d8ee; - border-color: #71d8ee; } + background-color: #2566f4; + border-color: #2566f4; } .btn-primary:hover { color: #000; background-color: #fafefe; @@ -1887,8 +1889,8 @@ textarea.form-control-lg { box-shadow: 0 0 0 0.25rem rgba(96, 184, 202, 0.5); } .btn-primary:disabled, .btn-primary.disabled { color: #000; - background-color: #71d8ee; - border-color: #71d8ee; } + background-color: #2566f4; + border-color: #2566f4; } .btn-secondary { color: #fff; @@ -2092,20 +2094,20 @@ textarea.form-control-lg { border-color: #2566f4; } .btn-outline-primary:hover { color: white; - background-color: #71d8ee; - border-color: #71d8ee; } + background-color: #2566f4; + border-color: #2566f4; } .btn-check:focus + .btn-outline-primary, .btn-outline-primary:focus { box-shadow: 0 0 0 0.25rem rgba(113, 216, 238, 0.5); } .btn-check:checked + .btn-outline-primary, .btn-check:active + .btn-outline-primary, .btn-outline-primary:active, .btn-outline-primary.active, .btn-outline-primary.dropdown-toggle.show { color: #000; - background-color: #71d8ee; - border-color: #71d8ee; } + background-color: #2566f4; + border-color: #2566f4; } .btn-check:checked + .btn-outline-primary:focus, .btn-check:active + .btn-outline-primary:focus, .btn-outline-primary:active:focus, .btn-outline-primary.active:focus, .btn-outline-primary.dropdown-toggle.show:focus { box-shadow: 0 0 0 0.25rem rgba(113, 216, 238, 0.5); } .btn-outline-primary:disabled, .btn-outline-primary.disabled { - color: #71d8ee; + color: #2566f4; background-color: transparent; } .btn-outline-secondary { @@ -2257,10 +2259,10 @@ textarea.form-control-lg { .btn-link { font-weight: 400; - color: #71d8ee; + color: #2566f4; text-decoration: none; } .btn-link:hover { - color: #1595b1; } + color: #2566f4; } .btn-link:disabled, .btn-link.disabled { color: #6c757d; } @@ -2310,13 +2312,13 @@ textarea.form-control-lg { .nav-link { display: block; padding: 0.5rem 1rem; - color: #71d8ee; + color: #2566f4; transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out; } @media (prefers-reduced-motion: reduce) { .nav-link { transition: none; } } .nav-link:hover, .nav-link:focus { - color: #1595b1; } + color: #2566f4; } .nav-link.disabled { color: #6c757d; pointer-events: none; @@ -2355,7 +2357,7 @@ textarea.form-control-lg { .nav-pills .nav-link.active, .nav-pills .show > .nav-link { color: #fff; - background-color: #71d8ee; } + background-color: #2566f4; } .nav-fill > .nav-link, .nav-fill .nav-item { @@ -2384,7 +2386,7 @@ textarea.form-control-lg { content: ""; } .link-primary { - color: #71d8ee; } + color: #2566f4; } .link-primary:hover, .link-primary:focus { color: #8de0f1; } @@ -2725,7 +2727,7 @@ textarea.form-control-lg { border-left: 0 !important; } .border-primary { - border-color: #71d8ee !important; } + border-color: #2566f4 !important; } .border-secondary { border-color: #6c757d !important; } @@ -4937,6 +4939,9 @@ textarea.form-control-lg { .d-print-none { display: none !important; } } +#main { + padding-top: 140px; +} .main { padding: 3.75rem 0; padding-top: 100px; } diff --git a/themes/openpowerfoundation/assets/css/pages.scss b/themes/openpowerfoundation/assets/css/pages.scss index 3c7e358..341c0ff 100644 --- a/themes/openpowerfoundation/assets/css/pages.scss +++ b/themes/openpowerfoundation/assets/css/pages.scss @@ -1,3 +1,11 @@ +// Links disabled + +.disabled { +color: black; + display: inline-block; + pointer-events: none; + text-decoration: none; +} // Board of Directors @@ -5,6 +13,9 @@ article { h3 { text-transform: uppercase; + a { + color: black; + } } } } @@ -20,22 +31,22 @@ // Members .members { - - .membership-level { - border-top: 1px solid#1b1c1f; - - .box { - min-height: 110px; - a { - text-decoration: none; - color:black; - } - - img { - max-width: 210px; - } - } + .membership-level { + border-top: 1px solid#1b1c1f; + .box { + min-height: 110px; + text-align: center; + display: flex; + a { + text-decoration: none; + color:black; + align-self: center; + } + img { + max-width: 210px; + } } + } } // Events @@ -46,3 +57,121 @@ } } +// Join + +.join { + + .membership-data { + + table { + margin:auto; + width:100%; + + tr { + + td { + padding: 10px; + } + + + &:nth-child(odd) { + background-color: $white; + } + + &:nth-child(even) { + background-color: $lightgrey; + } + + th { + padding: 10px; + background-color: #dfecf5; + + &:nth-of-type(1) { + width: 20%; + } + &:nth-of-type(2) { + width: 15%; + } + + &:nth-of-type(3) { + width: 25%; + } + + &:nth-of-type(4) { + width: 35%; + } + + } + } + } + + } + + .benefits-data { + + table { + margin:auto; + width:100%; + + tr { + + td { + padding:10px; + position: relative; + + span { + position: absolute; + width: 225px; + display: block; + top: 10px; + left: 10px; + } + } + + &:nth-child(odd) { + background-color: $white; + } + + &:nth-child(even) { + background-color: $lightgrey; + } + + th { + padding:10px; + background-color: #dfecf5; + + &:nth-of-type(1) { + width: 60%; + } + &:nth-of-type(2) { + width: 8%; + } + + &:nth-of-type(3) { + width: 8%; + } + + &:nth-of-type(4) { + width: 8%; + } + + &:nth-of-type(5) { + width: 8%; + } + + &:nth-of-type(6) { + width: 8%; + } + + } + + } + + + } + } + + +} + + diff --git a/themes/openpowerfoundation/assets/css/variables.scss b/themes/openpowerfoundation/assets/css/variables.scss index 71d53eb..3d55588 100644 --- a/themes/openpowerfoundation/assets/css/variables.scss +++ b/themes/openpowerfoundation/assets/css/variables.scss @@ -7,4 +7,9 @@ $sm: 576px; $md: 768px; $lg: 992px; $xl: 1200px; -$xxl: 1300px; \ No newline at end of file +$xxl: 1300px; + +// Colours + +$lightgrey: #f9f9f9; +$white: #ffffff; \ No newline at end of file diff --git a/themes/openpowerfoundation/layouts/boardofdirectors/list.html b/themes/openpowerfoundation/layouts/boardofdirectors/list.html index e6d85e9..d5ce964 100644 --- a/themes/openpowerfoundation/layouts/boardofdirectors/list.html +++ b/themes/openpowerfoundation/layouts/boardofdirectors/list.html @@ -6,10 +6,10 @@

{{ .Title }}

{{ range .Data.Pages.ByWeight }} -
+
{{ $personfile := .File.BaseFileName }} - {{ range where .Site.RegularPages "Section" "persons" }} + {{ range where .Site.Pages "Section" "persons" }} {{ $person := .File.BaseFileName }} {{ if eq $personfile $person }} {{ if .Param "image" }} @@ -24,14 +24,32 @@ {{ end }} {{ end }}
-
+

{{ .Title }}, {{ .Param "position" }}

{{ $personfile := .File.BaseFileName }} + {{ $persontitle := .Title }} {{ range where .Site.RegularPages "Section" "persons" }} {{ $person := .File.BaseFileName }} + {{ $company_member := .Param "member" }} + {{ $company_member := upper $company_member }} {{ if eq $personfile $person }} +

+ {{ if eq $persontitle "Hugh Blemings" }} + Individual + {{ else if eq $persontitle "James Kulina"}} + OpenPOWER Foundation + {{ else }} + + {{ range where .Site.Pages "Section" "members" }} + {{ $company_title := upper .Title }} -

{{ .Param "member" }}

+ {{if eq $company_member $company_title}} + {{ $company_member }} + {{ end }} + {{ end }} + {{ end }} + +

{{ .Content }}

diff --git a/themes/openpowerfoundation/layouts/join/single.html b/themes/openpowerfoundation/layouts/join/single.html index 7d16eb7..0c950ad 100644 --- a/themes/openpowerfoundation/layouts/join/single.html +++ b/themes/openpowerfoundation/layouts/join/single.html @@ -10,7 +10,9 @@

{{ .Param "intro.subtitle" }}

{{ .Param "intro.p-2" }}

{{ .Param "intro.p-3" }}

-

{{ .Param "join.cta.title" }}

+

+ {{ .Param "join.cta.title" }} +

@@ -41,34 +43,21 @@
  • {{ .feature }}
    • {{ end }} -
    - {{ if .Param "membership-levels.image-table" }} - {{ $imagename := .Param "membership-levels.image-table.image" }} - {{ $imagelocation := (printf "%s/%s" "images/join/" $imagename) }} - {{ $imageresource := resources.Get $imagelocation }} - {{ $image := $imageresource }} - {{ .Param - {{ else }} - {{ .Title }} - {{ end }} -
    +
    + {{ .Content }} +

    {{ .Param "membership-benefits.title" }}

    - -
    - {{ if .Param "membership-benefits.image-table" }} - {{ $imagename := .Param "membership-benefits.image-table.image" }} - {{ $imagelocation := (printf "%s/%s" "images/join/" $imagename) }} - {{ $imageresource := resources.Get $imagelocation }} - {{ $image := $imageresource }} - {{ .Param - {{ else }} - {{ .Title }} - {{ end }} -
    +
    + {{ range where .Site.Pages "Section" "join" }} + {{if eq .Title "Membership Benefits"}} + {{ .Content }} + {{ end}} + {{ end}} +
    diff --git a/themes/openpowerfoundation/layouts/members/list.html b/themes/openpowerfoundation/layouts/members/list.html index cc45fc8..16900c6 100644 --- a/themes/openpowerfoundation/layouts/members/list.html +++ b/themes/openpowerfoundation/layouts/members/list.html @@ -26,23 +26,19 @@ {{ if eq $level $key }}
    - + {{ if .Param "image" }} {{ $imagename := .Param "image" }} {{ $imagelocation := (printf "%s/%s" "images/members/" $imagename) }} {{ $imageresource := resources.Get $imagelocation }} {{ $image := $imageresource.Fit $imagesize }} {{ .Title }} + {{ else }} - {{ .Title }} +

    {{ .Param "title" }}

    {{ end }} -
    - -

    {{ .Param "title" }}

    -
    - {{ end }} {{ end }} diff --git a/themes/openpowerfoundation/layouts/partials/footer.html b/themes/openpowerfoundation/layouts/partials/footer.html index ec84921..65d5b24 100644 --- a/themes/openpowerfoundation/layouts/partials/footer.html +++ b/themes/openpowerfoundation/layouts/partials/footer.html @@ -3,11 +3,11 @@
    diff --git a/themes/openpowerfoundation/layouts/partials/header.html b/themes/openpowerfoundation/layouts/partials/header.html index f430376..d2c8121 100644 --- a/themes/openpowerfoundation/layouts/partials/header.html +++ b/themes/openpowerfoundation/layouts/partials/header.html @@ -33,13 +33,14 @@ {{ $promo := resources.Get "css/promo.scss" | resources.Minify }} {{ $home := resources.Get "css/home.scss" | resources.Minify }} {{ $groups := resources.Get "css/groups.scss" | resources.Minify }} + {{ $bod := resources.Get "css/bod.scss" | resources.Minify }} {{ $timeline := resources.Get "css/timeline.scss" | resources.Minify }} {{ $pages := resources.Get "css/pages.scss" | resources.Minify }} {{ $footer := resources.Get "css/footer.scss" | resources.Minify }} - {{ $changelog := resources.Get "css/changelog.scss" | resources.Minify }} - {{ $scss := slice $variables $header $promo $home $groups $timeline $pages $footer $changelog | resources.Concat "css/custom.scss" }} - {{ $css := $scss | toCSS (dict "targetPath" "css/custom.min.css" "outputStyle" "compressed" "enableSourceMap" true) }} - + {{ $changelog := resources.Get "css/changelog.scss" | resources.Minify }} + {{ $scss := slice $variables $header $promo $home $groups $bod $timeline $pages $footer $changelog | resources.Concat "css/custom.scss" }} + {{ $css := $scss | toCSS (dict "targetPath" "css/custom.min.css" "outputStyle" "compressed" "enableSourceMap" true) }} + diff --git a/themes/openpowerfoundation/layouts/partials/navbar.html b/themes/openpowerfoundation/layouts/partials/navbar.html index dbe50d0..7ae597b 100644 --- a/themes/openpowerfoundation/layouts/partials/navbar.html +++ b/themes/openpowerfoundation/layouts/partials/navbar.html @@ -59,14 +59,13 @@ {{ end }} {{ end }}
  •  Contact
    • -
  •  Member Login
    • - +
    Join
    @@ -77,15 +76,19 @@
    - -
    - Join
    -
    +
    + Join +
    + +
    \ No newline at end of file diff --git a/themes/openpowerfoundation/layouts/steeringcommittee/list.html b/themes/openpowerfoundation/layouts/steeringcommittee/list.html index 7814803..ba17132 100644 --- a/themes/openpowerfoundation/layouts/steeringcommittee/list.html +++ b/themes/openpowerfoundation/layouts/steeringcommittee/list.html @@ -7,7 +7,7 @@
    -

    {{ .Title }}

    +

    {{ .Title }}

    {{ .Content }}

    @@ -17,7 +17,7 @@
    -

    {{ .Title }}

    +

    {{ .Title }}

    ({{ .Param "position" }})
    {{ $personfile := .File.BaseFileName }} @@ -74,7 +74,7 @@
    -

    {{ .Title }}

    ({{ $wgname }})
    +

    {{ .Title }}

    ({{ $wgname }})
    {{ $member := .Param "member" }} {{ range where .Site.RegularPages "Section" "members" }}