diff --git a/README.md b/README.md index d51609edf9..a1eb9c58d4 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ change the name of the fork to be: Then, visit: [http://YOUR_GITHUB_USERNAME.github.io](http://YOUR_GITHUB_USERNAME.github.io) -You should see a special-to-you version of the site. +You should see a special-to-you version of the site. ## Editing/staging the site locally @@ -31,12 +31,12 @@ Then install Ruby 2.2 or higher rvm install ruby-2.2.4 rvm use ruby-2.2.4 --default - + Verify that this new version is running (optional) which ruby ruby -v - + Install the GitHub Pages package, which includes Jekyll gem install github-pages @@ -58,13 +58,13 @@ If you're a bit rusty with git/GitHub, you might wanna read The above instructions work on Mac and Linux. [These instructions ](https://martinbuberl.com/blog/setup-jekyll-on-windows-and-host-it-on-github-pages/) -might help for Windows users. +might help for Windows users. ## Common Tasks ### Edit Page Titles or Change the Left Navigation -Edit the yaml files in `/_data/` for the Guides, Reference, Samples, or Support areas. +Edit the yaml files in `/_data/` for the Guides, Reference, Samples, or Support areas. You may have to exit and `jekyll clean` before restarting the `jekyll serve` to get changes to files in `/_data/` to show up. @@ -109,7 +109,7 @@ Example file: [Pods: Multi-Container](/docs/user-guide/pods/multi-container/). ## Use a global variable -The `/_config.yml` file defines some useful variables you can use when editing docs. +The `/_config.yml` file defines some useful variables you can use when editing docs. * `page.githubbranch`: The name of the GitHub branch on the Kubernetes repo that is associated with this branch of the docs. e.g. `release-1.2` * `page.version` The version of Kubernetes associated with this branch of the docs. e.g. `v1.2` @@ -131,17 +131,27 @@ The current version of the website is served out of the `master` branch. All versions of the site that relate to past and future versions will be named after their Kubernetes release number. For example, [the old branch for the 1.1 docs is called `release-1.1`](https://github.com/kubernetes/kubernetes.github.io/tree/release-1.1). -Changes in the "docsv2" branch (where we are testing a revamp of the docs) are automatically staged here: +Changes in the "docsv2" branch (where we are testing a revamp of the docs) are automatically staged here: http://k8sdocs.github.io/docs/tutorials/ Changes in the "release-1.1" branch (for k8s v1.1 docs) are automatically staged here: http://kubernetes-v1-1.github.io/ -Changes in the "release-1.3" branch (for k8s v1.3 docs) are automatically staged here: +Changes in the "release-1.3" branch (for k8s v1.3 docs) are automatically staged here: http://kubernetes-v1-3.github.io/ Editing of these branches will kick off a build using Travis CI that auto-updates these URLs; you can monitor the build progress at [https://travis-ci.org/kubernetes/kubernetes.github.io](https://travis-ci.org/kubernetes/kubernetes.github.io). +## Partners +Partners can get their logos added to the partner section of the [community page](http://k8s.io/community) by following the below steps and meeting the below logo specifications. Partners will also need to have a URL that is specific to integrating with Kubernetes ready; this URL will be the destination when the logo is clicked. + +* The partner product logo should be a transparent png image centered in a 215x125 px frame. (look at the existing logos for reference) +* The logo must link to a URL that is specific to integrating with Kubernetes, hosted on the partner's site. +* The logo should be named *product-name*_logo.png and placed in the `/images/community_logos` folder. +* The image reference (including the link to the partner URL) should be added in `community.html` under `
...
`. +* Please do not change the order of the existing partner images. Append your logo to the end of the list. +* Once completed and tested the look and feel, submit the pull request. + ## Thank you! Kubernetes thrives on community participation and we really appreciate your diff --git a/_sass/_base.sass b/_sass/_base.sass index 0fbf8b32ce..c327086561 100644 --- a/_sass/_base.sass +++ b/_sass/_base.sass @@ -834,7 +834,7 @@ dd td font-size: 0.85em - + #editPageButton position: absolute top: -25px @@ -1165,6 +1165,17 @@ $feature-box-div-margin-bottom: 40px margin: 10px background-color: $light-grey + .partner-logos + text-align: center + max-width: 1200px + margin: 0 auto + + img + width: auto + margin: 10px + background-color: $white + box-shadow: 0 5px 5px rgba(0,0,0,.24),0 0 5px rgba(0,0,0,.12) + #calendarWrapper position: relative width: 80vw @@ -1274,4 +1285,4 @@ $feature-box-div-margin-bottom: 40px background-image: url(/images/community_logos/ebay_logo.png) div:nth-child(3) - background-image: url(/images/community_logos/wikimedia_foundation_logo.png) \ No newline at end of file + background-image: url(/images/community_logos/wikimedia_foundation_logo.png) diff --git a/_sass/_skin.sass b/_sass/_skin.sass index d1a5eb3445..67bbce0208 100755 --- a/_sass/_skin.sass +++ b/_sass/_skin.sass @@ -2,6 +2,7 @@ $blue: #3371e3 $light-grey: #f7f7f7 $dark-grey: #303030 $medium-grey: #4c4c4c +$white: #ffffff $base-font: 'Roboto', sans-serif $mono-font: 'Roboto Mono', monospace diff --git a/community.html b/community.html index 7ce6c933c0..a8c884b3df 100644 --- a/community.html +++ b/community.html @@ -64,6 +64,18 @@ title: Community +
+

Partners

+

We are working with a broad group of partners to help grow the kubernetes ecosystem supporting + a sprectrum of compelmenting platforms, from open source solutions to market-leading technologies.

+
+ + + + + +
+
@@ -95,4 +107,4 @@ title: Community {% include footer.html %} - \ No newline at end of file + diff --git a/images/community_logos/datadog_logo.png b/images/community_logos/datadog_logo.png new file mode 100644 index 0000000000..fcc081eabc Binary files /dev/null and b/images/community_logos/datadog_logo.png differ diff --git a/images/community_logos/elastickube_logo.png b/images/community_logos/elastickube_logo.png new file mode 100644 index 0000000000..10275d88e5 Binary files /dev/null and b/images/community_logos/elastickube_logo.png differ diff --git a/images/community_logos/rancher_logo.png b/images/community_logos/rancher_logo.png new file mode 100644 index 0000000000..e8ea8fd590 Binary files /dev/null and b/images/community_logos/rancher_logo.png differ diff --git a/images/community_logos/sysdig_cloud_logo.png b/images/community_logos/sysdig_cloud_logo.png new file mode 100644 index 0000000000..8cd1ddcde1 Binary files /dev/null and b/images/community_logos/sysdig_cloud_logo.png differ diff --git a/images/community_logos/wercker_logo.png b/images/community_logos/wercker_logo.png new file mode 100644 index 0000000000..526e124ca3 Binary files /dev/null and b/images/community_logos/wercker_logo.png differ