Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
129 commits
Select commit Hold shift + click to select a range
d4ddb58
Move content into docs/content
cnunciato Jun 6, 2019
c2bdf39
Make navigation and doc generation work
cnunciato Jun 6, 2019
d2a067c
Merge pull request #1128 from pulumi/cnunciato/subdir
cnunciato Jun 7, 2019
3a68f9c
Make search work
cnunciato Jun 7, 2019
5d9f14f
Merge pull request #1132 from pulumi/cnunciato/search
cnunciato Jun 7, 2019
56a6e96
Move docs-specific layouts into layouts/docs
cnunciato Jun 7, 2019
e4cab67
Move docs partials into layouts/partials/docs
cnunciato Jun 7, 2019
62a37eb
Share a common header and footer
cnunciato Jun 7, 2019
b09419e
Add product & pricing pages, modify main nav
cnunciato Jun 7, 2019
9d2325f
Bring images under assets, docs images under assets/images/docs
cnunciato Jun 7, 2019
1d17e3a
Link to the docs home page, fix image ref
cnunciato Jun 7, 2019
7160ffa
Add containers, serverless, kubernetes topics
cnunciato Jun 7, 2019
1107e79
Add careers
cnunciato Jun 7, 2019
5c07bf2
Add compete, compete -> migrate
cnunciato Jun 7, 2019
d39e032
About, contact
cnunciato Jun 7, 2019
d785c5d
Add legal
cnunciato Jun 7, 2019
a856fd0
Add product
cnunciato Jun 7, 2019
30903a5
Add partner content
cnunciato Jun 7, 2019
e0cb45c
Add webinar
cnunciato Jun 7, 2019
f3156da
Add why-pulumi
cnunciato Jun 7, 2019
fa4529c
Add GitHub redirect, support
cnunciato Jun 8, 2019
ad8cb36
Add blog
chrsmith Jun 8, 2019
6863806
Add blog - update post frontmatter
chrsmith Jun 8, 2019
a915a73
Update content/_index.md
cnunciato Jun 9, 2019
27bc1ac
Remove drafts & redundant fonts, move asset dirs up a level
cnunciato Jun 10, 2019
dd3f6bf
Reconcile blog navigation
cnunciato Jun 10, 2019
351af52
Merge pull request #1134 from pulumi/cnunciato/add-www
cnunciato Jun 10, 2019
d7e3b66
Migrate some blog content (#1147)
chrsmith Jun 11, 2019
ceee0a9
Reconcile www, blog and docs footer items (#1141)
cnunciato Jun 11, 2019
8f7e7b0
Clean up blog layout (#1148)
chrsmith Jun 12, 2019
2cc2b02
Migrate more blog posts (#1157)
chrsmith Jun 12, 2019
351f922
Replace Bootstrap with TailwindCSS
cnunciato Jun 12, 2019
1057cea
Refactor the docs home page
cnunciato Jun 12, 2019
1ea7237
Refactor docs single, list and section layouts
cnunciato Jun 12, 2019
8f8c08a
Refactor quickstart-clouds partial
cnunciato Jun 12, 2019
52952a3
Reposition config items to fix syntax highlighting
cnunciato Jun 12, 2019
c4e725f
Replace syntax CSS theme with Monokai
cnunciato Jun 12, 2019
30fe353
Add a dark blue for links
cnunciato Jun 12, 2019
29760ca
Add the beginnings of Sass color settings
cnunciato Jun 12, 2019
6e4934c
Add a Sass file for langchoose
cnunciato Jun 12, 2019
d7c00f9
Give no-select its own Sass also, since it’s a partial
cnunciato Jun 12, 2019
8fc93bb
Give docs single and list templates more width for main content
cnunciato Jun 12, 2019
5da2bd3
Add some padding to the TOC, since we don’t have proper gutters yet
cnunciato Jun 12, 2019
68380e6
Fix button on Quickstart home page
cnunciato Jun 12, 2019
b66c54b
TOC styles
cnunciato Jun 12, 2019
bd3e324
Quickstart clouds
cnunciato Jun 12, 2019
f5995c0
Padding to left and right columns
cnunciato Jun 12, 2019
fe007b6
Black for TOC
cnunciato Jun 12, 2019
3304a7f
Refactor docs/aws to use its own layouts
cnunciato Jun 12, 2019
87f51ea
Fix the AWS tech partner image
cnunciato Jun 12, 2019
f924016
Adjust AWS layouts
cnunciato Jun 12, 2019
d94190f
Move docs-home markup into a layout
cnunciato Jun 12, 2019
8ba5907
Format the mini-toc
cnunciato Jun 12, 2019
622dc96
Reduce subhead sizes a bit
cnunciato Jun 12, 2019
1e7582b
Remove snowflake styles
cnunciato Jun 13, 2019
1b67a24
Extract some Sass partials
cnunciato Jun 13, 2019
5cd870d
Define initial purple and blue palettes, use numbered colors instead
cnunciato Jun 13, 2019
84d03c5
Refactor blog templates
cnunciato Jun 13, 2019
31125c4
Make blog summary a partial, style pagination
cnunciato Jun 14, 2019
8cca38a
Fix expanded URLs
cnunciato Jun 14, 2019
763185a
Rename Documentation to Reference
cnunciato Jun 14, 2019
7bba6ab
A smattering of minor adjustments
cnunciato Jun 14, 2019
3489aae
Selection state for tags
cnunciato Jun 14, 2019
fb1503c
Delete more Bootstrap
cnunciato Jun 14, 2019
766087a
Comment the banner
cnunciato Jun 14, 2019
536b82e
Restore footer links
cnunciato Jun 14, 2019
9a29b9f
Legal layout
cnunciato Jun 14, 2019
b6721af
Remove unused layout
cnunciato Jun 14, 2019
8a8dcdc
Refactor careers page
cnunciato Jun 14, 2019
80272aa
Use top-level URLs for legal docs
cnunciato Jun 17, 2019
93db8a7
Merge pull request #1175 from pulumi/cnunciato/tailwind
cnunciato Jun 17, 2019
212a006
Add RSS for the blog (#1170)
cnunciato Jun 17, 2019
99b31f1
Merge branch 'master' into 'fusion'
justinvp Jun 18, 2019
dffdc69
Merge pull request #1189 from pulumi/justin/master2fusion
justinvp Jun 19, 2019
56852f1
Cleanup team data (#1195)
chrsmith Jun 19, 2019
76007cd
Blog content as of 6/16 (#1196)
chrsmith Jun 21, 2019
8da7bd3
Add fusion stack
justinvp Jun 22, 2019
ea2aec6
Fix broken links
justinvp Jun 22, 2019
e28b0c6
Fix broken images in fusion branch (#1207)
justinvp Jun 23, 2019
efc43bb
Integrate www content (#1208)
cnunciato Jun 24, 2019
52b2150
Highlight currently selected section tab (#1216)
justinvp Jun 24, 2019
22fdc65
Remove unused partials (#1215)
cnunciato Jun 24, 2019
43c7409
Blog content as of 6/24 (#1218)
chrsmith Jun 24, 2019
8892814
Restore meta_* fields, tidy up some frontmatter (#1214)
cnunciato Jun 24, 2019
c9e3472
Add search (#1217)
cnunciato Jun 24, 2019
923a3a0
Hide `.language-prologue-*` by default (#1212)
justinvp Jun 24, 2019
0778c94
Limit team members to those with status “active” (#1219)
cnunciato Jun 24, 2019
1c086bd
Merge branch 'master' into 'fusion'
justinvp Jun 25, 2019
47b4e6f
Fix links to datadog provider
justinvp Jun 25, 2019
19b0440
Remove top margin from code snippets under lang tabs (#1223)
justinvp Jun 25, 2019
be910db
Update MBR DNA logo (#1222)
chrsmith Jun 25, 2019
7d04202
Add links to cloud logos (#1221)
justinvp Jun 25, 2019
3d59a9a
Remove unnecessary aliases (#1210)
justinvp Jun 25, 2019
5ebd4ac
Merge branch 'fusion' into justin/master2fusion
justinvp Jun 25, 2019
adff23e
Pricing page updates (#1224)
cnunciato Jun 25, 2019
1d944b0
Merge pull request #1220 from pulumi/justin/master2fusion
justinvp Jun 25, 2019
684504c
Update API docs (#1227)
justinvp Jun 26, 2019
39b3b6f
Fix broken images (#1228)
justinvp Jun 26, 2019
49e6e95
Fix Hugo build warning about non-relative ref/relref page reference (…
justinvp Jun 26, 2019
3384e98
Fix page titles and errant anchors (#1226)
cnunciato Jun 26, 2019
9c25e5f
Add a robots.txt file (#1225)
cnunciato Jun 26, 2019
b5c1b6b
Blog content fixes (#1231)
chrsmith Jun 26, 2019
c626dc6
Use a fixed height for the utility bar (#1232)
cnunciato Jun 26, 2019
b1bd044
Fix TOC expansion for the tour (#1234)
justinvp Jun 27, 2019
f090c5d
Add syntax highlighing to layout templates (#1238)
cnunciato Jun 27, 2019
8650073
Add home-page video (#1240)
cnunciato Jun 27, 2019
e994b72
Blog layout and styling improvements (#1237)
chrsmith Jun 27, 2019
0380c2b
Cleanup the /docs page (#1239)
justinvp Jun 27, 2019
79c31e6
Remove unnecessary cursor setting (#1245)
cnunciato Jun 27, 2019
69debda
Update the home page video (#1244)
cnunciato Jun 27, 2019
90887e6
API doc styling improvements (#1247)
justinvp Jun 27, 2019
a6652b4
Merge branch 'master' into 'fusion'
justinvp Jun 28, 2019
27fa1e7
Various mobile adjustments and cleanup (#1250)
cnunciato Jun 28, 2019
29f8288
Fix bug in lang chooser (#1249)
justinvp Jun 29, 2019
e2166be
More small fixes (#1254)
cnunciato Jun 30, 2019
116bce6
Merge pull request #1252 from pulumi/justin/master2fusion
justinvp Jul 1, 2019
1d51345
Add hero background glows (#1257)
cnunciato Jul 1, 2019
fbbf825
Hide scrollbars if not needed (#1256)
chrsmith Jul 2, 2019
8f91824
Improve Pricing page responsiveness, fix a few other small things (#…
cnunciato Jul 2, 2019
2d17979
Replace home page video with carousel (#1260)
cnunciato Jul 2, 2019
03c13fb
Merge branch 'master' into 'fusion'
justinvp Jul 2, 2019
ca2d762
Merge pull request #1263 from pulumi/justin/master2fusion
justinvp Jul 2, 2019
900fe91
Change Segment module to WWW (#1265)
chrsmith Jul 2, 2019
81e50a2
Hook up new www.pulumi.com/staging stack to CI/CD (#1262)
chrsmith Jul 2, 2019
5bd9f41
Add hover menu (#1266)
cnunciato Jul 2, 2019
1088d3e
Hook up new www.pulumi.com/production stack to CI/CD (#1267)
chrsmith Jul 2, 2019
a2b4602
Migrate blog posts as of 7/2 (#1268)
chrsmith Jul 2, 2019
6099e71
Fix Makefile syntax
chrsmith Jul 2, 2019
92e452c
Fix spelling error ::sigh::
chrsmith Jul 2, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 7 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Hugo default output directory
/public
# Hugo generated resources directory. Note: if the generated files
# were checked into the repo, could improve build times. But since
# we rebuild as part of CI/CD deployments, we just don't check-in.
/resources

.DS_Store
/resources/
/public/
node_modules
*.map
13 changes: 6 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ branches:
only:
- master
- production
- fusion
before_install:
# Use travisqueue to manage build concurrency.
- ./scripts/travisqueue.sh install
- ./scripts/travisqueue.sh start
# Download and install required tools.
# Install assume-role tool for use when deploying
- go get -u github.com/remind101/assume-role
# AWS CLI
- pip install --upgrade --user awscli
# pulumi
Expand All @@ -25,7 +25,6 @@ before_install:
script:
- echo "TRAVIS_EVENT_TYPE=${TRAVIS_EVENT_TYPE}"
- make travis_${TRAVIS_EVENT_TYPE}
after_script:
- ./scripts/travisqueue.sh finish
notifications:
webhooks: https://ufci1w66n3.execute-api.us-west-2.amazonaws.com/stage/travis
# TODO: Reenable once kinks worked out.
# notifications:
# webhooks: https://ufci1w66n3.execute-api.us-west-2.amazonaws.com/stage/travis
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
We generally use Hugo's [`relref` shortcode](https://gohugo.io/content-management/shortcodes/#ref-and-relref) when linking to other pages. Examples:

```markdown
[Install]({{< relref "/reference/install.md" >}})
[Outputs]({{< relref "programming-model.md#stack-outputs" >}})
[Install]({{< relref "/docs/reference/install.md" >}})
[Outputs]({{< relref "/docs/reference/programming-model.md#stack-outputs" >}})
```

Which, on a page inside the `./content/reference` directory, will generate:

```html
<a href="/reference/install/">Install</a>
<a href="/reference/programming-model/#stack-outputs">Outputs</a>
<a href="/docs/reference/install/">Install</a>
<a href="/docs/reference/programming-model/#stack-outputs">Outputs</a>
```


Expand Down
88 changes: 39 additions & 49 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ all: banner generate build
.PHONY: banner
banner:
@echo -e "\033[1;37m=========================\033[0m"
@echo -e "\033[1;37mPulumi Documentation Site\033[0m"
@echo -e "\033[1;37mPulumi Website \033[0m"
@echo -e "\033[1;37m=========================\033[0m"

.PHONY: ensure
Expand All @@ -24,14 +24,14 @@ generate:
@echo -e "\033[0;32mGENERATE:\033[0m"
./scripts/run_typedoc.sh
./scripts/generate_python_docs.sh
pulumi gen-markdown ./content/reference/cli
pulumi gen-markdown ./content/docs/reference/cli

.PHONY: build
build:
@echo -e "\033[0;32mBUILD:\033[0m"
hugo
node ./scripts/build-search-index.js < ./public/search-data/index.json > ./public/search-index.json
rm -rf ./public/search-data
node ./scripts/build-search-index.js < ./public/docs/search-data/index.json > ./public/docs/search-index.json
rm -rf ./public/docs/search-data

.PHONY: test
test:
Expand All @@ -44,11 +44,13 @@ test:
# although valid and publicly available, is reported as a broken link.
# Fixes for the former two are tracked by https://github.com/pulumi/docs/issues/568.
./node_modules/.bin/blc http://localhost:1313 -r \
--exclude "/reference/pkg" \
--exclude "/reference/changelog" \
--exclude "/docs/reference/pkg" \
--exclude "/docs/reference/changelog" \
--exclude "https://github.com/pulumi/docs/edit/master" \
--exclude "https://www.linkedin.com/company/pulumi/" \
--exclude "https://marketplace.visualstudio.com/items?itemName=pulumi.build-and-release-task"
--exclude "https://www.linkedin.com/" \
--exclude "https://marketplace.visualstudio.com/items?itemName=pulumi.build-and-release-task" \
--exclude "https://blog.mapbox.com/" \
--exclude "https://github.com/pulls?"

.PHONY: validate
validate:
Expand All @@ -57,65 +59,53 @@ validate:
$(MAKE) test
pkill -f hugo

.PHONY: preview
preview:
@echo -e "\033[0;32mPREVIEW:\033[0m"
ifeq ($(TRAVIS_BRANCH),master)
./scripts/preview.sh staging
endif
ifeq ($(TRAVIS_BRANCH),production)
./scripts/preview.sh production
endif

.PHONY: deploy
deploy:
@echo -e "\033[0;32mDEPLOY:\033[0m"
ifeq ($(TRAVIS_BRANCH),master)
./scripts/update.sh staging
endif
ifeq ($(TRAVIS_BRANCH),production)
./scripts/update.sh production
endif

.PHONY: travis_push
travis_push::
$(MAKE) banner
$(MAKE) ensure
ifeq ($(TRAVIS_BRANCH),master)
HUGO_BASEURL=https://staging.pulumi.io/ $(MAKE) build
# NB. Delete fusion once dust settles.
ifeq ($(TRAVIS_BRANCH),fusion)
HUGO_BASEURL=https://www-staging.pulumi.com/ $(MAKE) build
$(MAKE) validate
./scripts/run-pulumi.sh update staging
else ifeq ($(TRAVIS_BRANCH),master)
HUGO_BASEURL=https://www-staging.pulumi.com/ $(MAKE) build
$(MAKE) validate
./scripts/run-pulumi.sh update staging
else ifeq ($(TRAVIS_BRANCH),production)
HUGO_BASEURL=https://www.pulumi.com/ $(MAKE) build
$(MAKE) validate
./scripts/run-pulumi.sh update production
else
$(MAKE) build
$(MAKE) validate
endif
$(MAKE) deploy

.PHONY: travis_pull_request
travis_pull_request::
$(MAKE) banner
$(MAKE) ensure
ifeq ($(TRAVIS_BRANCH),master)
HUGO_BASEURL=https://staging.pulumi.io/ $(MAKE) build
# NB. Delete fusion once dust settles.
ifeq ($(TRAVIS_BRANCH),fusion)
HUGO_BASEURL=https://www-staging.pulumi.com/ $(MAKE) build
$(MAKE) validate
./scripts/run-pulumi.sh preview staging
else ifeq ($(TRAVIS_BRANCH),master)
HUGO_BASEURL=https://www-staging.pulumi.com/ $(MAKE) build
$(MAKE) validate
./scripts/run-pulumi.sh preview staging
else ifeq ($(TRAVIS_BRANCH),production)
HUGO_BASEURL=https://www.pulumi.com/ $(MAKE) build
$(MAKE) validate
./scripts/run-pulumi.sh preview production
else
$(MAKE) build
endif
$(MAKE) validate
$(MAKE) preview
endif

.PHONY: travis_cron
travis_cron::
$(MAKE) banner
$(MAKE) ensure
ifeq ($(TRAVIS_BRANCH),master)
HUGO_BASEURL=https://staging.pulumi.io/ $(MAKE) build
else
$(MAKE) build
endif

.PHONY: travis_api
travis_api::
$(MAKE) banner
$(MAKE) ensure
ifeq ($(TRAVIS_BRANCH),master)
HUGO_BASEURL=https://staging.pulumi.io/ $(MAKE) build
else
$(MAKE) build
endif
$(MAKE) validate
24 changes: 24 additions & 0 deletions assets/config/postcss.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/**
* Configuration file for PostCSS. This is only used as part of the Hugo pipeline
* build process for our Sass files, since we run the resulting CSS through PostCSS
* at the end to do more transformations.
*/
module.exports = {
plugins: [
// TailwindCSS
require("tailwindcss")("./assets/config/tailwind.config.js"),

// Apply vendor prefixes for CSS features that aren't
// fully supported yet.
require("autoprefixer")({
overrideBrowserslist: [
"last 2 versions"
]
}),

// Minify the CSS even further. (It works!)
require('cssnano')({
preset: 'default',
})
]
};
81 changes: 81 additions & 0 deletions assets/config/tailwind.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@

// Tailwind configuration. Changes to this file require a dev-server restart.
//
// Configuration docs:
// https://tailwindcss.com/docs/configuration
//
// Default configuration:
// https://github.com/tailwindcss/tailwindcss/blob/master/stubs/defaultConfig.stub.js

const defaultTheme = require('tailwindcss/defaultTheme');

const brand = {
purple: "#512668",
orange: "#ee975c",
green: "#2fc89f",
blue: "#52a6da",
}

const purple = {
100: "#ddcae8",
200: "#9c76b3",
300: "#83549c",
400: "#6c348a",
500: brand.purple,
600: "#421d57",
700: "#371a47",
800: "#2a1337",
900: "#180b1f",
}

// TBD: Orange and green scales. (Using defaults for now.)

const blue = {
100: "#c4eeff",
200: "#abe7ff",
300: "#94e1ff",
400: "#63d0ff",
500: brand.blue,
600: "#3182ce",
700: "#1873bd",
800: "#0a4970",
900: "#0f2e3b",
}

const orange = defaultTheme.colors.orange;
const green = defaultTheme.colors.green;
const gray = defaultTheme.colors.gray;

module.exports = {
theme: {

extend: {

fontFamily: {
display: [
"Ubuntu",
...defaultTheme.fontFamily.sans,
],
body: [
"Open Sans",
...defaultTheme.fontFamily.sans,
],
},

colors: {
purple,
blue,
orange,
green,
gray,
},
},
},

variants: {
margin: [
"responsive",
"hover",
]
}
}
35 changes: 35 additions & 0 deletions assets/js/carousel.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
(function($) {

// The home-page carousel. Items cycle every four seconds. Clicking a label stops the
// cycling and shows the selected item.

var carouselIndex = 1;

var carouselInterval = window.setInterval(function() {
showCarouselItem(carouselIndex);
carouselIndex++;

if (carouselIndex > 2) {
carouselIndex = 0;
}
}, 4000);

$(".carousel-item-label").click(function() {
clearInterval(carouselInterval);

var i = $(".carousel-item-label").index(this);
showCarouselItem(i);
});

function showCarouselItem(i) {
$(".carousel-item")
.css("opacity", 0)
.eq(i)
.css("opacity", 1);

$(".carousel-item-label")
.removeClass("border-b-2")
.eq(i)
.addClass("border-b-2");
}
})(jQuery);
Loading