From 22293d99ddc74c1842fbc4b67ca36090bfda9c37 Mon Sep 17 00:00:00 2001 From: Zhou Fang Date: Tue, 22 Feb 2022 11:48:52 -0500 Subject: [PATCH 1/2] Added header menu and news page --- config.toml | 22 +++++++++++++++-- content/news/_index.md | 33 +++++++++++++++++++++++++ js/templates/event-list-format.mustache | 14 +++++++++++ js/templates/news-home.mustache | 11 +++++++++ less/styles.less | 2 +- 5 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 content/news/_index.md create mode 100644 js/templates/event-list-format.mustache create mode 100644 js/templates/news-home.mustache diff --git a/config.toml b/config.toml index 0ec6226..d4fea9c 100644 --- a/config.toml +++ b/config.toml @@ -25,7 +25,8 @@ pluralizeListTitles = false featured_content_publish_target = "aice" # container = "container-fluid" linkedin_url = "https://www.linkedin.com/company/eclipse-foundation" - header_left_classes = "col-md-8" + header_left_classes = "col-md-6" + main_menu_wrapper_classes = "col-md-18 margin-top-5" [taxonomies] category = "categories" @@ -48,4 +49,21 @@ pluralizeListTitles = false [blackfriday] plainIDAnchors = true - hrefTargetBlank = true \ No newline at end of file + hrefTargetBlank = true + +[[menu.main]] + name = "News & Events" + url = "/news" + weight = 1 + +[[menu.main]] + name = "Resources" + url = "/resources" + weight = 2 + identifier = "resources" + +[[menu.main]] + name = "Articles" + url = "/articles" + weight = 1 + parent = "resources" \ No newline at end of file diff --git a/content/news/_index.md b/content/news/_index.md new file mode 100644 index 0000000..a173b33 --- /dev/null +++ b/content/news/_index.md @@ -0,0 +1,33 @@ +--- +title: "News & Events" +seo_title: "News & Events - AICE" +headline: "News & Events" +description: "" +keywords: ["AICE"] +--- + +{{< grid/section-container class="featured-news">}} + {{< grid/div class="row" isMarkdown="false" >}} + {{< grid/div class="col-sm-12" isMarkdown="false" >}} + {{< newsroom/news + title="News" + id="news-list-container" + publishTarget="aice" + count="5" + class="col-sm-24" + templateId="custom-news-template" templatePath="/js/templates/news-home.mustache" + paginate="true" >}} + {{}} + + {{< grid/div class="col-sm-12 featured-events text-center" isMarkdown="false" >}} + {{< newsroom/events + title="Upcoming Events" + publishTarget="aice" + class="col-sm-24" + containerClass="event-timeline" + upcoming="1" + templateId="custom-events-template" templatePath="js/templates/event-list-format.mustache" + count="4" includeList="true" >}} + {{}} + {{}} +{{}} diff --git a/js/templates/event-list-format.mustache b/js/templates/event-list-format.mustache new file mode 100644 index 0000000..a37be4b --- /dev/null +++ b/js/templates/event-list-format.mustache @@ -0,0 +1,14 @@ +{{#events}} +
+

{{ date }}

+

+ {{#infoLink}} + {{ title }} + {{/infoLink}} + {{^infoLink}} + {{ title }} + {{/infoLink}} +

+

{{ description }}

+
+{{/events}} diff --git a/js/templates/news-home.mustache b/js/templates/news-home.mustache new file mode 100644 index 0000000..163c52a --- /dev/null +++ b/js/templates/news-home.mustache @@ -0,0 +1,11 @@ +{{#news}} +
+

+ + {{ title }} + +

+

{{ date }}

+

{{ body }}

+
+{{/news}} diff --git a/less/styles.less b/less/styles.less index d26f87d..69faad9 100644 --- a/less/styles.less +++ b/less/styles.less @@ -14,7 +14,7 @@ @import '~eclipsefdn-solstice-assets/less/quicksilver/styles.less'; @import '_variables.less'; -.header-wrapper-coming-soon { +.header-wrapper-coming-soon, .header-wrapper { background: #02154f top center; background-image: url(images/background.jpg); background-size: cover; -- GitLab From f491676aaef1c108af1c762da28d9b85b26ada8e Mon Sep 17 00:00:00 2001 From: Zhou Fang Date: Wed, 23 Feb 2022 10:08:19 -0500 Subject: [PATCH 2/2] Updated the style --- content/news/_index.md | 6 ++---- js/templates/news-home.mustache | 11 ----------- less/styles.less | 19 +++++++++++++------ 3 files changed, 15 insertions(+), 21 deletions(-) delete mode 100644 js/templates/news-home.mustache diff --git a/content/news/_index.md b/content/news/_index.md index a173b33..33cd152 100644 --- a/content/news/_index.md +++ b/content/news/_index.md @@ -1,12 +1,10 @@ --- title: "News & Events" seo_title: "News & Events - AICE" -headline: "News & Events" -description: "" keywords: ["AICE"] --- -{{< grid/section-container class="featured-news">}} +{{< grid/section-container class="featured-news margin-top-40">}} {{< grid/div class="row" isMarkdown="false" >}} {{< grid/div class="col-sm-12" isMarkdown="false" >}} {{< newsroom/news @@ -15,7 +13,7 @@ keywords: ["AICE"] publishTarget="aice" count="5" class="col-sm-24" - templateId="custom-news-template" templatePath="/js/templates/news-home.mustache" + templateId="custom-news-template" paginate="true" >}} {{}} diff --git a/js/templates/news-home.mustache b/js/templates/news-home.mustache deleted file mode 100644 index 163c52a..0000000 --- a/js/templates/news-home.mustache +++ /dev/null @@ -1,11 +0,0 @@ -{{#news}} -
-

- - {{ title }} - -

-

{{ date }}

-

{{ body }}

-
-{{/news}} diff --git a/less/styles.less b/less/styles.less index 69faad9..7b39d05 100644 --- a/less/styles.less +++ b/less/styles.less @@ -14,7 +14,8 @@ @import '~eclipsefdn-solstice-assets/less/quicksilver/styles.less'; @import '_variables.less'; -.header-wrapper-coming-soon, .header-wrapper { +.header-wrapper-coming-soon, +.header-wrapper { background: #02154f top center; background-image: url(images/background.jpg); background-size: cover; @@ -22,9 +23,9 @@ @media (min-width: @screen-md-min) { .website-coming-soon__container { - margin-bottom:10rem; - border:8px solid #fff; - padding-bottom:30px; + margin-bottom: 10rem; + border: 8px solid #fff; + padding-bottom: 30px; } } @@ -32,7 +33,13 @@ h2 { font-size: 24px; } - .hyper-link{ + .hyper-link { color: #a8d2e2; } -} \ No newline at end of file +} + +.featured-news { + h2 { + font-weight: 500; + } +} -- GitLab