Skip to content

Commit d3c5fad

Browse files
authored
Fix dialogs (#25)
* add view all links * Finish updating all dialogs * fancy images
1 parent c22c333 commit d3c5fad

File tree

80 files changed

+467
-298
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+467
-298
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
export INSTALL_PATH ?= /usr/local/bin
22
export HUGO ?= hugo
3+
export HUGO_VERSION ?= 0.40.2
34
export HUGO_URL ?= http://localhost.cloudposse.com:1313/
45
export HUGO_ARGS ?= --watch --buildDrafts
56
export PACKAGES_VERSION ?= 0.1.7

config.toml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -46,46 +46,46 @@ home = [ "HTML", "RSS", "JSON"]
4646

4747
[[menu.shortcuts]]
4848
pre = "<h3>More</h3>"
49-
name = "<i class='fa fa-github'></i> <label>Documentation</label>"
49+
name = "<i class='fa fa-book'></i> <label>Documentation</label>"
5050
identifier = "documentation"
5151
url = "/"
5252
weight = 10
5353

5454
[[menu.shortcuts]]
55-
pre = "<h3>More</h3>"
56-
name = "<i class='fa fa-github'></i> <label>Support</label>"
57-
identifier = "support"
58-
url = "https://github.com/cloudposse/docs/issues"
55+
name = "<i class='fa fa-bullhorn'></i> <label>Announcements</label>"
56+
identifier = "announcements"
57+
url = "/announcements/"
5958
weight = 20
6059

61-
[[menu.shortcuts]]
62-
pre = "<h3>More</h3>"
63-
name = "<i class='fa fa-github'></i> <label>Ask a Question</label>"
64-
identifier = "ask-a-question"
65-
url = "https://github.com/cloudposse/docs/issues/new"
66-
weight = 30
67-
6860
[[menu.shortcuts]]
6961
pre = "<h3>More</h3>"
7062
name = "<i class='fa fa-github'></i> <label>Our GitHub</label>"
7163
identifier = "github"
7264
url = "https://github.com/cloudposse/"
65+
weight = 30
66+
67+
[[menu.shortcuts]]
68+
name = "<i class='fa fa-bookmark'></i> <label>Blog</label>"
69+
identifier = "blog"
70+
url = "https://cloudposse.com/blog/"
7371
weight = 40
7472

7573
[[menu.shortcuts]]
76-
name = "<i class='fa fa-cloud-download'></i> <label>Announcements</label>"
77-
identifier = "announcements"
78-
url = "/announcements/"
74+
pre = "<h3>More</h3>"
75+
name = "<i class='fa fa-question'></i> <label>Support</label>"
76+
identifier = "support"
77+
url = "https://github.com/cloudposse/docs/issues"
7978
weight = 50
8079

8180
[[menu.shortcuts]]
82-
name = "<i class='fa fa-bookmark'></i> <label>Blog</label>"
83-
identifier = "blog"
84-
url = "https://cloudposse.com/blog/"
81+
pre = "<h3>More</h3>"
82+
name = "<i class='fa fa-edit'></i> <label>Ask a Question</label>"
83+
identifier = "ask-a-question"
84+
url = "https://github.com/cloudposse/docs/issues/new"
8585
weight = 60
8686

8787
[[menu.shortcuts]]
88-
name = "<i class='fa fa-bullhorn'></i> <label>Contact Us</label>"
88+
name = "<i class='fa fa-envelope'></i> <label>Contact Us</label>"
8989
url = "/documentation/contact-us/"
9090
identifier = "contact-us"
9191
weight = 70

content/announcements/_index.mb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
---
22
title: "Announcements"
3+
icon: "fa fa-bullhorn"
4+
head: "dude"
35
---
46
Welcome to the developer hub and documentation for Cloud Posse! Here you'll find announcements pertaining to new projects, terraform modules, helm charts, and other offerings.
57

content/aws/_index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
title: AWS Infrastructure
33
slug: "aws"
4+
icon: "fab fa-aws"
45
excerpt: ''
56
---
67

content/contributors/_index.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
22
title: "Contributors"
33
excerpt: ""
4+
icon: "fa fa-users"
45
---
5-
{{% dialog type="info" icon="fa-info-circle" title="People" %}}
6+
{{% dialog type="info" icon="fa fa-info-circle" title="People" %}}
67
⇠ Select one of the contributors on the left to learn more about them.
78
{{% /dialog %}}

content/development/_index.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
22
title: "Development"
33
excerpt: ""
4+
icon: "fa fa-code"
45
---
5-
{{% dialog type="info" icon="fa-info-circle" title="Read More" %}}
6+
{{% dialog type="info" icon="fa fa-book" title="Read More" %}}
67
⇠ Select one of these pages to learn more about the topic.
78
{{% /dialog %}}

content/development/github/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
title: "GitHub"
33
excerpt: ""
44
---
5-
{{% dialog type="info" icon="fa-info-circle" title="Read More" %}}
5+
{{% dialog type="info" icon="fa fa-book" title="Read More" %}}
66
⇠ Select one of the pages to learn more about the topic.
77
{{% /dialog %}}

content/development/github/feature-branches.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,20 @@ The next thing that needs to happen is that the `master` branch is treated as th
2121

2222
Once a feature is considered ready, the developer submits a Pull Request (or PR) and assigns it to a Subject Matter Expert (SME) or peer for review.
2323

24-
On the surface, this is what a well-formatted Pull Request looks like: ![Pull Request Example](/assets/e802ae2-image_3.png) A _Pull Request_ allows many things to happen:
24+
On the surface, this is what a well-formatted Pull Request looks like: {{< img src="/assets/e802ae2-image_3.png" title="Example Pull Request" >}}
2525

26-
- **Title**: A "human readable" title that represents the feature! ![Pull Request Title](/assets/2d4fce9-image.png)
26+
27+
A _Pull Request_ allows many things to happen:
28+
29+
- **Title**: A "human readable" title that represents the feature! {{< img src="/assets/2d4fce9-image.png" title="Example Pull Request Title" >}}
2730
- **Description**: A long description that details **_What_** was changed, **_Why_** it was deemed necessary, and any other **_References_** that might be useful (E.g. Jira ticket)
2831
- **Comments**: let anyone provide arbitrary feedback viewable by everyone.
2932
- **Diffs**: show what changed between this feature and the current master branch
30-
- **Formal Code Review Process:** let multiple people contribute to the code review process by submitting comments on a line-by-line basis. Having these code reviews formally documented serves as an excellent teaching tool. Over time, the reviews become faster and faster as developers learn what is expected. ![](/assets/9df4fad-image_2.png)
31-
- **Merging**: Once the PR is approved, the developer can squash and merge their code into the master branch. Squashing allows the master branch to have a very clean commit history where every commit corresponds to a PR. ![](/assets/2b3e7eb-image_4.png)
32-
- **Clean Commit History**: means that every change to the master branch is documented and justified. No one is sneaking in changes. ![Clean Commit History](/assets/b3dae79-image_5.png)
33-
- **History of Features** and when they were added ![History of Features](/assets/f9a3727-image_7.png)
34-
- **Reverting**: If a feature needs to be removed, with the click of a single button it can be removed from the `master` branch ![Reverting Changes](/assets/28887e9-image_8.png)
33+
- **Formal Code Review Process:** let multiple people contribute to the code review process by submitting comments on a line-by-line basis. Having these code reviews formally documented serves as an excellent teaching tool. Over time, the reviews become faster and faster as developers learn what is expected. {{< img src="/assets/9df4fad-image_2.png" title="Example of Code Review" >}}
34+
- **Merging**: Once the PR is approved, the developer can squash and merge their code into the master branch. Squashing allows the master branch to have a very clean commit history where every commit corresponds to a PR. {{< img src="/assets/2b3e7eb-image_4.png" title="Example of Merging" >}}
35+
- **Clean Commit History**: means that every change to the master branch is documented and justified. No one is sneaking in changes. {{< img src="/assets/b3dae79-image_5.png" title="Example of Clean Commit History" >}}
36+
- **History of Features** and when they were added {{< img src="/assets/f9a3727-image_7.png" title="History of Features" >}}
37+
- **Reverting**: If a feature needs to be removed, with the click of a single button it can be removed from the `master` branch {{< img src="/assets/28887e9-image_8.png" title="Example of Reverting Changes" >}}
3538

3639
# Technical Details
3740

content/development/github/pull-requests.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,6 @@ Use the following markdown template to describe the Pull Request.
4444

4545
**Pro Tip:** Use a `.github/pull_request_template.md` file to automatically populate this template when creating new Pull Requests.
4646

47-
Read more: <https://help.github.com/articles/creating-a-pull-request-template-for-your-repository/>
47+
{{% dialog type="info" icon="fa fa-book" title="Read More" %}}
48+
<https://help.github.com/articles/creating-a-pull-request-template-for-your-repository/>
49+
{{% /dialog %}}

content/development/markdown/best-practices.md

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ excerpt: ''
77

88
Using Markdown is essential for clear communication on mediums such as GitHub, Slack or just plain text. Here are some of our recommendations on when to use certain conventions.
99

10-
{{% dialog type="info" icon="fa-info-circle" title="Markdown Cheatsheet" %}} If you're new to Markdown or need a refresher, check out our [Markdown cheatsheet](/development/markdown). {{% /dialog %}}
10+
{{% dialog type="info" icon="fa fa-info-circle" title="Markdown Cheatsheet" %}} If you're new to Markdown or need a refresher, check out our [Markdown cheatsheet](/development/markdown). {{% /dialog %}}
1111

1212
# Code Blocks
1313

1414
Use code blocks for anything more than 1 line. Use `code` for inline code, filenames, commands, etc.
1515

1616
## Code Block
1717

18-
````markdown
18+
~~~~markdown
1919
```
2020
# This is a code block
2121
```
22-
`````
22+
~~~~
2323

2424

2525
## Table of Options
@@ -30,23 +30,25 @@ Here's an example:
3030

3131
##### Table of Options
3232
```markdown
33-
| Name | Default | Description | Required |
34-
|:------------|:--------:|:----------------------------------------------|:--------:|
35-
| namespace | `` | Namespace (e.g. `cp` or `cloudposse`) | Yes |
36-
| stage | `` | Stage (e.g. `prod`, `dev`, `staging`) | Yes |
37-
| name | `` | Name (e.g. `bastion` or `db`) | Yes |
38-
| attributes | [] | Additional attributes (e.g. `policy`) | No |
39-
| tags | {} | Additional tags (e.g. `map("Foo","XYZ")`) | No |
33+
| Name | Default | Description | Required |
34+
|:---------- |:-------:|:------------------------------------------ |:--------:|
35+
| namespace | | Namespace (e.g. `cp` or `cloudposse`) | Yes |
36+
| stage | | Stage (e.g. `prod`, `dev`, `staging`) | Yes |
37+
| name | | Name (e.g. `bastion` or `db`) | Yes |
38+
| attributes | [] | Additional attributes (e.g. `policy`) | No |
39+
| tags | {} | Additional tags (e.g. `map("Foo","XYZ")`) | No |
40+
```
4041

4142
* `:--------:` should be used for “Default” and “Required” values
4243
* `:---------` should be used for all other columns
43-
* Use `` for empty defaults
4444
* Use `value` for all values
4545

4646

47-
Which will render to something like this: ![](/assets/8d8cdf3-image_23.png)
47+
Which will render to something like this:
48+
49+
{{< img src="/assets/8d8cdf3-image_23.png" title="Example Markdown Table Rendering" >}}
4850

49-
![Example Markdown Table](/assets/a2761a9-image_22.png)
51+
{{< img src="/assets/a2761a9-image_22.png" title="Example Markdown Table Rendering" >}}
5052

5153
# Feature List Formatting
5254

0 commit comments

Comments
 (0)