git · jvns · Sep 29, 2025 · Sep 8, 2025 · Sep 8, 2025 · Sep 8, 2025
diff --git a/assets/sass/dark-mode.css b/assets/sass/dark-mode.css
@@ -112,10 +112,6 @@
                 @include box-shadow(none);
             }
 
-            #front-nav img {
-                filter: none;
-            }
-
             div.monitor {
                 filter: brightness(.85);
             }

diff --git a/assets/sass/front-page.scss b/assets/sass/front-page.scss
@@ -19,59 +19,62 @@
   ul {
     @extend .unstyled !optional;
     padding-top: 24px;
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    gap: 20px 40px;
+    margin-bottom: 40px;
 
     li {
-      display: block;
-      float: left;
       width: 280px;
-      margin-bottom: 20px;
-
-      &#nav-about,
-      &#nav-downloads {
-        margin-right: 30px;
-      }
-
-      &#nav-about,
-      &#nav-documentation {
-        margin-bottom: 40px;
-      }
     }
   }
 
   a {
-    display: block;
-    height: 86px;
-    padding-left: 90px;
-    color: var(--font-color);
-    background-repeat: no-repeat;
-    background-position: 0 0;
-    transition-duration: 0.3s;
-    transition-property: color;
+    display: grid;
+    grid-template-columns: 74px 1fr;
+    grid-template-rows: auto auto;
+    column-gap: 1rem;
+    align-items: start;
 
     img {
-      float: left;
-      margin-right: -90px;
-      margin-left: -90px;
-      opacity: 0.9;
+      grid-row: 1 / -1;
+      grid-column: 1;
       transition-duration: 0.3s;
       transition-property: opacity;
+      opacity: 0.4;
+      width: 38px;
+      height: 38px;
+      background-color: #cdcdc5;
+      border-radius: 40%;
+      padding: 18px;
+
+      :root[data-theme="dark"] & {
+        filter: invert(1);
+        background-color: #9d9c9a;
+      }
     }
 
     h3 {
       font-size: 18px;
       font-weight: bold;
       color: var(--orange);
+      grid-row: 1;
+      grid-column: 2;
     }
 
     p {
+      grid-row: 2;
+      grid-column: 2;
       font-size: 13px;
       line-height: $base-line-height * 0.8;
+      color: var(--font-color);
     }
   }
 
   a:hover {
     img {
-      opacity: 1;
+      opacity: 0.7;
     }
 
     h3 {

diff --git a/assets/sass/layout.scss b/assets/sass/layout.scss
@@ -82,6 +82,55 @@ aside {
     }
   }
 
+  .callout.icon {
+    position: relative;
+    padding: 20px 20px 20px 90px !important;
+    border: 2px solid var(--callout-color);
+    background: transparent;
+
+    &.book {
+      background: var(--callout-color);
+    }
+
+    a h3 {
+      font-size: 18px;
+      color: var(--link-color);
+    }
+
+    p {
+      font-size: 15px;
+      line-height: 1.3em;
+    }
+
+    img {
+      position: absolute;
+      top: 20px;
+      left: 17px;
+      width: 54px;
+      height: 54px;
+      opacity: 0.4;
+
+      :root[data-theme="dark"] & {
+        filter: invert(1);
+      }
+    }
+
+
+    &.video ul {
+      list-style-type: none;
+      margin-left: 1rem;
+
+      ::marker {
+        content: "⏵ ";
+        margin-right: .5rem;
+      }
+
+      li {
+        margin: .25rem 0;
+      }
+    }
+  }
+
   .callout {
     background-color: var(--callout-color);
     @include border-radius(3px);

diff --git a/assets/sass/reference.scss b/assets/sass/reference.scss
@@ -354,24 +354,6 @@ ol.reference-previous-versions {
   }
 }
 
-.callout.ref-manual {
-  @include background-image-2x($baseurl + "images/icons/book", 54px, 72px, 24px 20px);
-  padding: 20px 30px 20px 100px !important;
-  background-color: var(--callout-color);
-  iframe {
-    max-width: 100%;
-  }
-
-  h3 {
-    font-size: 18px;
-  }
-
-  p {
-    font-size: 15px;
-    line-height: 1.3em;
-  }
-}
-
 p.quickref {
   @include background-image-2x($baseurl + "images/icons/document", 15px, 21px, 0 0);
   padding-left: 22px ! important;

diff --git a/content/cheat-sheet/_index.html b/content/cheat-sheet/_index.html
@@ -1,5 +1,5 @@
 ---
-section: "documentation"
+section: "learn"
 subsection: "cheat-sheet"
 title: "Git Cheat Sheet"
 url: /cheat-sheet.html

diff --git a/content/doc/_index.html b/content/doc/_index.html
diff --git a/content/doc/ext/_index.html b/content/doc/ext/_index.html
@@ -1,5 +1,5 @@
 ---
-section: "documentation"
+section: "learn"
 subsection: "external-links"
 title: "Git - External Links"
 url: /doc/ext.html

diff --git a/content/learn/_index.html b/content/learn/_index.html
@@ -0,0 +1,57 @@
+---
+section: "learn"
+title: "Git - Learn"
+url: /learn.html
+---
+
+<div id="main">
+
+  <h1> Learn </h1>
+
+  <div class="callout icon book">
+
+    <a href="{{< relurl "book">}}">
+      <img alt="" aria-hidden="true" src="{{< relurl "images/icons/fa-book.svg">}}" >
+      <h3> Pro Git Book </h3>
+    </a>
+
+    <p>The entire Pro Git book written
+      by Scott Chacon and Ben Straub is available to read online for free.
+      Print copies are available on <a
+        href="https://www.amazon.com/Pro-Git-Scott-Chacon/dp/1484200772?ie=UTF8&camp=1789&creative=9325&creativeASIN=1430218339&linkCode=as2&tag=git-sfconservancy-20">Amazon.com</a>.
+    </p>
+  </div>
+
+  <div class="callout icon video">
+    <a href="{{< relurl "videos">}}">
+      <img alt="" aria-hidden="true" src="{{< relurl "images/icons/fa-video.svg">}}" >
+      <h3> Videos </h3>
+    </a>
+
+    <p>
+      Short videos introducing Git for total beginners.
+    </p>
+    {{< videos-summary >}}
+  </div>
+
+  <div class="callout icon cheat-sheet">
+    <a href="{{< relurl "cheat-sheet">}}">
+      <img alt="" aria-hidden="true" src="{{< relurl "images/icons/fa-note-sticky.svg">}}" >
+      <h3>Cheat Sheet</h3>
+    </a>
+    <p>
+      The most common Git commands, with diagrams illustrating the difference
+      between merge and rebase.
+    </p>
+  </div>
+
+  <div class="callout icon external-links">
+    <a href="{{< relurl "doc/ext">}}">
+      <img alt="" aria-hidden="true" src="{{< relurl "images/icons/fa-arrow-up-right-from-square.svg">}}" >
+      <h3>External Links</h3>
+    </a>
+    <p>
+      Ever-evolving collection of tutorials, books, videos, and other Git resources from the community.
+    </p>
+  </div>
+</div>
diff --git a/content/videos/_index.html b/content/videos/_index.html
@@ -1,5 +1,5 @@
 ---
-section: "documentation"
+section: "learn"
 subsection: "videos"
 title: "Git - Videos"
 url: /videos.html

diff --git a/external/book/content/book/az/v2/Appendix-A-Digər-Mühitlərdə-Git-Bash’da-Git.html b/external/book/content/book/az/v2/Appendix-A-Digər-Mühitlərdə-Git-Bash’da-Git.html
@@ -1,7 +1,7 @@
 ---
 ### DO NOT EDIT! Generated by script/update-book2.rb
 category: book
-section: documentation
+section: learn
 subsection: book
 sidebar: book
 book:

diff --git a/external/book/content/book/az/v2/Appendix-A-Digər-Mühitlərdə-Git-Eclipse’də-Git.html b/external/book/content/book/az/v2/Appendix-A-Digər-Mühitlərdə-Git-Eclipse’də-Git.html
@@ -1,7 +1,7 @@
 ---
 ### DO NOT EDIT! Generated by script/update-book2.rb
 category: book
-section: documentation
+section: learn
 subsection: book
 sidebar: book
 book:

diff --git a/external/book/content/book/az/v2/Appendix-A-Digər-Mühitlərdə-Git-PowerShell’də-Git.html b/external/book/content/book/az/v2/Appendix-A-Digər-Mühitlərdə-Git-PowerShell’də-Git.html
@@ -1,7 +1,7 @@
 ---
 ### DO NOT EDIT! Generated by script/update-book2.rb
 category: book
-section: documentation
+section: learn
 subsection: book
 sidebar: book
 book:

diff --git a/external/book/content/book/az/v2/Appendix-A-Digər-Mühitlərdə-Git-Qrafik-interfeyslər.html b/external/book/content/book/az/v2/Appendix-A-Digər-Mühitlərdə-Git-Qrafik-interfeyslər.html
@@ -1,7 +1,7 @@
 ---
 ### DO NOT EDIT! Generated by script/update-book2.rb
 category: book
-section: documentation
+section: learn
 subsection: book
 sidebar: book
 book:

diff --git a/external/book/content/book/az/v2/Appendix-A-Digər-Mühitlərdə-Git-Qısa-Məzmun.html b/external/book/content/book/az/v2/Appendix-A-Digər-Mühitlərdə-Git-Qısa-Məzmun.html
@@ -1,7 +1,7 @@
 ---
 ### DO NOT EDIT! Generated by script/update-book2.rb
 category: book
-section: documentation
+section: learn
 subsection: book
 sidebar: book
 book:

diff --git a/external/book/content/book/az/v2/Appendix-A-Digər-Mühitlərdə-Git-Sublime-Text’də-Git.html b/external/book/content/book/az/v2/Appendix-A-Digər-Mühitlərdə-Git-Sublime-Text’də-Git.html
@@ -1,7 +1,7 @@
 ---
 ### DO NOT EDIT! Generated by script/update-book2.rb
 category: book
-section: documentation
+section: learn
 subsection: book
 sidebar: book
 book:

diff --git a/...al/book/content/book/az/v2/Appendix-A-Digər-Mühitlərdə-Git-Visual-Studio-Code’da-Git.html b/...al/book/content/book/az/v2/Appendix-A-Digər-Mühitlərdə-Git-Visual-Studio-Code’da-Git.html
@@ -1,7 +1,7 @@
 ---
 ### DO NOT EDIT! Generated by script/update-book2.rb
 category: book
-section: documentation
+section: learn
 subsection: book
 sidebar: book
 book:

diff --git a/external/book/content/book/az/v2/Appendix-A-Digər-Mühitlərdə-Git-Visual-Studio’da-Git.html b/external/book/content/book/az/v2/Appendix-A-Digər-Mühitlərdə-Git-Visual-Studio’da-Git.html
@@ -1,7 +1,7 @@
 ---
 ### DO NOT EDIT! Generated by script/update-book2.rb
 category: book
-section: documentation
+section: learn
 subsection: book
 sidebar: book
 book:

diff --git a/external/book/content/book/az/v2/Appendix-A-Digər-Mühitlərdə-Git-Zsh’də-Git.html b/external/book/content/book/az/v2/Appendix-A-Digər-Mühitlərdə-Git-Zsh’də-Git.html
@@ -1,7 +1,7 @@
 ---
 ### DO NOT EDIT! Generated by script/update-book2.rb
 category: book
-section: documentation
+section: learn
 subsection: book
 sidebar: book
 book: