Merge branch 'livedoc' into release-0.9.2

tdavis-ourfuture · Apr 14, 2015 · d73c1a1 · d73c1a1
2 parents 9df3c74 + ebfe102
commit d73c1a1
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 13 deletions.
diff --git a/docs/manual/source/layouts/tryit.html.slim b/docs/manual/source/layouts/tryit.html.slim
@@ -2,7 +2,7 @@ doctype html
 html
  head
  = partial 'head/base'
- body
+ body.tryit
  #global
  = partial 'header'
  #page.container

diff --git a/docs/manual/source/stylesheets/partials/_footer.css.scss b/docs/manual/source/stylesheets/partials/_footer.css.scss
@@ -38,6 +38,9 @@
 
  a {
  color: $footer-link-color;
+ &:hover {
+ color: $footer-link-hover-color;
+ }
  }
 
  p {

diff --git a/docs/manual/source/stylesheets/partials/_header.css.scss b/docs/manual/source/stylesheets/partials/_header.css.scss
@@ -9,6 +9,7 @@
  position: fixed;
  top: 0;
  left: 0;
+ z-index: 1000;
 
  .logo {
  width: 200px;

diff --git a/docs/manual/source/stylesheets/partials/_table_of_contents.css.scss b/docs/manual/source/stylesheets/partials/_table_of_contents.css.scss
@@ -12,9 +12,10 @@
  }
  ul {
  list-style-type: disc;
- font-size: 16px;
+ font-size: 14px;
  line-height: 26px;
  color: $table-of-contents-font-color;
+
  ul {
  list-style-type: disc;
  font-size: 14px;
@@ -24,6 +25,6 @@
 
 
  a {
- color: $table-of-contents-font-color;
+ color: $table-of-contents-link-color;
  }
 }
diff --git a/docs/manual/source/stylesheets/partials/_tryit.css.scss b/docs/manual/source/stylesheets/partials/_tryit.css.scss
@@ -14,7 +14,7 @@
  min-width: 400px;
 }
 
-@include medium {
+@include large {
  .codepicnic {
  flex-wrap: nowrap;
  }
@@ -35,3 +35,20 @@
  min-height: 500px;
  }
 }
+
+.tryit {
+
+ #main {
+ width: 100%;
+ }
+
+ #footer {
+ width: 100%;
+ margin-left: 0;
+ }
+
+ #copyright {
+ width: 100%;
+ margin-left: 0;
+ }
+}
diff --git a/docs/manual/source/stylesheets/partials/nav/_main.css.scss b/docs/manual/source/stylesheets/partials/nav/_main.css.scss
@@ -49,7 +49,7 @@
  font-weight: 400;
 
  color: $nav-main-level-1-font-color;
- padding: 10px 0 10px 25px;
+ padding: 14px 0 10px 25px;
 
  }
  // Level 2

diff --git a/docs/manual/source/stylesheets/variables/_colors.css.scss b/docs/manual/source/stylesheets/variables/_colors.css.scss
@@ -70,19 +70,21 @@ $code-inline-background-color: #f0f0f0;
 $code-inline-border-color: $border-color;
 
 // Table of Contents
-$table-of-contents-font-color: #3482ab;
+$table-of-contents-link-color: #3482ab;
+$table-of-contents-font-color: #828385;
 $table-of-contents-background-color: #f0f0f0;
 
 // Footer
-$footer-background-color: #2a2b2b;
-$footer-link-color: #f0f0f0;
+$footer-background-color: #ffffff;
+$footer-link-color: #828385;
+$footer-link-hover-color: #373535;
 $footer-social-link-color: #828385;
-$footer-social-link-hover-color: #f0f0f0;
+$footer-social-link-hover-color: #373535;
 $footer-heading-2-color: #828385;
 
 // Copyright
-$copyright-font-color: #f0f0f0;
-$copyright-link-color: #f0f0f0;
+$copyright-font-color: #828385;
+$copyright-link-color: #828385;
 
 // Page Title
 $page-title-font-color: #586276;

diff --git a/docs/manual/source/stylesheets/variables/_fonts.css.scss b/docs/manual/source/stylesheets/variables/_fonts.css.scss
@@ -1,2 +1,2 @@
-$body-font-family: 'Open Sans', sans-serif;;
+$body-font-family: 'PT Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
 $code-font-family: Consolas, monaco, monospace;
diff --git a/docs/manual/source/tryit/index.html.slim b/docs/manual/source/tryit/index.html.slim
@@ -72,4 +72,4 @@ title: Try PredictionIO
 
 
  .iframe
- iframe src="https://codepicnic.com/bites/predictionio-0-9-1?sidebar=closed&hostname=predictionio"
+ iframe src="https://codepicnic.com/bites/predictionio-0-9-1/embed?sidebar=closed&hostname=predictionio&hide=readme"