Skip to content

Commit fec881d

Browse files
authored
Logo and color palette updates throughout site (#736)
* image additions, renames, moves * css updates * update .md files that reference images and css * update html includes * two more logo references
1 parent 6157056 commit fec881d

39 files changed

Lines changed: 112 additions & 75 deletions

_includes/breadcrumbs.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
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>
1+
<p class="llnl-breadcrumb fs-13 mb-50"><br /><a class="text-impact-blue text-decoration-underline-hover llnl-breadcrumb-link fw-semibold" href="{{ site.baseurl }}/">Home</a>
22
{% capture page_url_without_index_html %}{{ page.url | remove: "/index.html" }}{% endcapture %}
33
{% assign splitted_url_parts = page_url_without_index_html | split: '/' %}
44
{% capture forLoopMaxInt %}{{ splitted_url_parts.size | minus:1 }}{% endcapture %}
@@ -11,7 +11,7 @@
1111
{% if current_breadcrumb_url == breadcrumb_page.url or current_breadcrumb_md_url == breadcrumb_page.url %}
1212
{% if i == forLoopMaxInt %}class="active"{% endif %}<i class="fa fa-regular fa-chevron-right text-carbon-gray ms-2"></i>
1313
{% 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>
14+
<a class="text-impact-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>
1515
{% endif %}
1616
{% endfor %}
1717
{% endfor %}

_includes/components/card.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="llnl-link-card border-bottom-gradient-software-blue-green border-bottom-3 position-relative {{ include.classes }} p-3">
1+
<div class="llnl-link-card border-bottom-gradient-impact-extreme border-bottom-3 position-relative {{ include.classes }} p-3">
22
<{{ include.tag | default: 'h3' }} class="text-center my-4 text-balance">{{ include.title }}</{{ include.tag | default: 'h3' }}>
33
<hr class="border-carbon-gray border-2"/>
44
<div class="mt-4 llnl-content">

_includes/components/quick-link.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<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">
2+
<div class="col-2 py-4 px-3 bg-gradient-impact-extreme-v d-flex justify-content-center vertical-center">
33
<i class="text-white fa {{ include.type | default: 'fa-regular' }} {{ include.icon }} {{ include.icon_size | default: 'fa-lg' }}"></i>
44
</div>
55
<div class="llnl-content col-10 py-2 d-flex align-items-center text-black">

_includes/head.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
{% endif %}
1313
<meta charset="UTF-8">
1414
<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" />
15+
<link rel="shortcut icon" href="/assets/images/favicon.png">
16+
<link rel="icon" href="/assets/images/logomark-llnl.svg" />
1717
<link rel="stylesheet" href="/assets/css/bootstrap.min.css" />
1818
<link rel="stylesheet" href="/assets/css/gov-banner.css" />
1919
<link rel="stylesheet" href="/assets/css/llnl-header.css" />
@@ -25,7 +25,7 @@
2525
<meta name="twitter:site" content="@livermore_comp" />
2626
<meta name="twitter:title" content="LLNL Computing" />
2727
<meta name="twitter:description" content="All computing topics at LLNL." />
28-
<meta name="twitter:image" content="/assets/images/llnl-logo-400x400.png" aria-label="LLNL logo" />
28+
<meta name="twitter:image" content="/assets/images/logomark-llnl.png" aria-label="LLNL logo" />
2929

3030
<meta name="google-site-verification" content="477TVoInt3HiUgSl_hU4rb5_JrgNMKK5Rl-KPMUClpQ" />
3131

about/contributing.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ menus:
1111

1212
<!-- START: Info box -->
1313
{% capture alertContent %}
14-
The LLNL Software Catalog website is an open-source project. We welcome contributions via pull requests as well as questions, feature requests, or bug reports via issues. Contact our team at [open-source@llnl.gov](mailto:open-source@llnl.gov) with any questions. Please also refer to our [FAQ](/about/faq) and [Code of Conduct](/about/conduct).
14+
The LLNL Software Catalog website is an open source project. We welcome contributions via pull requests as well as questions, feature requests, or bug reports via issues. Contact our team at [open-source@llnl.gov](mailto:open-source@llnl.gov) with any questions. Please also refer to our [FAQ](/about/faq) and [Code of Conduct](/about/conduct).
1515
{% endcapture %}
1616
{% assign alertContent = alertContent | markdownify %}
1717
{% include components/alert.html type="warning" icon="fa-circle-info" content=alertContent %}
@@ -28,7 +28,7 @@ To contribute to this website, please create a fork of [llnl.github.io](https://
2828
* Be explicit when opening issues and reporting bugs. What behavior are you expecting? What is your justification or use case for the new feature/enhancement? How can the bug be recreated? What are any environment variables to consider (e.g., browser, OS)?
2929

3030
<!-- START: Accordions Each h2 below will be a separate accordion. -->
31-
<div class="border-top-gradient-software-blue-green border-bottom-gradient-software-blue-green">
31+
<div class="border-top-gradient-impact-extreme border-bottom-gradient-impact-extreme">
3232

3333
{% capture accordionContent %}
3434
Before you begin, make sure you have working installs of Git, Ruby, and [Bundler](https://bundler.io). After you fork the repo, make sure you are in the directory you just created by running `cd llnl.github.io` Then you can use `bundler` to install the Ruby dependencies (see the [Jekyll installation docs](https://jekyllrb.com/docs/installation/) for step-by-step guides to setting this up):
@@ -75,7 +75,7 @@ A [JSON file](https://github.com/LLNL/llnl.github.io/blob/main/visualize/github-
7575
| -------- | ----------- | ------ | ------- |
7676
| Category | Description | Tag(s) | FA icon |
7777
| -------- | ----------- | ------ | ------- |
78-
| **All Software** | Browse all LLNL open-source projects | (no tags required) | (image: `logomark-software.svg`) |
78+
| **All Software** | Browse all LLNL open-source projects | (no tags required) | (image: `logomark-llnl.svg`) |
7979
| **AI & Machine Learning** | Integrate artificial intelligence and machine learning into scientific applications | `artificial-intelligence`, `deep-learning`, `machine-learning`, `neural-network` | fa-brain-circuit |
8080
| **App Infrastructure** | Browse tools for basic functionality common in HPC codes | `app-infrastructure` | fa-gear-complex-code |
8181
| **Applications** | Browse scientific simulation codes and IT management tools | `application`, `applications`, `simulation`, `simulations` | fa-laptop-code |

about/faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ menus:
1818
<!-- End: Info box -->
1919

2020
<!-- START: Accordions Each h2 below will be a separate accordion. -->
21-
<div class="border-top-gradient-software-blue-green border-bottom-gradient-software-blue-green">
21+
<div class="border-top-gradient-impact-extreme border-bottom-gradient-impact-extreme">
2222
{% capture accordionContent %}
2323
If you’re new to GitHub and open source in general, figuring out how to get set up can be a challenge. You may want to read through the GitHub Help pages on [setting up and managing your GitHub profile](https://support.github.com/features/account).
2424

assets/css/bootstrap.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/css/bootstrap.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/css/components.css

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ select.form-control {
4848

4949
.hero-home,
5050
.hero-default {
51-
background: url('/assets/images/software-hero.png') center center / cover;
51+
background: url('/assets/images/software-hero-new.png') center center / cover;
5252
}
5353

5454
.hero-home {
@@ -78,7 +78,7 @@ select.form-control {
7878

7979
@media (max-width: 991px) {
8080
.hero-home {
81-
background: url('/assets/images/software-mobile-hero.png') top center / cover;
81+
background: url('/assets/images/software-mobile-hero-new.png') top center / cover;
8282
}
8383

8484
.hero-home .logo {
@@ -88,17 +88,17 @@ select.form-control {
8888

8989
@media (max-width: 719px) {
9090
.hero-home {
91-
background: linear-gradient(to top, black 0%, rgba(0, 141, 203, 0.8) 38%, transparent), url('/assets/images/software-mobile-hero.png') top center / cover
91+
background: linear-gradient(to top, black 0%, rgba(0, 141, 203, 0.8) 38%, transparent), url('/assets/images/software-mobile-hero-new.png') top center / cover
9292
}
9393
}
9494

9595
.alert-warning,
9696
.bg-alert-yellow {
97-
background: #FFF7E7;
97+
background: #fdcc63;
9898
}
9999

100100
.text-alert-warning-icon {
101-
color: #FCB317;
101+
color: #00A5B8;
102102
}
103103

104104
.cta-title {
@@ -145,7 +145,7 @@ select.sort-by {
145145
display: block;
146146
height: var(--hover-border-width);
147147
transform: translateY(var(--hover-border-width));
148-
background: linear-gradient(to right, var(--software-blue), var(--software-green));
148+
background: linear-gradient(to right, var(--impact-blue), var(--extreme));
149149
transition: 0.2s transform;
150150
}
151151

@@ -245,7 +245,7 @@ select.sort-by {
245245

246246
.llnl-list-item.active,
247247
.llnl-list-item:hover {
248-
color: var(--software-blue) !important;
248+
color: var(--impact-blue) !important;
249249
}
250250

251251
.llnl-list-item:hover .icon,

assets/css/llnl-header.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -485,11 +485,11 @@
485485

486486
.navbar-nav .nav-link {
487487
color: white;
488-
--bs-navbar-active-color: var(--software-blue);
488+
--bs-navbar-active-color: var(--impact-blue);
489489
}
490490

491491
.navbar-nav .nav-link.active,
492492
.navbar-nav .nav-link.show {
493-
--bs-navbar-active-color: var(--software-blue);
493+
--bs-navbar-active-color: var(--impact-blue);
494494
}
495495
}

0 commit comments

Comments
 (0)