Skip to content
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 89 additions & 23 deletions assets/sass/downloads.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,95 @@
@import "variables";
@import "mixins";

.install-tabs {
display: flex;
border-bottom: 2px solid var(--callout-color);
role: tablist;

a[role="tab"] {
padding: 0.75rem 1rem;

background: var(--callout-color);
border: 2px solid var(--callout-color);
border-bottom: none;
margin-right: -2px;
font-weight: 600;
text-decoration: none;
color: var(--font-color);
text-align: center;

&:hover {
background: var(--main-bg);
color: var(--link-color);
}

&[aria-selected="true"] {
background: var(--main-bg);
color: var(--font-color);
border-bottom: 2px solid var(--main-bg);
margin-bottom: -2px;
z-index: 1;
position: relative;
}

// Border radius for first and last tabs
&:first-of-type {
border-top-left-radius: 8px;
}

&:last-of-type {
border-top-right-radius: 8px;
margin-right: 0;
}
}
}

.install-content {
padding: 1rem;
border: 2px solid var(--callout-color);
border-top: none;
border-bottom-left-radius: 8px;
border-bottom-right-radius: 8px;
}

.install-overview {
margin: 2rem;
color: var(--light-font-color);
font-size: 1.1rem;
line-height: 1.8rem;
}

.install-header {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 1.5rem;

h1 {
margin: 0;
}

.version-badge {
display: inline-block;
padding: 0.25rem 0.75rem;
background: var(--sidebar-toc-bg-color);
color: var(--light-font-color-darker-35);
border-radius: 6px;
font-size: 0.75rem;
font-weight: 600;

a {
color: var(--link-color);
text-decoration: none;

&:hover {
color: var(--link-hover-color);
text-decoration: underline;
}
}
}
}

#logo-license {
@extend .callout;
padding: 20px !important;
Expand All @@ -22,21 +111,6 @@
}
}

.callout#more-downloads {
.column-left {
width: 47%;
}

.column-right {
width: 45%;
}

p {
padding-bottom: 1em;
line-height: 1.4;
}
}

#download-next-steps {
@include clearfix;
@extend .unstyled !optional;
Expand Down Expand Up @@ -94,14 +168,6 @@
}
}

#os-filter-count {
position: relative;
top: 8px;
left: 12px;
display: none;
color: var(--orange);
}

.downloading .hide {
display: none;
}
3 changes: 0 additions & 3 deletions content/download/_index.html

This file was deleted.

59 changes: 0 additions & 59 deletions content/downloads/_index.html

This file was deleted.

21 changes: 21 additions & 0 deletions content/install/_index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
section: "install"
title: "Git - Install"
url: /install
aliases:
- /downloads/index.html
- /download/index.html
- /download.html
- /install.html
---

<div id="main">
{{< install-header >}}

<div class="install-content">
<p class="install-overview">
Choose your operating system above.
</p>
</div>
</div>
</div>
13 changes: 9 additions & 4 deletions content/downloads/linux.html → content/install/linux.html
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
---
section: "downloads"
section: "install"
title: "Git - Install for Linux"
aliases:
- /download/linux
- /downloads/linux
---

<div id="main">
<h1>Download for Linux and Unix</h1>
<p>It is easiest to install Git on Linux using the preferred package
{{< install-header "linux" >}}

<div class="install-content">
<p>It is easiest to install Git on Linux using the preferred package
manager of your Linux distribution. If you prefer to build from
source, you can find tarballs
<a href="https://www.kernel.org/pub/software/scm/git/">on kernel.org</a>.
The latest version is
<a href="https://www.kernel.org/pub/software/scm/git/git-{{< site-param latest_version >}}.tar.gz">{{< site-param latest_version >}}</a>

<h3>Debian/Ubuntu</h3>
<p>For the latest stable version for your release of Debian/Ubuntu</p>
<code># apt-get install git</code>
Expand Down Expand Up @@ -60,4 +63,6 @@ <h3>Red Hat Enterprise Linux, Oracle Linux, CentOS, Scientific Linux, et al.</h3
<h3>Slitaz</h3>
<code>$ tazpkg get-install git</code>

</div>
</div>
</div>
15 changes: 10 additions & 5 deletions content/downloads/mac.html → content/install/mac.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
---
section: "downloads"
title: "Git - Downloading Package"
section: "install"
title: "Git - Install for macOS"
aliases:
- /download/mac
- /downloads/mac
---

<div id="main">
<h1>Download for macOS</h1>
{{< install-header "mac" >}}

<p>There are several options for installing Git on macOS. Note that
<div class="install-content">
<p>There are several options for installing Git on macOS. Note that
any non-source distributions are provided by third parties, and may
not be up to date with the latest source release.</p>

Expand All @@ -24,17 +26,20 @@ <h3>MacPorts</h3>

<h3>Xcode</h3>
<p>Apple ships a binary package of Git with <a href="https://developer.apple.com/xcode/">Xcode</a>.</p>

