Skip to content

Commit

Permalink
Addressing comments
Browse files Browse the repository at this point in the history
  • Loading branch information
jonmeow committed Aug 19, 2024
1 parent ad68f8b commit 4fa7426
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gh_pages_deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name: GitHub Pages deploy
on:
# Runs on pushes targeting the default branch.
push:
branches: ['trunk']
branches: ['pages']

# Allows you to run this workflow manually from the Actions tab.
workflow_dispatch:
Expand Down
13 changes: 1 addition & 12 deletions website/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Exceptions. See /LICENSE for license information.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

title: Carbon Language
title: Carbon language documentation
description: An experimental successor to C++

# https://just-the-docs.github.io/just-the-docs/
Expand All @@ -19,17 +19,6 @@ mermaid:
# Pick an available version from https://cdn.jsdelivr.net/npm/mermaid/
version: '10.9.1'

# Back to top link.
back_to_top: true
back_to_top_text: 'Back to top'

# View on GitHub link.
gh_edit_link: true
gh_edit_link_text: 'View on GitHub'
gh_edit_repository: 'https://github.com/carbon-language/carbon-lang'
gh_edit_branch: 'trunk'
gh_edit_view_mode: 'tree'

# We add frontmatter to files, but still want README.md -> index.md.
readme_index:
remove_originals: true
Expand Down
34 changes: 34 additions & 0 deletions website/_includes/footer_custom.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<!--
Part of the Carbon Language project, under the Apache License v2.0 with LLVM
Exceptions. See /LICENSE for license information.
SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-->

<!--
Used from:
https://github.com/just-the-docs/just-the-docs/blob/main/_includes/components/footer.html
-->
<hr />
<footer class="site-footer">
<p><a href="#top" id="back-to-top">Back to top</a></p>

<p>
<a
href="https://github.com/carbon-language/carbon-lang/tree/trunk/{{ page.path }}"
id="edit-this-page"
>View on GitHub</a
>
</p>

<p>
Part of the Carbon Language project, under the Apache License v2.0 with LLVM
Exceptions. See <a href="/LICENSE">/LICENSE</a> for license information.
</p>

<p>
This site uses
<a href="https://github.com/just-the-docs/just-the-docs">Just the Docs</a>.
</p>

<p>Hosted on GitHub Pages.</p>
</footer>
2 changes: 2 additions & 0 deletions website/_includes/nav_footer_custom.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
<!--
Used from:
https://github.com/just-the-docs/just-the-docs/blob/main/_includes/components/sidebar.html
This just removes the nav footer; we use `footer_custom.html` instead.
-->
<footer class="site-footer">
This site uses
Expand Down

0 comments on commit 4fa7426

Please sign in to comment.