Merge pull request #101 from nirmata/100_fix_site

100 fix site

gh-pages/README.md

@@ -0,0 +1,24 @@
+# Kyverno Web Site
+
+This folder contains the https://kyverno.io website.
+
+The site is published in the gh_pages branch. To build the site:
+
+1. Clone the Hugo template:
+
+````bash
+cd themes
+ git clone https://github.com/nirmata/github-project-landing-page
+ ````
+
+ 2. Make changes as needed. Then publish using:
+
+````bash
+publish-to-gh-pages.sh
+````
+
+To build and test locally, install and run hugo:
+
+````bash
+hugo server
+````

gh-pages/config.toml

@@ -1,4 +1,4 @@
-baseURL = "https://nirmata.github.io/kyverno/"
+baseURL = "https://kyverno.io/"
 themesDir = "themes"
 theme = "github-project-landing-page"
 title = "Kyverno"

gh-pages/content/features.md

@@ -19,11 +19,6 @@
 * Test policy changes using kubectl
 
 
-<<<<<<< HEAD
-<p style="margin-top: 30px; margin-left:15px; font-size: 125%;">
-Ready for more? <a href="https://github.com/nirmata/kyverno/blob/master/README.md">Read the docs</a>, <a href="https://github.com/nirmata/kyverno/blob/master/README.md">write a policy</a>, or <a href="https://github.com/nirmata/kyverno/blob/master/README.md">try Kyverno in your cluster</a>!
-=======
 <p style="margin-top: 30px; margin-left:15px; font-size: 110%;">
 Ready for more? <a href="https://github.com/nirmata/kyverno/blob/master/README.md">Read the docs</a>, <a href="https://github.com/nirmata/kyverno/blob/master/documentation/writing-policies.md">write a policy</a>, or <a href="https://github.com/nirmata/kyverno/blob/master/documentation/installation.md">try Kyverno in your cluster</a>!
->>>>>>> 5ef9b86400eb026bb3fdcda3a4f80f94c938e31f
 </p>

gh-pages/themes/github-project-landing-page

@@ -1 +1 @@
-Subproject commit 691c627f3d475b1a5f8cba4fb84fd14132ae3695
+Subproject commit 7507b5c2da7823b75185c3a2bd18db6357937143