<h3>Building from Source</h3>
<p>If you prefer to build from source, you can find tarballs
<a href="https://www.kernel.org/pub/software/scm/git/">on kernel.org</a>.
The latest version is
<a href="https://www.kernel.org/pub/software/scm/git/git-{{< site-param latest_version >}}.tar.gz"%>{{< site-param latest_version >}}</a>.
</p>

<h3>Installing git-gui</h3>
<p>If you would like to install <a href="https://git-scm.com/docs/git-gui/">git-gui</a> and <a href="https://git-scm.com/docs/gitk/">gitk</a>,
git's commit GUI and interactive history browser, you can do so using <a href="https://brew.sh/">homebrew</a><br>

<code>$ brew install git-gui</code></p>

</div>
</div>
</div>
20 changes: 20 additions & 0 deletions content/install/source.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
section: "install"
title: "Git - Build from Source"
---

<div id="main">
{{< install-header "source" >}}

<div class="install-content">

<p>If you prefer to build from source, you can find tarballs
<a href="https://www.kernel.org/pub/software/scm/git/">on kernel.org</a>.
The latest version is
<a href="https://www.kernel.org/pub/software/scm/git/git-{{< site-param "latest_version" >}}.tar.gz">{{< site-param "latest_version" >}}</a>.
</p>
<p>There's also an official <a href="https://github.com/git/git">GitHub mirror</a>.</p>

</div>
</div>
</div>
12 changes: 9 additions & 3 deletions content/downloads/win.html → content/install/win.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
---
section: "downloads"
title: "Git - Downloading Package"
section: "install"
title: "Git - Install for Windows"
aliases:
- /download/win
- /downloads/win
---

<div id="main">
<h1>Download for Windows</h1>
{{< install-header "win" >}}

<div class="install-content">
<p>
<strong><a id="auto-download-link" href="{{< site-param windows_installer.installer_x64.url >}}">Click here to download </a></strong>
the latest (<strong id="auto-download-version">{{< site-param windows_installer.installer_x64.version >}}</strong>)
Expand Down Expand Up @@ -66,4 +69,7 @@ <h3>Get Involved</h3>
</a>
</li>
</ul>

</div>
</div>
</div>
7 changes: 1 addition & 6 deletions layouts/partials/sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,7 @@
<a href="{{ relURL "docs" }}"{{ if or (eq .Params.Subsection "reference") (eq .Params.Subsection "manual") }} class="active"{{ end }}>Reference</a>
</li>
<li>
<a href="{{ relURL "downloads" }}"{{ if (eq $section "downloads") }} class="active"{{ end }}>Downloads</a>
<ul {{ if (eq $section "downloads") }}class="expanded"{{ end }}>
<li>
<a href="{{ relURL "downloads/logos" }}"{{ if (eq .Params.Subsection "logos") }} class="active"{{ end }}>Logos</a>
</li>
</ul>
<a href="{{ relURL "install" }}"{{ if (eq $section "install") }} class="active"{{ end }}>Install</a>
Copy link
Member

Choose a reason for hiding this comment

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

I think this is the reason why the Playwright tests fail now...

Error: expect.not.toHaveClass: Error: strict mode violation: getByRole('link', { name: 'All' }) resolved to 2 elements:
    1) <a class="install-link" href="http://localhost:5000/install/win">Install</a> aka getByRole('link', { name: 'Install' })
    2) <a href="#" data-os="" class="subtle-button gui-os-filter">All</a> aka getByRole('link', { name: 'All', exact: true })

Call log:
  - Expect "not toHaveClass" with timeout 5000ms
  - waiting for getByRole('link', { name: 'All' })


  66 |
  67 |     const allButton = page.getByRole('link', { name: 'All' })
> 68 |     await expect(allButton).not.toHaveClass(/selected/)
     |                                 ^
  69 |
  70 |     const thumbnails = page.locator('.gui-thumbnails li:visible')
  71 |     const count = await thumbnails.count()
    at /home/runner/work/git-scm.com/git-scm.com/tests/git-scm.spec.js:68:33

We probably need to change this line:

    const allButton = page.getByRole('link', { name: 'All' })

to use an exact match:

    const allButton = page.getByRole('link', { name: 'All', exact: true })

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

thank you for looking into that, will try that fix!

</li>
<li>
<a href="{{ relURL "community" }}"{{ if (eq $section "community") }} class="active"{{ end }}>Community</a>
Expand Down
4 changes: 2 additions & 2 deletions layouts/partials/site-root.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ <h3>Reference</h3>
</a>
</li>
<li>
<a href="{{ relURL "downloads" }}">
<a href="{{ relURL "install" }}">
<img src="{{ relURL "images/icons/fa-down-long.svg" }}" width="74" height="74" />
<h3>Downloads</h3>
<h3>Install</h3>
<p>Binary releases for all major platforms.</p>
</a>
</li>
Expand Down
Loading