Skip to content

Commit

Permalink
Merge pull request #25 from pedro-psb/update-some-references
Browse files Browse the repository at this point in the history
Update links, add brand color and fix title display
  • Loading branch information
ggainey authored Mar 25, 2024
2 parents 103b7ea + 06e974b commit e7fadf8
Show file tree
Hide file tree
Showing 12 changed files with 177 additions and 17 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Also, this should be used for the production build.

Through a `mkdocs-macro-plugin` hook (called in early stages of mkdocs processing), we inject the following steps:

1. Read [`repolist.yml`](https://github.com/pedro-psb/pulp-docs/blob/main/src/pulp_docs/data/repolist.yml) packaged with `pulp-docs` to know which repos/urls to use
1. Read [`repolist.yml`](https://github.com/pulp/pulp-docs/blob/main/src/pulp_docs/data/repolist.yml) packaged with `pulp-docs` to know which repos/urls to use
1. Download/Move all source code required to dir under `tempfile.gettempdir()`
- Uses `../{repo}` if available OR
- Uses existing cached `{tmpdir}/{repo}` if available OR
Expand All @@ -39,7 +39,7 @@ And thats it, the magic is done.
Recommended way for daily usage:

```bash
pipx install git+https://github.com/pedro-psb/pulp-docs --include-deps
pipx install git+https://github.com/pulp/pulp-docs --include-deps
pulp-docs serve
```

Expand Down
4 changes: 2 additions & 2 deletions src/pulp_docs/data/mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repo_name: pulp/pulpcore
docs_dir: docs
theme:
name: material
logo: pulp-docs/docs/assets/logo.png
logo: pulp-docs/docs/assets/pulp_logo_icon.svg
favicon: pulp-docs/docs/assets/favicon.ico
features:
- content.code.annotate
Expand All @@ -25,7 +25,7 @@ theme:
palette:
- media: "(prefers-color-scheme: light)"
scheme: default
primary: indigo
primary: custom
accent: black
toggle:
icon: material/toggle-switch-off-outline
Expand Down
4 changes: 2 additions & 2 deletions src/pulp_docs/data/repolist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ repos:
title: Pulp OCI Images
branch: latest
- name: pulp-docs
owner: pedro-psb
title: Docs Tool
owner: pulp
title: Pulp Docs
branch: main
- name: pulp-operator
owner: pulp
Expand Down
2 changes: 1 addition & 1 deletion src/pulp_docs/mkdocs_macros.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def prepare_repositories(TMPDIR: Path, repos: Repos, config: Config):

# Copy core-files (shipped with pulp-docs) to tmpdir
shutil.copy(
repo_sources / repos.core_repo.name / SRC_DOCS_DIRNAME / "index.md",
repo_sources / "pulp-docs" / SRC_DOCS_DIRNAME / "index.md",
repo_docs / "index.md",
)

Expand Down
96 changes: 96 additions & 0 deletions staging_docs/assets/pulp_logo_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 8 additions & 2 deletions staging_docs/css/extra.css
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,13 @@
text-align: center;
margin-inline: auto;
}
.hide-h1 {
position: absolute;
left: -999px
}

.landing-page-h1 {
display: None;
:root {
--md-primary-fg-color: #347dbe;
--md-primary-fg-color--light: #ECB7B7;
--md-primary-fg-color--dark: #90030C;/
}
6 changes: 3 additions & 3 deletions staging_docs/dev/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ It was developed as part of [The new Pulp "Unified Docs"](https://hackmd.io/eE3k

Through a `mkdocs-macro-plugin` hook (called in early stages of mkdocs processing), we inject the following steps:

1. Read [`repolist.yml`](https://github.com/pedro-psb/pulp-docs/blob/main/src/pulp_docs/data/repolist.yml) packaged with `pulp-docs` to know which repos/urls to use
1. Read [`repolist.yml`](https://github.com/pulp/pulp-docs/blob/main/src/pulp_docs/data/repolist.yml) packaged with `pulp-docs` to know which repos/urls to use
1. Download and Place all source code required to dir under `tempfile.gettempdir()`
- Uses `../{repo}` if available OR
- Uses existing cached `{tmpdir}/{repo}` if available OR
Expand All @@ -27,13 +27,13 @@ Recommended way for daily usage:
=== "pipx"

```bash
pipx install git+https://github.com/pedro-psb/pulp-docs --include-deps
pipx install git+https://github.com/pulp/pulp-docs --include-deps
pulp-docs serve
```

=== "pip"

```bash
pip --user install git+https://github.com/pedro-psb/pulp-docs
pip --user install git+https://github.com/pulp/pulp-docs
pulp-docs serve
```
2 changes: 1 addition & 1 deletion staging_docs/dev/reference/markdown-cheatsheet.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ There are basic markdown features recommended for use in Pulp.
```

- This is enabled by [mkdocs-site-urls](https://github.com/octoprint/mkdocs-site-urls) plugin.
- This is preferred over *relative* links because of our complex structure. See tradeoffs [here](https://github.com/pedro-psb/pulp-docs/issues/2)
- This is preferred over *relative* links because of our complex structure. See tradeoffs [here](https://github.com/pulp/pulp-docs/issues/2)


### Codeblocks
Expand Down
53 changes: 53 additions & 0 deletions staging_docs/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
---
hide:
- navigation
- toc
- footer
---

# Home {.hide-h1}
<div class="hero-header" markdown>

![Pulp Logo](site:pulpcore/docs/assets/pulp_logo_big.png)

## Pulp is an open source project that makes it easy for developers to fetch, upload, and distribute *Software Packages* on-prem or in the cloud. {: #pulp-project}

</div>

---

<div class="grid cards" markdown>

- :material-clock-fast:{ .lg .middle } **Starter Tutorial**

---

Learn to manage content with Pulp and get yourself familiar with core concepts and workflows.

[:octicons-arrow-right-24: Getting started](site:pulpcore/docs/user/tutorials/01-overview/)

- :octicons-download-16:{ .lg .middle } **Pulp in a Container**

---

Use OCI (Open Container Initiative) images to install Pulp in single or multi-container setups.

[:octicons-arrow-right-24: Installation Quickstart](site:pulp-oci-images/docs/admin/tutorials/quickstart/)

- :octicons-rocket-16:{ .lg .middle } **Why Pulp?**

---

Learn why important projects rely on Pulp to manage the lifecyle of huge *Software Content* collections.

[:octicons-arrow-right-24: Features](#)

- :octicons-people-16:{ .lg .middle } **Get Involved**

---

Join our communication channels and get to know the contributors and users of Pulp's strong ecosystem.

[:octicons-arrow-right-24: Community](#)

</div>
4 changes: 3 additions & 1 deletion staging_docs/sections/admin/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
hide:
- toc
---

# Admin Guide {.hide-h1}

<div class="hero-header" markdown>
<h1 class="landing-page-h1"></h1>

## This section is for **admins**

Expand Down
4 changes: 3 additions & 1 deletion staging_docs/sections/dev/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
hide:
- toc
---

# Developer Guide {.hide-h1}

<div class="hero-header" markdown>
<h1 class="landing-page-h1"></h1>

## This section is for Pulp **developers**

Expand Down
5 changes: 3 additions & 2 deletions staging_docs/sections/user/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
hide:
- toc
---
<div class="hero-header" markdown>

<h1 class="landing-page-h1"></h1>
# User Guide {.hide-h1}

<div class="hero-header" markdown>

## This section is for **users**

Expand Down

0 comments on commit e7fadf8

Please sign in to comment.