Skip to content

Commit d1fd42e

Browse files
author
Douglas Perrien Fenstermacher
committed
FY23 redesign
1 parent 2abf8ea commit d1fd42e

File tree

213 files changed

+59515
-40449
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

213 files changed

+59515
-40449
lines changed

Diff for: _config.yml

+12-4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ release_number: LLNL-WEB-680594
77

88
url: "https://software.llnl.gov"
99
repo_url: "https://github.com/LLNL/llnl.github.io"
10+
baseurl: ""
11+
environment: production
12+
IM_NUMBER: LLNL-WEB-458451
13+
CONTACT: mailto:[email protected]
1014

1115
# LLNL Piwik Analytics https://analytics.llnl.gov
1216
piwik_id: 250
@@ -26,18 +30,22 @@ plugins:
2630
- jekyll-seo-tag
2731
- jekyll-feed
2832
- jekyll-sitemap
29-
- jekyll-remote-theme
3033

34+
markdown: kramdown
3135
kramdown:
3236
auto_ids: true
3337

3438
defaults:
39+
- scope:
40+
path: ""
41+
values:
42+
layout: default
3543
-
3644
scope:
3745
path: ""
3846
type: "posts"
3947
values:
40-
layout: "post"
48+
layout: "container-default"
4149
permalink: "/news/:year/:month/:day/:title/"
4250

4351
permalink: pretty
@@ -48,6 +56,6 @@ exclude:
4856
- Gemfile.lock
4957
- README.md
5058
- Makefile
51-
- build
52-
- visualize/README.md
5359
- notes.md
60+
- build
61+
- visualize/README.md

Diff for: _includes/additional_css.html

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<link rel="stylesheet" href="/assets/css/llnl-footer.css">
2+
<link rel="stylesheet" href="/assets/css/pygments.css">

Diff for: _includes/breadcrumbs.html

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<p class="llnl-breadcrumb fs-13 mb-50"><br /><a class="text-software-blue text-decoration-underline-hover llnl-breadcrumb-link fw-semibold" href="{{ site.baseurl }}/">Home</a>
2+
{% capture page_url_without_index_html %}{{ page.url | remove: "/index.html" }}{% endcapture %}
3+
{% assign splitted_url_parts = page_url_without_index_html | split: '/' %}
4+
{% capture forLoopMaxInt %}{{ splitted_url_parts.size | minus:1 }}{% endcapture %}
5+
{% for i in (1..forLoopMaxInt) %}
6+
{% assign isLast = forloop.last %}
7+
{% capture current_breadcrumb_url %}{{next_prepender}}/{{ splitted_url_parts[i] }}/index.html{% endcapture %}
8+
{% capture current_breadcrumb_md_url %}{{next_prepender}}/{{ splitted_url_parts[i] }}/{% endcapture %}
9+
{% capture next_prepender %}{{next_prepender}}/{{ splitted_url_parts[i] }}{% endcapture %}
10+
{% for breadcrumb_page in site.pages %}
11+
{% if current_breadcrumb_url == breadcrumb_page.url or current_breadcrumb_md_url == breadcrumb_page.url %}
12+
{% if i == forLoopMaxInt %}class="active"{% endif %}<i class="fa fa-regular fa-chevron-right text-carbon-gray ms-2"></i>
13+
{% capture breadcrumb_page_page_url_without_index_html %}{{ breadcrumb_page.url | remove: "index.html" }}{% endcapture %}
14+
<a class="text-software-blue llnl-breadcrumb-link ms-2 fw-semibold {% if isLast %} text-black text-decoration-none {% else %} text-decoration-underline-hover {% endif %}"{% unless isLast %} href="{{breadcrumb_page_page_url_without_index_html}}"{% endunless %}>{{breadcrumb_page.breadcrumb}}</a>
15+
{% endif %}
16+
{% endfor %}
17+
{% endfor %}
18+
</p>

Diff for: _includes/components/accordion.html

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{% assign slug = include.title | slugify %}
2+
<div class="accordion default" id="accordion-{{ slug }}">
3+
<div class="accordion-item">
4+
<p class="accordion-header" id="heading-{{ slug }}">
5+
<button class="accordion-button {% unless(include.open) %}collapsed{% endunless %}" type="button" data-bs-toggle="collapse" data-bs-target="#collapse-{{ slug }}" aria-expanded="{% if(include.open) %}true{% else %}false{% endif %}" aria-controls="collapse-{{ slug }}">
6+
{{ include.title }}
7+
</button>
8+
</p>
9+
<div id="collapse-{{ slug }}" class="accordion-collapse collapse {% if(include.open) %}show{% endif %}" aria-labelledby="heading-{{ slug }}" data-bs-parent="#accordion-{{ slug }}">
10+
<div class="accordion-body">
11+
{{ include.content }}
12+
</div>
13+
</div>
14+
</div>
15+
</div>

