merge master

googlearchive · May 13, 2014 · 56008a7 · 56008a7
2 parents a93fb51 + c9e8f6d
commit 56008a7
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 44 deletions.
diff --git a/bower.json b/bower.json
@@ -8,9 +8,10 @@
     "core-menu": "Polymer/core-menu#master",
     "core-item": "Polymer/core-item#master",
     "core-toolbar": "Polymer/core-toolbar#master",
+    "core-icons": "Polymer/core-icons#master",
     "core-icon-button": "Polymer/core-icon-button#master",
     "core-header-panel": "Polymer/core-header-panel#master",
     "marked-element": "PolymerLabs/marked-element#master",
     "highlightjs-element": "PolymerLabs/highlightjs-element#master"
   }
-}
+}
diff --git a/core-doc-viewer.html b/core-doc-viewer.html
@@ -14,11 +14,6 @@
 
     <style>
 
-      :host {
-        display: block;
-        position: relative;
-      }
-
       core-doc-toc {
         display: none;
         width: 332px;
@@ -33,10 +28,9 @@
       <context-free-parser url="{{}}" on-data-ready="{{parserDataReady}}"></context-free-parser>
     </template>
 
-    <core-layout core-flex class="core-fit">
-      <core-doc-toc id="toc" data="{{classes}}" selected="{{selected}}"></core-doc-toc>
-      <core-doc-page core-flex data="{{data}}"></core-doc-page>
-    </core-layout>
+    <core-layout></core-layout>
+    <core-doc-toc id="toc" data="{{classes}}" selected="{{selected}}"></core-doc-toc>
+    <core-doc-page core-flex data="{{data}}"></core-doc-page>
 
   </template>
 

diff --git a/demo.html b/demo.html
@@ -1,35 +1,35 @@
-<!doctype html>
-<html>
-<head>
-
-  <title>core-doc-viewer</title>
-
-  <script src="../platform/platform.js"></script>
-
-  <link rel="import" href="core-doc-viewer.html">
-
-  <style>
-
-    html, body {
-      font-family: Arial, sans-serif;
-      margin: 0;
-    }
-
-    core-doc-viewer {
-      height: 100vh;
-    }
-
-  </style>
-
-</head>
-
-<body unresolved>
-
+<!doctype html>
+<html>
+<head>
+
+  <title>core-doc-viewer</title>
+
+  <script src="../platform/platform.js"></script>
+
+  <link rel="import" href="core-doc-viewer.html">
+
+  <style>
+
+    html, body {
+      font-family: Arial, sans-serif;
+      margin: 0;
+    }
+
+    core-doc-viewer {
+      height: 100vh;
+    }
+
+  </style>
+
+</head>
+
+<body unresolved>
+
   <core-doc-viewer sources='[
     "../core-ajax/core-ajax.html",
     "../core-ajax/core-xhr.html"
-  ]'></core-doc-viewer>
-
-</body>
-
-</html>
+  ]'></core-doc-viewer>
+
+</body>
+
+</html>
diff --git a/elements/core-doc-page.html b/elements/core-doc-page.html
@@ -1,4 +1,5 @@
 <link rel="import" href="../../core-layout/core-layout.html">
+<link rel="import" href="../../core-icons/core-icons.html">
 <link rel="import" href="../../core-icon-button/core-icon-button.html">
 <link rel="import" href="../../core-toolbar/core-toolbar.html">
 <link rel="import" href="../../core-header-panel/core-header-panel.html">
@@ -42,9 +43,16 @@ <h1 style="font-size: 52px; color: #E91E63;">
         </h1>
 
         <p>
-          <core-icon icon="tag" style="vertical-align: middle;"></core-icon>&nbsp;<a href="{{data | homepageFilter}}">Home Page</a>
+          <core-icon icon="home" style="vertical-align: middle;"></core-icon>&nbsp;<a href="{{data | homepageFilter}}">Home Page</a>
         </p>
 
+        <template if="{{data.extends}}">
+          <section class="box">
+            <div class="ntitle">Extends</div>
+            <a href="#{{data.extends}}">{{data.extends}}</a>
+          </section>
+        </template>
+
         <template if="{{data.description}}">
           <section class="box top">
             <div class="ntitle">Summary</div>
@@ -147,4 +155,4 @@ <h1 style="font-size: 52px; color: #E91E63;">
 
   </script>
 
-</polymer-element>
+</polymer-element>