Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update deps #350

Merged
merged 5 commits into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
55 changes: 28 additions & 27 deletions _includes/nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,50 +6,51 @@
</a>

<button
class="navbar-toggler"
type="button"
data-bs-toggle="collapse"
data-bs-target="#neovim-navbar"
class="navbar-toggler"
data-bs-target="#navbarNav"
aria-expanded="false"
aria-label="Main menu"
>
<span class="navbar-toggler-icon">
<svg
xmlns="http://www.w3.org/2000/svg"
width="24"
height="24"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
class="feather feather-menu"
>
<line x1="3" y1="12" x2="21" y2="12"></line>
<line x1="3" y1="6" x2="21" y2="6"></line>
<line x1="3" y1="18" x2="21" y2="18"></line>
</svg>
</span>
<svg
xmlns="http://www.w3.org/2000/svg"
width="24"
height="24"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
>
<line x1="3" y1="12" x2="21" y2="12"></line>
<line x1="3" y1="6" x2="21" y2="6"></line>
<line x1="3" y1="18" x2="21" y2="18"></line>
</svg>
</button>

<div
class="collapse navbar-collapse justify-content-end"
id="neovim-navbar"
id="navbarNav"
>
<ul class="navbar-nav">
{% for nav in site.data.nav %} {% assign active = include.active %} {%
assign has_sections = nav.sections != null %} {% if has_sections %}
{% for nav in site.data.nav %}
{% assign active = include.active %}
{% assign has_sections = nav.sections != null %}
{% if has_sections %}

<li class="nav-item dropdown">
<a
href="#"
class="nav-link dropdown-toggle"
href="#"
role="button"
data-bs-toggle="dropdown"
aria-expanded="false"
id="neovim-dropdown"
role="button"
id="neovimDropdown"
>{{ nav.title }}</a
>
<ul class="dropdown-menu" aria-labelledby="neovim-dropdown">
<ul class="dropdown-menu" aria-labelledby="neovimDropdown">
{% for section in nav.sections %}

<li>
Expand Down
4 changes: 2 additions & 2 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@docsearch/css@3" />
<link rel="preconnect" href="https://X185E15FPG-dsn.algolia.net" crossorigin />

<link href="/css/normalize.min.css" rel="stylesheet">
<link href="/css/bootstrap.min.css" rel="stylesheet">

<link href="/css/main.css" rel="stylesheet">
<link href="/css/neovim-hi.css" rel="stylesheet">
<link rel="canonical" href="{{ site.url }}{% if page.canonical_url %}{{ page.canonical_url }}{% else %}{{ page.url }}{% endif %}" />
Expand All @@ -24,7 +24,7 @@

{% include footer.html %}

<script src="/js/bootstrap.min.js"></script>
<script src="/js/bootstrap.bundle.min.js"></script>

<!-- algolia docsearch https://docsearch.algolia.com/docs/docsearch-v3/ -->
<script src="https://cdn.jsdelivr.net/npm/@docsearch/js@3"></script>
Expand Down
7 changes: 0 additions & 7 deletions css/bootstrap.css

This file was deleted.

7 changes: 3 additions & 4 deletions css/bootstrap.min.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions css/bootstrap.min.css.map

Large diffs are not rendered by default.

136 changes: 0 additions & 136 deletions css/lato.css

This file was deleted.

78 changes: 33 additions & 45 deletions css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
:root {
--main-breakpoint: 60em;

/* Serif fonts for body text. Easier to read for larger chunks */
--serif-fonts: "Inter", var(--bs-font-serif);
/* Sans-serif for smoother fonts. Useful for titles and shorter chunks */
--sans-serif-fonts: "Inter", var(--bs-font-sans-serif);

/* Colors */
Expand All @@ -14,9 +11,9 @@
--fg-color: #29332f;
--inverse-fg-color: #a9d5c4; /* Dark-mode fg color. */
--bg-color: #e7eee8;
--accent-bg-color: #d3e4db;
--link-color: #195174;
--accent-color: #000;
--accent-bg-color: #d3e4db;
--border-color: #658fac;
}

Expand All @@ -26,12 +23,9 @@
--inverse-fg-color: #29332f; /* Light-mode fg color. */
--bg-color: #0f191f;
--accent-bg-color: #0b151b;
--border-color: #1174b1;
--link-color: #78d55b;
--accent-color: #61ff00;

--link-color: #5fb950;
--accent-color: #61ff00;
--border-color: #1174b1;
}
}

Expand All @@ -49,15 +43,12 @@

