Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions assets/js/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ $(document).ready(function() {
Forms.init();
Downloads.init();
DownloadBox.init();
InstallPageLink.init();
PostelizeAnchor.init();
Print.init();
});
Expand All @@ -60,27 +61,27 @@ var DownloadBox = {
var os = window.session.browser.os; // Mac, Win, Linux
if(os == "Mac") {
$(".monitor").addClass("mac");
$("#download-link").text("Download for Mac").attr("href", `${baseURLPrefix}downloads/mac`);
$("#download-link").text("Download for Mac").attr("href", `${baseURLPrefix}install/mac`);
$("#gui-link").removeClass('mac').addClass('gui');
$("#gui-link").text("Mac GUIs").attr("href", `${baseURLPrefix}downloads/guis?os=mac`);
$("#gui-os-filter").attr('data-os', 'mac');
$("#gui-os-filter").text("Only show GUIs for my OS (Mac)")
} else if (os == "Windows") {
$(".monitor").addClass("windows");
$("#download-link").text("Download for Windows").attr("href", `${baseURLPrefix}downloads/win`);
$("#download-link").text("Download for Windows").attr("href", `${baseURLPrefix}install/windows`);
$("#gui-link").removeClass('mac').addClass('gui');
$("#gui-link").text("Windows GUIs").attr("href", `${baseURLPrefix}downloads/guis?os=windows`);
$("#alt-link").removeClass("windows").addClass("mac");
$("#alt-link").text("Mac Build").attr("href", `${baseURLPrefix}downloads/mac`);
$("#alt-link").text("Mac Build").attr("href", `${baseURLPrefix}install/mac`);
$("#gui-os-filter").attr('data-os', 'windows');
$("#gui-os-filter").text("Only show GUIs for my OS (Windows)")
} else if (os == "Linux") {
$(".monitor").addClass("linux");
$("#download-link").text("Download for Linux").attr("href", `${baseURLPrefix}downloads/linux`);
$("#download-link").text("Download for Linux").attr("href", `${baseURLPrefix}install/linux`);
$("#gui-link").removeClass('mac').addClass('gui');
$("#gui-link").text("Linux GUIs").attr("href", `${baseURLPrefix}downloads/guis?os=linux`);
$("#alt-link").removeClass("windows").addClass("mac");
$("#alt-link").text("Mac Build").attr("href", `${baseURLPrefix}downloads/mac`);
$("#alt-link").text("Mac Build").attr("href", `${baseURLPrefix}install/mac`);
$("#gui-os-filter").attr('data-os', 'linux');
$("#gui-os-filter").text("Only show GUIs for my OS (Linux)")
} else {
Expand Down Expand Up @@ -809,6 +810,22 @@ var Graphviz = {
}
}

var InstallPageLink = {
init: function() {
const installLink = document.querySelector('.install-link');
if (!installLink) return;

const os = window.session?.browser?.os;
if (os === "Mac") {
installLink.href = installLink.href.replace('/install', '/install/mac');
} else if (os === "Windows") {
installLink.href = installLink.href.replace('/install', '/install/win');
} else if (os === "Linux") {
installLink.href = installLink.href.replace('/install', '/install/linux');
}
}
}

var Print = {
init: function() {
Print.tagline = $("#tagline");
Expand Down
2 changes: 1 addition & 1 deletion assets/sass/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ $baseurl: "{{ .Site.BaseURL }}{{ if (and (ne .Site.BaseURL "/") (ne .Site.BaseUR
@import 'variables';
@import 'layout';
@import 'typography';
@import 'downloads';
@import 'install';
@import 'search';
@import 'front-page';
@import 'sidebar';
Expand Down
107 changes: 0 additions & 107 deletions assets/sass/downloads.scss

This file was deleted.

184 changes: 184 additions & 0 deletions assets/sass/install.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,184 @@
@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 {
color: var(--link-color);
}

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

// 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;
}
}

@media (max-width: $mobile-m) {
a[role="tab"] {
padding: .5rem;
line-height: 1.2em;
display: flex;

span {
margin: auto;
}
}
}
}

.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);
border-radius: 6px;
font-size: 0.75rem;
font-weight: bold;
@media (max-width: $mobile-m) {
max-width: 150px;
}

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

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

#logo-license {
@extend .callout;
padding: 20px !important;
margin-top: 2em;

p {
font-size: 12px;
line-height: 1.4;
color: var(--light-font-color);
}

p+p {
margin-top: 14px;
}

img {
float: left;
margin-right: 20px;
}
}

#download-next-steps {
@include clearfix;
@extend .unstyled !optional;
padding-top: 24px;

li {
display: block;
float: left;
width: 200px;
margin-bottom: 20px;
}

li+li {
margin-left: 20px;
}

a {
display: block;
color: var(--font-color);
text-align: center;
background-repeat: no-repeat;
background-position: 0 0;
transition-duration: 0.3s;
transition-property: color;

img {
display: block;
margin: 0 auto 10px;
opacity: 0.9;
transition-duration: 0.3s;
transition-property: opacity;
image-rendering: -webkit-optimize-contrast;
}

h3 {
font-size: 18px;
font-weight: bold;
color: var(--orange);
}

p {
font-size: 13px;
line-height: $base-line-height * 0.8;
}
}

a:hover {
img {
opacity: 1;
}

h3 {
color: var(--orange-darker-5);
}
}
}

.downloading .hide {
display: none;
}
2 changes: 1 addition & 1 deletion content/about/free-and-open-source.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h2>Free and Open Source</h2>
free for all its users.</p>

<p>However, we do restrict the use of the term "Git" and the
<a href="{{< relurl "downloads/logos" >}}">logos</a> to avoid confusion. Please
<a href="{{< relurl "community/logos" >}}">logos</a> to avoid confusion. Please
see our <a href="{{< relurl "trademark" >}}">trademark</a> policy for
details.</p>

Expand Down
2 changes: 1 addition & 1 deletion content/about/trademark.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ <h3>1 Purpose</h3>
<ul>
<li><p>The literal mark "Git"</p></li>
<li><p>The logos and graphic marks displayed and available for
download at <a href="https://git-scm.com/downloads/logos">https://git-scm.com/downloads/logos</a></p></li>
download at <a href="https://git-scm.com/community/logos">https://git-scm.com/community/logos</a></p></li>
<li><p>The slogan "the stupid content tracker"</p></li>
</ul>

Expand Down
6 changes: 6 additions & 0 deletions content/community/_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,12 @@ <h2 id="discord"><a class="anchor" href="#discord"></a> Discord Server </h2>
The <a href="https://discord.gg/GRFVkzgxRd">Git Community Discord Server</a> also has many knowledgeable and helpful people. Additionally, it provides a space to be able to voice chat about patches, designs, or anything else Git related.
</p>

<h2 id="logos"><a class="anchor" href="#logos"></a> Logos </h2>

<p>
Various <a href="{{< relurl "community/logos" >}}">Git logos</a> in PNG (bitmap) and EPS (vector) formats are available for use in online and print projects.
</p>

<h2 id="git-rev-news"><a class="anchor" href="#git-rev-news"></a> Newsletter </h2>

<p>
Expand Down
Loading
Loading