Diff for: _includes/components/alert.html

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<div class="alert alert-{{ include.type }} row mt-3 mb-5 py-4 border-0">
2+
{% if include.icon %}
3+
<div class="col-1 d-flex justify-content-center vertical-center" role="alert">
4+
<i class="fa fa-light {{ include.icon }} fa-2xl text-alert-{{ include.type }}-icon"></i>
5+
</div>
6+
{% endif %}
7+
<div class="{% if include.icon %}col-11{% else %}col-12{% endif %} text-start text-black">
8+
{{ include.content }}
9+
</div>
10+
</div>

Diff for: _includes/components/button.html

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<{{ include.tag | default: 'a' }} href="{{ include.url }}" class="btn btn-gradient text-white px-3 py-3">{% if include.icon %}<i class="fa {{ include.type | default: 'fa-regular' }} {{ include.icon }} me-2"></i>{% endif %}{{ include.content }}</{{ include.tag | default: 'a' }}>

Diff for: _includes/components/call-to-action.html

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<div class="row pt-4 pb-2 my-5 bg-livermorium-ice">
2+
{% if include.icon %}
3+
<div class="col-12 col-md-2 col-xxl-1 d-flex justify-content-center vertical-center pb-5 pt-3 py-md-0">
4+
<i class="fa {{ include.type | default: 'fa-regular' }} {{ include.icon }} fa-2xl"></i>
5+
</div>
6+
{% endif %}
7+
<div class="{% if include.icon %}col-12 col-md-10 col-xxl-11 ps-4{% else %}col-12{% endif %}">
8+
<h2 id="{{ include.title | slugify }}" class="mt-2 mb-4 text-center text-md-start">{{ include.title }}</h2>
9+
{{ include.content }}
10+
</div>
11+
</div>

Diff for: _includes/components/card.html

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<div class="llnl-link-card border-bottom-gradient-software-blue-green border-bottom-3 position-relative {{ include.classes }} p-3">
2+
<{{ include.tag | default: 'h3' }} class="text-center my-4 text-balance">{{ include.title }}</{{ include.tag | default: 'h3' }}>
3+
<hr class="border-carbon-gray border-2"/>
4+
<div class="mt-4 llnl-content">
5+
{{ include.content }}
6+
</div>
7+
</div>

Diff for: _includes/components/icon-header.html

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<div class="d-flex align-items-center mb-3">
2+
<i class="fa {{ include.type | default: 'fa-light' }} {{ include.icon }} {{ include.iconsize | default: 'fa-xl' }}"></i>
3+
<{{ include.tag | default: 'h2' }} class="ms-3 my-0">{{ include.title }}</{{ include.tag | default: 'h2' }}>
4+
</div>

Diff for: _includes/components/icon-list-item.html

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<a class="llnl-list-item d-flex align-items-center px-2 my-2 fs-14 fw-medium text-decoration-none text-black" href="{% if include.url %}{{ include.url }}{% endif %}{% unless include.url %}#{{ include.title | slugify }}{% endunless %}">
2+
<div class="icon me-3 d-flex align-items-center justify-content-center"><i class="fa fa-light {{ include.icon }} fa-lg"></i></div>
3+
<span>{{ include.title }}</span>
4+
</a>

Diff for: _includes/components/quick-link.html

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<a href="{{ include.url }}" class="llnl-quick-link row text-decoration-none mb-2 box-shadow-10 bg-light-blue-hover h-100">
2+
<div class="col-2 py-4 px-3 bg-gradient-software-blue-green-v d-flex justify-content-center vertical-center">
3+
<i class="text-white fa {{ include.type | default: 'fa-regular' }} {{ include.icon }} {{ include.icon_size | default: 'fa-lg' }}"></i>
4+
</div>
5+
<div class="llnl-content col-10 py-2 d-flex align-items-center text-black">
6+
<p class="ms-2 m-0">{{ include.title }}</p>
7+
</div>
8+
</a>

Diff for: _includes/components/tile.html

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<a class="tile px-2 text-decoration-none text-elemental-navy" href="{{ include.url }}">
2+
<div class="text-center px-2 pt-3">
3+
<img src="{{ include.image }}" />
4+
<p class="h3 mt-4">{{ include.title }}</p>
5+
<p class="text-start mt-3 fs-13">{{ include.description }}</p>
6+
</div>
7+
</a>

