diff --git a/themes/openpowerfoundation/assets/css/style.css b/themes/openpowerfoundation/assets/css/style.css index 03dda3e..225017a 100644 --- a/themes/openpowerfoundation/assets/css/style.css +++ b/themes/openpowerfoundation/assets/css/style.css @@ -35,7 +35,7 @@ h1, h2, h3, h4, h5, h6 { .back-to-top { position: fixed; display: none; - background: #ffffff; + background: #007aad; color: #fff; padding: 2px 20px 8px 20px; font-size: 16px; @@ -591,7 +591,12 @@ body.mobile-nav-active #mobile-nav-toggle { } #list { - font-size: 32px; + font-size: 18px; +} + +#list h1, h2, h3 { + font-size: 24px; + text-decoration: underline; } #list ul { list-style: none; @@ -607,6 +612,9 @@ body.mobile-nav-active #mobile-nav-toggle { #list ul li a:hover { background: #333333; } +#list table, tb, td { + border: 1px solid #000000; +} #about { padding: 60px 0; @@ -659,6 +667,57 @@ body.mobile-nav-active #mobile-nav-toggle { padding-bottom: 10px; } +#page { + padding: 60px 0; +} +#page .page-img { + height: 510px; + overflow: hidden; +} +#page .page-img img { + margin-left: -15px; + max-width: 100%; +} +@media (max-width: 768px) { + #page .page-img { + height: auto; + } + #page .page-img img { + margin-left: 0; + padding-bottom: 30px; + } +} +#page .content .h2 { + color: #333; + font-weight: 300; + font-size: 24px; +} +#page .content h3 { + color: #777; + font-weight: 300; + font-size: 18px; + line-height: 26px; + font-style: italic; +} +#page .content p { + line-height: 26px; +} +#page .content p:last-child { + margin-bottom: 0; +} +#page .content i { + font-size: 20px; + padding-right: 4px; + color: #1dc8cd; +} +#page .content ul { + list-style: none; + padding: 0; +} +#page .content ul li { + padding-bottom: 10px; +} + #features { background: #ffffff; padding: 60px 0 0 0; @@ -771,8 +830,9 @@ body.mobile-nav-active #mobile-nav-toggle { } #call-to-action { - background: linear-gradient(rgba(29, 200, 205, 0.65), rgba(29, 205, 89, 0.2)), url(../img/call-to-action-bg.jpg) fixed center center; - background-size: cover; + /*background: linear-gradient(rgba(29, 200, 205, 0.65), rgba(29, 205, 89, 0.2)), url(../img/call-to-action-bg.jpg) fixed center center;*/ + background-image: url(../img/call-to-action-bg.jpg); + background-repeat: repeat-x; padding: 40px 0; } #call-to-action .cta-title { @@ -781,6 +841,7 @@ body.mobile-nav-active #mobile-nav-toggle { font-weight: 700; } #call-to-action .cta-text { + font-size: 24px; color: #ffffff; } @media (min-width: 769px) { @@ -801,22 +862,25 @@ body.mobile-nav-active #mobile-nav-toggle { transition: background 0.5s; margin: 10px; border: 2px solid #ffffff; - color: #ffffff; + color: #000000; + background: #ffffff; } #call-to-action .cta-btn:hover { - background: #ff8800; - border: 2px solid #ff8800; + color: #ffffff; + background: #007aad; + border: 2px solid #007aad; } #more-features { padding: 60px 0 60px 0; } #more-features .box { - padding: 40px; - margin-bottom: 30px; + padding: 20px 20px 20px 20px; + margin-bottom: 20px; box-shadow: 0px 0px 30px rgba(73, 78, 92, 0.15); background: #fff; transition: 0.4s; + border-radius: 25px; } #more-features .icon { float: left; @@ -837,7 +901,7 @@ body.mobile-nav-active #mobile-nav-toggle { } */ #more-features h4 { - margin-left: 100px; + margin-left: 10px; font-weight: 700; margin-bottom: 15px; font-size: 18px; @@ -847,7 +911,7 @@ body.mobile-nav-active #mobile-nav-toggle { } #more-features p { font-size: 14px; - margin-left: 100px; + margin-left: 30px; margin-bottom: 0; line-height: 24px; } diff --git a/themes/openpowerfoundation/layouts/_default/list.html b/themes/openpowerfoundation/layouts/_default/list.html index 2f64431..2a39e4a 100644 --- a/themes/openpowerfoundation/layouts/_default/list.html +++ b/themes/openpowerfoundation/layouts/_default/list.html @@ -51,5 +51,8 @@ -{{ partial "footer.html" . }} +{{ if .Param "calltoaction" }} + {{ partial "calltoaction.html" . }} +{{ end }} +{{ partial "footer.html" . }} diff --git a/themes/openpowerfoundation/layouts/_default/single.html b/themes/openpowerfoundation/layouts/_default/single.html index 6915eab..817467f 100644 --- a/themes/openpowerfoundation/layouts/_default/single.html +++ b/themes/openpowerfoundation/layouts/_default/single.html @@ -3,51 +3,49 @@ {{ partial "navbar.html" . }}
-
-
-
-

{{ .Title }}

- -

-
-
- {{ if .Param "image" }} -
-

- {{ $imagefilename := .Param "image.file" }} - {{ $imagesize := .Param "image.size" }} - {{ $imagelocation := printf "%s/%s" "img" $imagefilename }} - {{ $imageresource := resources.Get $imagelocation }} - {{ if $imageresource }} - {{ $imagefile := $imageresource }} - {{ if $imagesize }} - {{ $imagefile = $imageresource.Resize $imagesize }} - {{ else }} - {{ $imagefile = $imageresource.Resize "750x750" }} - {{ end }} -

- -
+
+
+

{{ .Title }}

+ +

+
+
+ {{ if .Param "image" }} +
+

+ {{ $imagefilename := .Param "image.file" }} + {{ $imagesize := .Param "image.size" }} + {{ $imagelocation := printf "%s/%s" "img" $imagefilename }} + {{ $imageresource := resources.Get $imagelocation }} + {{ if $imageresource }} + {{ $imagefile := $imageresource }} + {{ if $imagesize }} + {{ $imagefile = $imageresource.Resize $imagesize }} + {{ else }} + {{ $imagefile = $imageresource.Resize "750x750" }} {{ end }} -

-
-
- {{ else }} -
 
-
- {{ end }} -

{{ .Content }}

- {{ if .Param "image" }} -
- {{ else }} -
-
 
- {{ end }} +
+ +
+ {{ end }} +

+
+ {{ else }} +
 
+
+ {{ end }} +

{{ .Content }}

+ {{ if .Param "image" }} +
+ {{ else }} +
+
 
+ {{ end }}
+
-
{{ partial "footer.html" . }} diff --git a/themes/openpowerfoundation/layouts/events/list.html b/themes/openpowerfoundation/layouts/events/list.html index c739a66..2858336 100644 --- a/themes/openpowerfoundation/layouts/events/list.html +++ b/themes/openpowerfoundation/layouts/events/list.html @@ -43,4 +43,17 @@ + + + + + + + + + + {{ partial "footer.html" . }} diff --git a/themes/openpowerfoundation/layouts/groups/list.html b/themes/openpowerfoundation/layouts/groups/list.html index a930742..61e5082 100644 --- a/themes/openpowerfoundation/layouts/groups/list.html +++ b/themes/openpowerfoundation/layouts/groups/list.html @@ -20,6 +20,7 @@
 
{{ end }} +
 
{{ range (.Data.Pages.ByParam "wgtype").Reverse }} {{ $color := "transparent" }} diff --git a/themes/openpowerfoundation/layouts/groups/single.html b/themes/openpowerfoundation/layouts/groups/single.html index 3ec3cbb..69c5131 100644 --- a/themes/openpowerfoundation/layouts/groups/single.html +++ b/themes/openpowerfoundation/layouts/groups/single.html @@ -10,57 +10,89 @@

{{ .Title }}

+
 
- Workgroup Details :
    - {{ if .Param "chair" }} - {{ $chairfile := printf "%s/%s" "persons" (.Param "chair") }} - {{ with $.Site.GetPage $chairfile }} -
  • Chair : {{ .Title }} - {{ if .Param "member" }} - {{ $memberfile := printf "%s/%s" "members" (.Param "member") }} - {{ with $.Site.GetPage $memberfile }} - ({{ .Title }}) +
  • Workgroup Details : +
      + {{ if .Param "chair" }} + {{ $chairfile := printf "%s/%s" "persons" (.Param "chair") }} + {{ with $.Site.GetPage $chairfile }} +
    • Chair : {{ .Title }} + {{ if .Param "member" }} + {{ $memberfile := printf "%s/%s" "members" (.Param "member") }} + {{ with $.Site.GetPage $memberfile }} + ({{ .Title }}) + {{ 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 .Param "participation" }} +
    • + Participation : {{ .Param "participation" }} + {{ if eq (.Param "participation") "Public" }} + + {{ end }} + {{ if eq (.Param "participation") "Members" }} + + {{ end }} + {{ if eq (.Param "participation") "Limited" }} + + {{ end }} +
      • + {{ end }} +
    • - {{ end }} - {{ if .Param "git" }} -
  • Git : {{ .Param "git" }}
    • - {{ end }} - {{ if .Param "discussion" }} -
  • Discussion : {{ .Param "discussion" }}
    • - {{ end }} - {{ if .Param "chat" }} -
  • Chat : {{ .Param "chat" }}
    • - {{ end }} -
-
-
+
  • Workgroup Resources : + {{ if .Param "members" }} - Active Voting Work Group Members :
    +
  • Active Voting Work Group Members :
      {{ range $member := .Param "members" }} {{ $memberfile := printf "%s/%s" "members" $member }} @@ -71,7 +103,7 @@ {{ $imagename := .Param "image" }} {{ $imagelocation := (printf "%s/%s" "images/members/" $imagename) }} {{ $imageresource := resources.Get $imagelocation }} - {{ $image := $imageresource.Fit "50x50" }} + {{ $image := $imageresource.Fit "75x75" }} {{ .Title }} {{ else }} {{ .Title }} @@ -81,22 +113,19 @@ {{ end }} {{ end }}
    +
    • {{ end }} + +
    +
    + {{ if .Content }} + {{ .Content }} + {{ else }} +   + {{ end }}
     
    -
    - -
    -
    -
    - {{ if .Content }} -
     
    -
    - {{ .Content }} -
    -
     
    - {{ end }}
    diff --git a/themes/openpowerfoundation/layouts/partials/footer.html b/themes/openpowerfoundation/layouts/partials/footer.html index 60c2fcd..5ae7557 100644 --- a/themes/openpowerfoundation/layouts/partials/footer.html +++ b/themes/openpowerfoundation/layouts/partials/footer.html @@ -60,6 +60,8 @@ + + diff --git a/themes/openpowerfoundation/layouts/partials/intro.html b/themes/openpowerfoundation/layouts/partials/intro.html index f9fd2d9..6f2e4d8 100644 --- a/themes/openpowerfoundation/layouts/partials/intro.html +++ b/themes/openpowerfoundation/layouts/partials/intro.html @@ -20,6 +20,29 @@
    +
    +

    Supporters of OpenPOWER

    + {{ range $.Site.Pages }} + {{ $level := .Param "level" }} + {{ if eq $level "platinum" }} +
    +
    + + {{ if .Param "image" }} + {{ $imagename := .Param "image" }} + {{ $imagelocation := (printf "%s/%s" "images/members/" $imagename) }} + {{ $imageresource := resources.Get $imagelocation }} + {{ $image := $imageresource.Fit "200x200" }} + {{ .Title }} + {{ else }} + {{ .Title }} + {{ end }} + +
    +
    + {{ end }} + {{ end }} +
    diff --git a/themes/openpowerfoundation/layouts/shortcodes/pretix.html b/themes/openpowerfoundation/layouts/shortcodes/pretix.html deleted file mode 100644 index 96c7950..0000000 --- a/themes/openpowerfoundation/layouts/shortcodes/pretix.html +++ /dev/null @@ -1,13 +0,0 @@ -{{ $eventorganizer := .Get "organizer" }} -{{ $eventcode := .Get "event" }} - -
    - -