Skip to content

Commit 9ed3bb4

Browse files
aleealee
authored
Merge pull request #452 from sgfost/sgci-ux-rework
merging via lazy consensus, thanks @sgfost !
2 parents 98182b1 + 9910add commit 9ed3bb4

File tree

10 files changed

+299
-46
lines changed

10 files changed

+299
-46
lines changed

‎assets/scss/_variables_project.scss‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ $white: #fff;
99
$black: #000;
1010
$orange: #ff9800;
1111
$primary: #18182b;
12-
$secondary: #f5fafd;
12+
$secondary: #03a9f4;
13+
$light: #f5fafd;
14+
$dark: #2F415B;
1315
$btn-primary: #03a9f4;
1416

1517
$font-weight-light: 200;

‎assets/scss/main.scss‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,49 @@ footer {
5454
}
5555
}
5656

57+
.td-toc a {
58+
font-size: 0.9rem;
59+
font-weight: normal;
60+
line-height: 1.35;
61+
padding-bottom: 0.5rem;
62+
}
63+
64+
// active page indicator
65+
.td-sidebar-nav-active-item {
66+
color: $primary;
67+
&:before {
68+
position: relative;
69+
left: -0.5rem;
70+
content: "";
71+
border-left: 3px solid $btn-primary;
72+
margin-left: -3px;
73+
}
74+
}
75+
76+
// normalize links that appear to be top-level regardless of whether they are
77+
// one page or a section with 1 index page
78+
.td-sidebar-nav .td-sidebar-link__page {
79+
font-weight: 400;
80+
color: #222;
81+
line-height: 1.35;
82+
padding-bottom: 0.75rem;
83+
}
84+
85+
.td-sidebar-nav .td-sidebar-link__section {
86+
font-weight: 400;
87+
color: #222;
88+
line-height: 1.35;
89+
padding-bottom: 0.75rem;
90+
}
91+
92+
.foldable .td-sidebar-link {
93+
font-weight: 200;
94+
}
95+
96+
.td-search {
97+
width: 100%;
98+
}
99+
57100
// Adjust anchors vs the fixed menu.
58101
@include media-breakpoint-up(md) {
59102
.td-offset-anchor:target {

‎config.toml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,8 @@ offlineSearch = true
145145
# User interface configuration
146146
[params.ui]
147147
# Enable to show the side bar menu in its compact state.
148-
sidebar_menu_compact = true
148+
sidebar_menu_compact = false
149+
ul_show = 1
149150
# Set to true to disable breadcrumb navigation.
150151
breadcrumb_disable = false
151152
# Set to true to hide the sidebar search box (the top nav search box will still be displayed if search is enabled)
@@ -160,7 +161,7 @@ footer_about_disable = true
160161
# If you want this feature, but occasionally need to remove the "Feedback" section from a single page,
161162
# add "hide_feedback: true" to the page's front matter.
162163
[params.ui.feedback]
163-
enable = true
164+
enable = false
164165
# The responses that the user sees after clicking "yes" (the page was helpful) or "no" (the page was not helpful).
165166
yes = 'Glad to hear it! Please <a href="https://github.com/openmodelingfoundation/openmodelingfoundation.github.io/issues/new?projects=openmodelingfoundation/openmodelingfoundation.github.io/6&template=site-wide.md">tell us how we can improve</a>.'
166167
no = 'Sorry to hear that. Please <a href="https://github.com/openmodelingfoundation/openmodelingfoundation.github.io/issues/new?projects=openmodelingfoundation/openmodelingfoundation.github.io/6&template=site-wide.md">tell us how we can improve</a>.'

‎content/en/_index.html‎

Lines changed: 45 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,53 @@
33
linkTitle = "Open Modeling Foundation"
44
+++
55

6-
{{< blocks/cover image_anchor="bottom" color="primary" height="full" >}}
7-
<h1>The Open Modeling Foundation</h1>
8-
<h3 class="mb-3 pt-3 font-weight-light">Enabling next generation modeling of human and natural systems</h3>
9-
10-
<div class="mx-auto py-5">
11-
<a class="btn btn-lg btn-outline-light mr-3 mb-4" href="{{< relref "/about" >}}">
12-
About <i class="fas fa-info-circle ml-2"></i>
13-
</a>
14-
<a class="btn btn-lg btn-outline-light mr-3 mb-4" href="{{< relref "/governance" >}}">
15-
Organization & Governance <i class="fas fa-gavel ml-2"></i>
16-
</a>
17-
<a class="btn btn-lg btn-outline-light mb-4" href="{{< relref "/standards" >}}">
18-
Standards <i class="fas fa-lightbulb ml-2"></i>
19-
</a>
20-
<div class="mx-auto mt-5">
21-
{{< blocks/link-down color="info" >}}
6+
{{< blocks/section color="primary" >}}
7+
<div class="row justify-content-center mt-5 mb-3">
8+
<div class="col-md-10 col-lg-8 d-flex flex-column align-items-center">
9+
<img src="/images/logo.svg" alt="OMF Logo" class="w-50 img-fluid mb-5">
10+
<h3 class="font-weight-light text-center">
11+
The <b class="text-secondary">Open Modeling Foundation</b> is an alliance of modeling organizations that coordinates
12+
and administers a common, community developed body of <b>standards</b> and <b>best practices</b> among
13+
diverse communities of modeling scientists.
14+
</h3>
2215
</div>
23-
</div>
24-
25-
26-
{{< /blocks/cover >}}
27-
28-
29-
{{% blocks/lead color="white" %}}
30-
<div class="mx-auto">
31-
<h3 class="mt-5 font-weight-light text-left">The Open Modeling Foundation is an alliance of modeling organizations that coordinates and administers a common, community developed body of standards and best practices among diverse communities of modeling scientists.
32-
</h3>
33-
</div>
34-
{{% /blocks/lead %}}
35-
36-
{{< blocks/section color="secondary" >}}
37-
38-
{{% blocks/feature icon="fas fa-project-diagram" title="How to Participate" url="/contribute" url_text="How to contribute" %}}
39-
You can [contribute to OMF activities](/contribute/) as a representative of a member organization or
40-
as an individual in a [Working Group](/governance/working-groups/).
41-
{{% /blocks/feature %}}
42-
43-
{{% blocks/feature icon="fas fa-users" title="Community" url="/about/community" %}}
44-
The OMF community is committed to providing a welcoming, civil and constructive environment to improve modeling science.
45-
{{% /blocks/feature %}}
16+
</div>
17+
{{< /blocks/section >}}
4618

47-
{{% blocks/feature icon="fab fa-github" title="Latest updates" url="https://github.com/openmodelingfoundation/openmodelingfoundation.github.io" %}}
48-
Follow the latest in OMF developments on our [GitHub](https://github.com/openmodelingfoundation/openmodelingfoundation.github.io) repository and [GitHub discussion forums](https://github.com/openmodelingfoundation/openmodelingfoundation.github.io/discussions).
49-
{{% /blocks/feature %}}
19+
{{< blocks/section color="dark" >}}
20+
<div class="col-12 text-center mb-5"><h2><b>Standards</b></h2></div>
21+
{{% blocks/standard icon="fas fa-search" title="Accessibility" url="/standards/accessibility" %}}
22+
Support best practices for discovery and access to model code, documentation, and metadata.
23+
{{% /blocks/standard %}}
24+
25+
{{% blocks/standard icon="fas fa-book" title="Documentation" url="/standards/documentation" %}}
26+
Help others understand a model, replicate its results, reuse or extend it with a combination of narrative
27+
documentation protocols and visual diagrams that clearly and comprehensively describe the model, how it works, its
28+
assumptions and limitations, etc.
29+
{{% /blocks/standard %}}
30+
31+
{{% blocks/standard icon="fas fa-circle-nodes" title="Interoperability" url="/standards/interoperability" %}}
32+
Enable models to be composed or integrated into larger scale models while maintaining scientific rigor.
33+
{{% /blocks/standard %}}
34+
35+
{{% blocks/standard icon="fas fa-recycle" title="Reusability" url="/standards/reusability" %}}
36+
Facilitate reuse of high quality model code for reproducibility, replication, extension, and integration into larger
37+
scale models.
38+
{{% /blocks/standard %}}
39+
{{< /blocks/section >}}
5040

5141

42+
{{< blocks/section color="light" >}}
43+
{{% blocks/feature icon="fas fa-project-diagram" title="How to Participate" url="/contribute" url_text="How to contribute" %}}
44+
You can [contribute to OMF activities](/contribute/) as a representative of a member organization or
45+
as an individual in a [Working Group](/governance/working-groups/).
46+
{{% /blocks/feature %}}
47+
48+
{{% blocks/feature icon="fas fa-users" title="Community" url="/about/community" %}}
49+
The OMF community is committed to providing a welcoming, civil and constructive environment to improve modeling science.
50+
{{% /blocks/feature %}}
51+
52+
{{% blocks/feature icon="fab fa-github" title="Latest updates" url="https://github.com/openmodelingfoundation/openmodelingfoundation.github.io" %}}
53+
Follow the latest in OMF developments on our [GitHub](https://github.com/openmodelingfoundation/openmodelingfoundation.github.io) repository and [GitHub discussion forums](https://github.com/openmodelingfoundation/openmodelingfoundation.github.io/discussions).
54+
{{% /blocks/feature %}}
5255
{{< /blocks/section >}}

‎content/en/featured-background.jpg‎

-79.8 KB
Binary file not shown.

‎layouts/docs/baseof.html‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<!doctype html>
2+
<html itemscope itemtype="http://schema.org/WebPage" lang="{{ .Site.Language.Lang }}" class="no-js">
3+
<head>
4+
{{ partial "head.html" . }}
5+
</head>
6+
<body class="td-{{ .Kind }}{{ with .Page.Params.body_class }} {{ . }}{{ end }}">
7+
<header>
8+
{{ partial "navbar.html" . }}
9+
</header>
10+
<div class="container-fluid td-outer">
11+
<div class="td-main">
12+
<div class="row flex-xl-nowrap min-vh-100">
13+
<aside class="col-12 col-md-3 col-xl-2 td-sidebar d-print-none">
14+
{{ partial "sidebar.html" . }}
15+
</aside>
16+
<aside class="d-flex flex-column col-xl-2 td-sidebar-toc d-print-none">
17+
{{ partial "toc.html" . }}
18+
{{ partial "taxonomy_terms_clouds.html" . }}
19+
{{ partial "page-meta-links.html" . }}
20+
</aside>
21+
<main class="col-12 col-md-9 col-xl-8 pl-md-5" role="main">
22+
{{ partial "version-banner.html" . }}
23+
{{ if not .Site.Params.ui.breadcrumb_disable }}{{ partial "breadcrumb.html" . }}{{ end }}
24+
{{ block "main" . }}{{ end }}
25+
</main>
26+
</div>
27+
</div>
28+
{{ partial "footer.html" . }}
29+
</div>
30+
{{ partial "scripts.html" . }}
31+
</body>
32+
</html>

‎layouts/partials/page-meta-links.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
{{ $issueURL := (printf "%s/issues/new?%s" $gh_repo $queryString) }}
1414
{{ $github_discuss_category := ($.Param "github_discuss_category" | default "general") }}
1515

16-
<div class="td-page-meta ml-2 pb-1 pt-2 mb-0">
16+
<div class="td-page-meta ml-2 pb-1 pt-2 mb-0 mt-auto">
1717
{{ if $gh_repo }}
1818
{{ $discussionURL := (printf "%s/discussions/categories/%s" $gh_repo $github_discuss_category) }}
1919
{{ $newDiscussionURL := (printf "%s/discussions/new?category=%s" $gh_repo $github_discuss_category) }}

‎layouts/partials/toc.html‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{{ if not .Params.notoc -}}
2+
{{ with .TableOfContents -}}
3+
{{ if ne . `<nav id="TableOfContents"></nav>` -}}
4+
<p class="pb-2 border-bottom border-primary text-primary"><b>On this page</b></p>
5+
<div class="flex-grow-1 td-toc">
6+
{{ . }}
7+
</div>
8+
{{ end -}}
9+
{{ end -}}
10+
{{ end -}}

‎layouts/shortcodes/blocks/standard.html‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{{ $icon := .Get "icon" | default "fa-lightbulb" -}}
2+
{{ $url_text := .Get "url_text" -}}
3+
<div class="col-lg-3 col-sm-6 mb-5 mb-lg-0 text-center">
4+
<div class="mb-4 h1">
5+
<i class="{{ if not (or (hasPrefix $icon "fas ") (hasPrefix $icon "fab ")) }}fas {{ end }}{{ $icon }}"></i>
6+
</div>
7+
<h4 class="h3">
8+
{{- .Get "title" | markdownify -}}
9+
</h4>
10+
<div class="mb-0">
11+
{{ .Inner }}
12+
</div>
13+
{{ with .Get "url" }}<a class="btn btn-warning" href="{{ . }}">{{ with $url_text }}{{ $url_text }}{{ else }}{{ T "ui_read_more" }}{{ end }}</a>{{ end }}
14+
</div>

0 commit comments

Comments
 (0)