Diff for: _includes/footer.html

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<div class="footer-bottom">
2+
<div class="container">
3+
<div class="row">
4+
<div class="col-12 col-lg-6 mb-2">
5+
<div id="footer-logo">
6+
<a class="llnl" href="https://www.llnl.gov/" target="_blank"><img src="/assets/images/llnl-logo-dark.png" alt="LLNL"></a>
7+
</div>
8+
<div id="footer-text">
9+
<div id="footer-text-name">Lawrence Livermore National Laboratory </div>
10+
<div id="footer-text-address">
11+
<span class="hidden-xs">&nbsp;|</span>
12+
7000 East Avenue • Livermore, CA 94550 | {{ site.IM_NUMBER }}
13+
</div>
14+
15+
<div id="footer-text-info">
16+
Operated by the Lawrence Livermore National Security, LLC for the Department of Energy's National Nuclear Security Administration Learn about the Department of Energy's <a href="https://doe.responsibledisclosure.com/hc/en-us" target="_blank" rel="noopener noreferrer">Vulnerability Disclosure Program</a>
17+
</div>
18+
</div>
19+
</div>
20+
21+
<div class="col-12 col-md-6 col-xl-3" id="footer-affiliates">
22+
<a class="llns" href="http://www.llnsllc.com/" target="_blank" rel="noopener noreferrer"><img src="/assets/images/llns.png" alt="LLNS"></a>
23+
<a class="doe" href="https://www.energy.gov/" target="_blank" rel="noopener noreferrer"><img src="/assets/images/doe_small.png" alt="U.S. DOE"></a>
24+
<a class="nnsa" href="https://www.energy.gov/nnsa/national-nuclear-security-administration/" target="_blank" rel="noopener noreferrer"><img src="/assets/images/nnsa.png" alt="NNSA"></a>
25+
</div>
26+
27+
<div class="col-12 col-md-6 col-xl-3" id="footer-links">
28+
<div class="disclaimer">
29+
<a href="/">Home</a>
30+
<a href="https://www.llnl.gov/disclaimer">Disclaimer</a>
31+
<a href="https://www.llnl.gov/website-privacy-notice">Privacy</a>
32+
</div>
33+
</div>
34+
</div>
35+
</div>
36+
</div>

Diff for: _includes/google_analytics.html

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{% if site.environment == 'production' and site.google_analytics.tracking_id %}
2+
<script>
3+
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
4+
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
5+
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
6+
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
7+
ga('create', '{{ site.google_analytics.tracking_id }}', 'auto');
8+
ga('send', 'pageview');
9+
</script>
10+
{% endif %}

Diff for: _includes/head.html

+26-29
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,31 @@
1-
<head>
2-
3-
<!-- Global site tag (gtag.js) - Google Analytics -->
4-
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-75179431-1"></script>
5-
<script>
1+
{% if site.environment == 'production' %}
2+
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-75179431-1"></script>
3+
<script>
64
window.dataLayer = window.dataLayer || [];
75
function gtag(){dataLayer.push(arguments);}
86
gtag('js', new Date());
97

108
gtag('config', 'UA-75179431-1');
11-
</script>
12-
13-
<meta charset="utf-8">
14-
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
15-
<meta name="viewport" content="width=device-width, initial-scale=1.0">
16-
17-
<link rel="shortcut icon" href="/assets/images/OS-icon-color.png">
18-
19-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" media="screen">
20-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" media="screen">
21-
22-
<link rel="stylesheet" href="/css/main.css" media="screen">
23-
<link rel="stylesheet" href="https://cdn.llnl.gov/onelab/0.1.1/css/onelab.css" media="screen">
24-
25-
<meta name="twitter:card" content="summary" />
26-
<meta name="twitter:site" content="@llnl_opensource" />
27-
<meta name="twitter:title" content="LLNL Software Catalog" />
28-
<meta name="twitter:description" content="Software available from LLNL." />
29-
<meta name="twitter:image" content="https://cdn.llnl.gov/onelab/0.1.1/images/llnl-logo-blue-128x128.jpg" aria-label="LLNL logo" />
30-
31-
<meta name="google-site-verification" content="477TVoInt3HiUgSl_hU4rb5_JrgNMKK5Rl-KPMUClpQ" />
32-
33-
{% seo %}
34-
</head>
9+
</script>
10+
{% else %}
11+
<meta name="robots" content="noindex">
12+
{% endif %}
13+
<meta charset="UTF-8">
14+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
15+
<link rel="shortcut icon" href="/assets/images/OS-icon-color.png">
16+
<link rel="icon" href="/assets/images/logomark-software.svg" />
17+
<link rel="stylesheet" href="/assets/css/bootstrap.min.css" />
18+
<link rel="stylesheet" href="/assets/css/llnl-header.css" />
19+
<link rel="stylesheet" href="/assets/css/utility.css" />
20+
<link rel="stylesheet" href="/assets/css/components.css" />
21+
<script src="https://kit.fontawesome.com/87728a7429.js" crossorigin="anonymous" async></script>
22+
23+
<meta name="twitter:card" content="summary" />
24+
<meta name="twitter:site" content="@llnl_opensource" />
25+
<meta name="twitter:title" content="LLNL Software Catalog" />
26+
<meta name="twitter:description" content="Software available from LLNL." />
27+
<meta name="twitter:image" content="https://cdn.llnl.gov/onelab/0.1.1/images/llnl-logo-blue-128x128.jpg" aria-label="LLNL logo" />
28+
29+
<meta name="google-site-verification" content="477TVoInt3HiUgSl_hU4rb5_JrgNMKK5Rl-KPMUClpQ" />
30+
31+
{% seo %}

0 commit comments

Comments
 (0)