diff --git a/config/_default/menus.toml b/config/_default/menus.toml index 926908c..3b00584 100644 --- a/config/_default/menus.toml +++ b/config/_default/menus.toml @@ -1,7 +1,6 @@ [[navbar]] name = "About" identifier = "about" - url = "/about/" weight = -2000 [[navbar]] parent = "about" @@ -62,7 +61,6 @@ [[navbar]] name = "Technical" identifier = "resources" - url = "/resources/" weight = -1500 [[navbar]] parent = "resources" @@ -70,21 +68,9 @@ identifier = "technicalspecifications" url = "/specifications/" weight = -900 -[[navbar]] - parent = "resources" - name = "SIG Designs" - identifier = "referencedesigns" - url = "/resources/referencedesigns/" - weight = -800 [[navbar]] parent = "resources" name = "OpenPOWER Ready" identifier = "ready" url = "/ready/" weight = -700 -[[navbar]] - parent = "resources" - name = "OpenPOWER Cases Designs" - identifier = "usecases" - url = "/resources/usecases/" - weight = -600 diff --git a/content/groups/_index.md b/content/groups/_index.md index 39220aa..0d23ff7 100644 --- a/content/groups/_index.md +++ b/content/groups/_index.md @@ -3,7 +3,7 @@ title: 'Workgroup Overview' date: 2021-03-06 draft: false -promo-h1: At the foundation we have 2 different distinct types of working groups. +promo-h1: Our Working Groups promo-p1: A Technical Workgroup (TWG) is a workgroup that provides technical specifications and will help define next-generation of the specifications, definitions, and the compliance of these specifications with primary output being specification documents. promo-p2: A Special Integration Group (SIG) is a workgroup that provides an implementation of technical specifications with the goal to produce reference designs. A SIG will normally provide a reference design, a finished product, or help maintain project for direct usage. --- diff --git a/content/members/_index.md b/content/members/_index.md index b371fbc..b844e61 100644 --- a/content/members/_index.md +++ b/content/members/_index.md @@ -1,7 +1,5 @@ --- -title: "OpenPOWER Members" +title: 'Members' date: 2021-03-03 draft: false --- - - diff --git a/data/hub/additions.yaml b/data/hub/additions.yaml index 2ea9b75..4da30bd 100644 --- a/data/hub/additions.yaml +++ b/data/hub/additions.yaml @@ -1,3 +1,3 @@ -- name: "None" -- name: "FPGA" -- name: "GPU" +- name: 'FPGA' +- name: 'GPU' +- name: 'None' diff --git a/themes/openpowerfoundation/assets/css/bod.scss b/themes/openpowerfoundation/assets/css/bod.scss index 0ff0059..e69de29 100644 --- a/themes/openpowerfoundation/assets/css/bod.scss +++ b/themes/openpowerfoundation/assets/css/bod.scss @@ -1,3 +0,0 @@ -.post__article:nth-child(even) { - background-color: #f7f7f7; -} \ No newline at end of file diff --git a/themes/openpowerfoundation/assets/css/groups.scss b/themes/openpowerfoundation/assets/css/groups.scss index 26acff8..94ef219 100644 --- a/themes/openpowerfoundation/assets/css/groups.scss +++ b/themes/openpowerfoundation/assets/css/groups.scss @@ -14,7 +14,24 @@ main { @media screen and (min-width: $xl) { padding-bottom: 50px; } - + .post__thumb { + width: 40px; + height: 40px; + position: absolute; + left: 35px; + top: 33px; + } + .post__title { + display: block; + margin-top: 1em; + padding-left: 70px; + padding-right: 30px; + white-space: normal; + font-size: 18px; + min-height: 75px; + text-align: left; + line-height: 1.2; + } } } @@ -25,4 +42,38 @@ main { font-size: 2rem; } } +} + +#workgroupsingle { + .details { + ul { + list-style-type: none; + padding-left: 0; + } + > ul { + list-style-type: none; + padding-left: 0; + > li { + margin-bottom: 6px; + background-color: #f7f7f7; + padding: 10px 6px; + > ul { + background-color: white; + padding: 10px 6px; + > li { + padding: 5px; + > ul {; + display: flex; + flex-wrap: wrap; + border-left: 2px solid #f7f7f7; + > li { + flex: 1 0 50%; + padding: 5px; + } + } + } + } + } + } + } } \ No newline at end of file diff --git a/themes/openpowerfoundation/assets/css/header.scss b/themes/openpowerfoundation/assets/css/header.scss index ef49941..1c5202f 100644 --- a/themes/openpowerfoundation/assets/css/header.scss +++ b/themes/openpowerfoundation/assets/css/header.scss @@ -178,69 +178,61 @@ body { // Desktop navigation responsive - .header__menu-item { - @media screen and (min-width: $lg) { - font-size: 83%; - } - - &.menu-has-children { - ul { - width:300px; - margin-top:1.6vw; - list-style: none; - border-top: none; - 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); - - li { - padding:10px 0; - border: none; - - @media screen and (min-width: $lg) { - font-size: 100%; - } - - a { - border: none; - text-align:left; +.header__menu-item { + @media screen and (min-width: $lg) { + font-size: 83%; + } + &.menu-has-children { + ul { + width:300px; + margin-top:1.6vw; + list-style: none; + border-top: none; + border-bottom: 1px solid #e8e8e8; + border-right: 1px solid #e8e8e8; + border-left: 1px solid #e8e8e8;; + @media screen and (min-width: $lg) { + margin-top: 0.5em; + } + li { + padding:10px 0; + border: none; + @media screen and (min-width: $lg) { + font-size: 100%; + } - &:before, &:after { - display: none; - } - padding-left:15px; - } - } - } - } - } + a { + border: none; + text-align:left; + &:before, &:after { + display: none; + } + padding-left:15px; + } + } + } + } + } - .header__logo { - img { - @media screen and (max-width: $lg) { - max-width:200px; - height: auto; - } - - @media screen and (min-width:$lg) and (max-width: $xl) { - max-width:120px; - height: auto; - } + .header__logo { + img { + @media screen and (max-width: $lg) { + max-width:200px; + height: auto; + } - @media screen and (min-width:$xl) and (max-width: $xxl) { + @media screen and (min-width:$lg) and (max-width: $xl) { max-width:120px; height: auto; - } - - } - } + } + @media screen and (min-width:$xl) and (max-width: $xxl) { + max-width:120px; + height: auto; + } + } + } } // Mobile navigation: mobile and desktop visibility @@ -248,10 +240,10 @@ body { .mobile-view-social-join { @media screen and (min-width: $lg) { display: none; - } - } + } +} - .social__list { +.social__list { align-items: center; justify-content: center; @@ -266,11 +258,11 @@ body { } } - &.mobile-view { - display: flex; - align-items: center; - justify-content: center; - } + &.mobile-view { + display: flex; + align-items: center; + justify-content: center; + } } .join-us-button, diff --git a/themes/openpowerfoundation/assets/css/home.scss b/themes/openpowerfoundation/assets/css/home.scss index 55bfbf6..1599292 100644 --- a/themes/openpowerfoundation/assets/css/home.scss +++ b/themes/openpowerfoundation/assets/css/home.scss @@ -1,29 +1,28 @@ +.home.promo__section { + min-height: 820px; +} main { &.home { - @media screen and (max-width: $lg) { - padding-top:50px; - padding-bottom: 0; - } + @media screen and (max-width: $lg) { + padding-top:50px; + padding-bottom: 0; + } - @media screen and (min-width: $lg) and (max-width: $xl) { - padding-top:70px; + @media screen and (min-width: $lg) and (max-width: $xl) { + padding-top:70px; + } } - } } .post__article { position: relative; - &:not(:last-child) { - margin-bottom: 3.75rem; - } + &:not(:last-child) { + margin-bottom: 3.75rem; + } } .post__title { display: block; margin-top: 1em; - color: black; - &:hover{ - color: black; - } &::before { position: absolute; left: 0; @@ -47,10 +46,6 @@ main { @media screen and (min-width: $lg) and (max-width: $xl) { padding: 4.4rem 0; } - - a { - color: black; - } } &._navy { background-color: #acc8fa; diff --git a/themes/openpowerfoundation/assets/css/main.css b/themes/openpowerfoundation/assets/css/main.css index 1054be2..429ceb9 100644 --- a/themes/openpowerfoundation/assets/css/main.css +++ b/themes/openpowerfoundation/assets/css/main.css @@ -1848,7 +1848,7 @@ textarea.form-control-lg { background-color: transparent; border: 2px solid transparent; padding: 0.75rem 2.5rem; - font-size: 1.25rem; + font-size: 1rem; border-radius: 0.25rem; transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; } @media (prefers-reduced-motion: reduce) { @@ -4939,7 +4939,7 @@ textarea.form-control-lg { .d-print-none { display: none !important; } } -#main { +#main:not(.groups) { padding-top: 140px; } .main { diff --git a/themes/openpowerfoundation/assets/css/pages.scss b/themes/openpowerfoundation/assets/css/pages.scss index 341c0ff..f8bc31a 100644 --- a/themes/openpowerfoundation/assets/css/pages.scss +++ b/themes/openpowerfoundation/assets/css/pages.scss @@ -37,6 +37,8 @@ color: black; min-height: 110px; text-align: center; display: flex; + justify-content: center; + align-items: center; a { text-decoration: none; color:black; @@ -52,126 +54,171 @@ color: black; // Events .events { - .post__article:not(:last-child) { - margin-bottom: 1.75rem; - } + .post__article:not(:last-child) { + margin-bottom: 1.75rem; + } } // Join .join { - .membership-data { + .membership-data { - table { - margin:auto; - width:100%; + table { + margin:auto; + width:100%; - tr { + tr { - td { - padding: 10px; - } + td { + padding: 10px; + } - &:nth-child(odd) { - background-color: $white; - } + &:nth-child(odd) { + background-color: $white; + } - &:nth-child(even) { - background-color: $lightgrey; - } - - th { - padding: 10px; - background-color: #dfecf5; + &:nth-child(even) { + background-color: $lightgrey; + } - &:nth-of-type(1) { - width: 20%; - } - &:nth-of-type(2) { - width: 15%; - } + th { + padding: 10px; + background-color: #dfecf5; - &:nth-of-type(3) { - width: 25%; - } + &:nth-of-type(1) { + width: 20%; + } + &:nth-of-type(2) { + width: 15%; + } - &:nth-of-type(4) { - width: 35%; - } - + &:nth-of-type(3) { + width: 25%; } - } - } + &:nth-of-type(4) { + width: 35%; + } + } } + } +} - .benefits-data { +.benefits-data { - table { - margin:auto; - width:100%; + table { + margin:auto; + width:100%; - tr { + tr { - td { - padding:10px; - position: relative; + td { + padding:10px; + position: relative; - span { - position: absolute; - width: 225px; - display: block; - top: 10px; - left: 10px; - } - } + span { + position: absolute; + width: 225px; + display: block; + top: 10px; + left: 10px; + } + } - &:nth-child(odd) { - background-color: $white; - } + &:nth-child(odd) { + background-color: $white; + } - &:nth-child(even) { - background-color: $lightgrey; - } + &: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%; - } + 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(5) { + width: 8%; + } - &:nth-of-type(6) { - width: 8%; + &:nth-of-type(6) { + width: 8%; + } + } } - - } - - } + } + } +} - - } - } +// Board of Directors +main.boardofdirectors { + .post__article { + &:nth-child(even), + &.bg { + background-color: #f7f7f7; + } + } +} +// Steering comittee +section#steeringcomittee { + #person { + #person-header { + position: absolute; + } + img { + width: 100%; + max-width: 100%; + position: relative; + top: 15px; + } + } + .post__article { + &:nth-child(even), + &.bg { + background-color: #f7f7f7; + } + } +} +// hubproviders + +#hubproviders { + #hubprovider { + display: flex; + align-items: center; + min-height: 100px; + a { + white-space: normal; + line-height: 1.2; + font-size: 18px; + min-width: 100%; + } + } + form { + .form-control { + font-size: 14px; + } + } } + diff --git a/themes/openpowerfoundation/assets/css/promo.scss b/themes/openpowerfoundation/assets/css/promo.scss index 8482727..13ba28e 100644 --- a/themes/openpowerfoundation/assets/css/promo.scss +++ b/themes/openpowerfoundation/assets/css/promo.scss @@ -1,7 +1,7 @@ .promo { &__section { position: relative; - min-height: 820px; + padding-top: 150px; @media screen and (max-width: $lg) { min-height:460px; } @@ -26,6 +26,7 @@ } &__container { position: relative; + margin-bottom: 70px; @media screen and (max-width: $lg) { padding-top:17.5vw; } diff --git a/themes/openpowerfoundation/layouts/boardofdirectors/list.html b/themes/openpowerfoundation/layouts/boardofdirectors/list.html index d5ce964..3460586 100644 --- a/themes/openpowerfoundation/layouts/boardofdirectors/list.html +++ b/themes/openpowerfoundation/layouts/boardofdirectors/list.html @@ -6,7 +6,7 @@

{{ .Title }}

{{ range .Data.Pages.ByWeight }} -
+
{{ $personfile := .File.BaseFileName }} {{ range where .Site.Pages "Section" "persons" }} diff --git a/themes/openpowerfoundation/layouts/groups/list.html b/themes/openpowerfoundation/layouts/groups/list.html index ef500c2..6befb59 100644 --- a/themes/openpowerfoundation/layouts/groups/list.html +++ b/themes/openpowerfoundation/layouts/groups/list.html @@ -12,12 +12,14 @@ {{ $imagelocation := (printf "%s/%s" "images/" $imagename) }} {{ $imageresource := resources.Get $imagelocation }}
- {{ if $imageresource }} -
+ {{ if $imageresource }} +
{{ $image := $imageresource.Fit "390x390" }} +
{{ end }} -
{{ .Title }} + + {{ .Title }}
{{ end }} diff --git a/themes/openpowerfoundation/layouts/groups/single.html b/themes/openpowerfoundation/layouts/groups/single.html index 5906d83..f79a6d1 100644 --- a/themes/openpowerfoundation/layouts/groups/single.html +++ b/themes/openpowerfoundation/layouts/groups/single.html @@ -5,134 +5,133 @@
-
-
-
-
-

{{ .Title }}

- +
+
+
+
+

{{ .Title }}

+ +
-
-
-
 
-
-
    -
  • Workgroup Details : +
    +
    + {{ if .Content }} + {{ .Content }} + {{ else }} +   + {{ end }} +
    +
      - {{ if .Param "chair" }} -
    • Chair :
        - {{ range (.Param "chair") }} - {{ $chairfile := printf "%s/%s" "persons" . }} - {{ with $.Site.GetPage $chairfile }} -
      • {{ .Title }} - {{ if .Param "member" }} - {{ $memberfile := printf "%s/%s" "members" (.Param "member") }} - {{ with $.Site.GetPage $memberfile }} - ({{ .Title }}) +
      • Workgroup Details : +
          + {{ if .Param "chair" }} +
        • Chair :
            + {{ range (.Param "chair") }} + {{ $chairfile := printf "%s/%s" "persons" . }} + {{ with $.Site.GetPage $chairfile }} +
          • {{ .Title }} + {{ if .Param "member" }} + {{ $memberfile := printf "%s/%s" "members" (.Param "member") }} + {{ with $.Site.GetPage $memberfile }} + ({{ .Title }}) + {{ end }} {{ end }} + {{ end }} +
            • {{ end }} - {{ end }} - +
          • {{ end }} -
        • - {{ end }} - {{ if .Param "wgtype" }} - {{ $data := index $.Site.Data }} - {{ $wgtype := .Param "wgtype" }} - {{ range $data.workgroups }} - {{ if eq $wgtype .id }} -
      • Type : {{ .name }}
        • + {{ if .Param "wgtype" }} + {{ $data := index $.Site.Data }} + {{ $wgtype := .Param "wgtype" }} + {{ range $data.workgroups }} + {{ if eq $wgtype .id }} +
      • Type : {{ .name }}
        • + {{ end }} {{ end }} {{ end }} - {{ end }} - {{ if .Param "participation" }} -
      • - Participation : {{ .Param "participation" }} - {{ if eq (.Param "participation") "Public" }} - - {{ end }} - {{ if eq (.Param "participation") "Members" }} - - {{ end }} - {{ if eq (.Param "participation") "Limited" }} - - {{ end }} -
        • - {{ end }} -
      -
      • -
    • Workgroup Resources : -
        - {{ if .Param "discussion" }} -
      • Discussion
        • - {{ end }} - {{ if .Param "meetingminutes" }} -
      • Meeting Minutes
        • - {{ end }} - {{ if .Param "calendar" }} -
      • Calendar :
        • - {{ end }} - {{ if .Param "git" }} -
      • Git SCM
        • - {{ end }} - {{ if .Param "chat" }} -
      • Chat
          -
        • OPF Chat
          • - {{ if .Param "chat.slack" }} -
        • OPF Slack
          • - {{ end }} - {{ if .Param "chat.irc" }} -
        • {{ .Param "chat.irc" }}
          • - {{ end }} -
        • - {{ end }} - {{ if .Param "files" }} -
      • Files
        • - {{ end }} - {{ if .Param "kanban" }} -
      • Kanban
        • - {{ end }} -
      - {{ if .Param "members" }} -
    • Active Voting Work Group Members : - +
      • +
    • Workgroup Resources : +
        + {{ if .Param "discussion" }} +
      • Discussion
        • + {{ end }} + {{ if .Param "meetingminutes" }} +
      • Meeting Minutes
        • + {{ end }} + {{ if .Param "calendar" }} +
      • Calendar :
        • + {{ end }} + {{ if .Param "git" }} +
      • Git SCM
        • + {{ end }} + {{ if .Param "chat" }} +
      • Chat
          +
        • OPF Chat
          • + {{ if .Param "chat.slack" }} +
        • OPF Slack
          • + {{ end }} + {{ if .Param "chat.irc" }} +
        • {{ .Param "chat.irc" }}
          • + {{ end }} +
        • + {{ end }} + {{ if .Param "files" }} +
      • Files
        • + {{ end }} + {{ if .Param "kanban" }} +
      • Kanban
        • + {{ end }} +
      + {{ if .Param "members" }} +
    • Active Voting Work Group Members : + +
      • {{ end }}
    -
    • - {{ end }} -
-
-
- {{ if .Content }} - {{ .Content }} - {{ else }} -   - {{ end }} +
+
 
-
 
-
diff --git a/themes/openpowerfoundation/layouts/hub/list.html b/themes/openpowerfoundation/layouts/hub/list.html index 3ca59ab..aa15348 100644 --- a/themes/openpowerfoundation/layouts/hub/list.html +++ b/themes/openpowerfoundation/layouts/hub/list.html @@ -6,19 +6,26 @@
-
-
-

{{ .Title }}

+
+
+

{{ .Title }}

- {{ .Content }} +
+
+ {{ .Content }} +
+
-
- {{ range .Data.Pages }} -
- {{ .Title }} +
+
+
+ {{ range .Data.Pages }} +
+ {{ .Title }}
- {{ end }} + {{ end }} +
diff --git a/themes/openpowerfoundation/layouts/hub/single.html b/themes/openpowerfoundation/layouts/hub/single.html index 367a990..7bf3fde 100644 --- a/themes/openpowerfoundation/layouts/hub/single.html +++ b/themes/openpowerfoundation/layouts/hub/single.html @@ -8,11 +8,11 @@
-

{{ .Title }}

+

{{ .Title }}

-
+
{{ if .Param "member" }} Provider : {{ $member := .Param "member" }} @@ -37,7 +37,7 @@ {{ end }} {{ end }}
-
+
{{ if .Param "provides" }} Provides following OPF HUB resources : {{ else }} @@ -69,10 +69,8 @@
Join
-
-
diff --git a/themes/openpowerfoundation/layouts/steeringcommittee/list.html b/themes/openpowerfoundation/layouts/steeringcommittee/list.html index ba17132..6f38d48 100644 --- a/themes/openpowerfoundation/layouts/steeringcommittee/list.html +++ b/themes/openpowerfoundation/layouts/steeringcommittee/list.html @@ -4,49 +4,53 @@
-
+
-
+

{{ .Title }}

{{ .Content }}

{{ range .Data.Pages.ByWeight }} -
+
+
+
+
+
+

{{ .Title }}

+ ({{ .Param "position" }}) +
+
-
-

{{ .Title }}

- ({{ .Param "position" }}) -
{{ $personfile := .File.BaseFileName }} {{ range where .Site.RegularPages "Section" "persons" }} - {{ $person := .File.BaseFileName }} - {{ if eq $personfile $person }} -
- {{ $member := .Param "member" }} - {{ range where .Site.RegularPages "Section" "members" }} - {{ $membercompany := .File.BaseFileName }} - {{ if eq $member $membercompany }} - - {{ if .Param "image" }} - {{ $imagename := .Param "image" }} - {{ $imagelocation := (printf "%s/%s" "images/members/" $imagename) }} - {{ $imageresource := resources.Get $imagelocation }} - {{ $image := $imageresource.Fit "100x100" }} - {{ .Title }} - {{ else }} - {{ .Title }} - {{ end }} - + {{ $person := .File.BaseFileName }} + {{ if eq $personfile $person }} +
+ {{ $member := .Param "member" }} + {{ range where .Site.RegularPages "Section" "members" }} + {{ $membercompany := .File.BaseFileName }} + {{ if eq $member $membercompany }} + + {{ if .Param "image" }} + {{ $imagename := .Param "image" }} + {{ $imagelocation := (printf "%s/%s" "images/members/" $imagename) }} + {{ $imageresource := resources.Get $imagelocation }} + {{ $image := $imageresource.Fit "100x100" }} + {{ .Title }} + {{ else }} + {{ .Title }} {{ end }} + {{ end }} -
+ {{ end }} +
-
+
{{ if .Param "image" }} {{ $imagename := .Param "image" }} {{ $imagelocation := (printf "%s/%s" "images/persons/" $imagename) }} @@ -62,6 +66,7 @@ {{ end }} {{ end }}
+
{{ end }}
@@ -71,46 +76,50 @@ {{ range $chairs }} {{ $chairfile := printf "%s/%s" "persons" . }} {{ with $.Site.GetPage $chairfile }} -
-
-
-

{{ .Title }}

({{ $wgname }})
-
- {{ $member := .Param "member" }} - {{ range where .Site.RegularPages "Section" "members" }} +
+ -
-
- {{ if .Param "image" }} - {{ $imagename := .Param "image" }} - {{ $imagelocation := (printf "%s/%s" "images/persons/" $imagename) }} - {{ $imageresource := resources.Get $imagelocation }} - {{ $image := $imageresource.Fit "100x400" }} - {{ .Title }} - {{ else }} -   - {{ end }} +
+
+ {{ if .Param "image" }} + {{ $imagename := .Param "image" }} + {{ $imagelocation := (printf "%s/%s" "images/persons/" $imagename) }} + {{ $imageresource := resources.Get $imagelocation }} + {{ $image := $imageresource.Fit "100x400" }} + {{ .Title }} + {{ else }} +   + {{ end }} +
+
+

{{ .Title }}

({{ $wgname }}) + {{ .Content }} +
-
{{ .Content }}
-
+
{{ end }} {{ end }} {{ end }}