@supports (font-variation-settings: normal) {
:root {
--sans-serif-fonts: "Inter var", var(--sans-serif-fonts),
var(--bs-font-sans-serif);
--serif-fonts: "Inter var", var(--serif-fonts), var(--bs-font-serif);
--sans-serif-fonts: "Inter var", var(--bs-font-sans-serif);
}
}

body {
/* font-family: "Helvetica Neue", Helvetica, Calibri, Arial, sans-serif; */
font-family: var(--serif-fonts);
font-family: var(--sans-serif-fonts);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We definitely weren't using serif, I wonder why this was like this.

font-size: initial;
line-height: 1.6;
color: var(--fg-color);
Expand All @@ -72,9 +63,8 @@ body {

a {
color: var(--link-color);
transition: all ease-in-out 140ms;
/* text-decoration: underline var(--link-color); */
text-decoration: underline var(--border-color);
transition: all ease-in-out 140ms;
}

/* Ensure that the hover border is sized correctly for <a><img…></a>. #295 */
Expand All @@ -100,9 +90,9 @@ h3,
h4,
h5 {
font-family: var(--sans-serif-fonts);
font-weight: bold;
line-height: 1.6;
margin: 0.66em 0;
font-weight: bold;
}

h1 {
Expand Down Expand Up @@ -235,52 +225,50 @@ samp {
* Logo and navigation at the top of the page
*/

.nav {
background-color: var(--accent-bg-color);
border-color: var(--link-color);
.nav-link {
color: var(--link-color);
}

.nav > li > a:focus,
.nav > li > a:hover {
background-color: var(--bg-color);
.nav-link:hover,
.nav-link:focus,
.nav-link:active {
color: var(--accent-color);
}

.nav .open > a:focus,
.nav .open > a:hover {
background-color: var(--accent-bg-color);
.navbar-toggler {
border-width: 0;
color: var(--fg-color);
}

#navbar-logo {
height: 2.5em;
/**
* Logo
*/
.navbar-brand {
color: var(--link-color);
}
.navbar-brand:hover,
.navbar-brand:focus,
.navbar-brand:active {
color: var(--accent-color);
}

/* .navbar-top-align { */
/* margin-top: 1em; */
/* } */

/* .navbar-brand { */
/* float: none; */
/* height: auto; */
/* padding: 0; */
/* font-size: inherit; */
/* line-height: inherit; */
/* } */

/**
* Menu dropdown
*/

#neovimDropdown.show {
color: var(--accent-color);
}

.dropdown-menu {
background-color: var(--accent-bg-color);
}

.dropdown-menu > li > a {
.dropdown-item {
color: var(--link-color);
}

.dropdown-menu > li > a:focus,
.dropdown-menu > li > a:hover,
.dropdown-menu > li > a:active {
.dropdown-item:focus,
.dropdown-item:hover,
.dropdown-item:active {
color: var(--bg-color);
background-color: var(--link-color);
}
Expand Down
1 change: 0 additions & 1 deletion css/normalize.min.css

This file was deleted.

Binary file removed fonts/lato-v17-latin-300.woff
Binary file not shown.
Binary file removed fonts/lato-v17-latin-300.woff2
Binary file not shown.
Binary file removed fonts/lato-v17-latin-300italic.woff
Binary file not shown.
Binary file removed fonts/lato-v17-latin-300italic.woff2
Binary file not shown.
Binary file removed fonts/lato-v17-latin-700.woff
Binary file not shown.
Binary file removed fonts/lato-v17-latin-700.woff2
Binary file not shown.
Binary file removed fonts/lato-v17-latin-700italic.woff
Binary file not shown.
Binary file removed fonts/lato-v17-latin-700italic.woff2
Binary file not shown.
Binary file removed fonts/lato-v17-latin-italic.woff
Binary file not shown.
Binary file removed fonts/lato-v17-latin-italic.woff2
Binary file not shown.
Binary file removed fonts/lato-v17-latin-regular.woff
Binary file not shown.
Binary file removed fonts/lato-v17-latin-regular.woff2
Binary file not shown.
7 changes: 7 additions & 0 deletions js/bootstrap.bundle.min.js
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I confirmed that this matches the file from https://getbootstrap.com/docs/5.3/getting-started/download/

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions js/bootstrap.bundle.min.js.map

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions js/bootstrap.js

This file was deleted.

7 changes: 0 additions & 7 deletions js/bootstrap.min.js

This file was deleted.

5 changes: 0 additions & 5 deletions js/jquery.js

This file was deleted.

4 changes: 0 additions & 4 deletions js/jquery.min.js

This file was deleted.