Skip to content

Commit

Permalink
Address comments, fix display issue on Safari.
Browse files Browse the repository at this point in the history
  • Loading branch information
Arthur Evans committed Jun 19, 2014
1 parent 3c0b398 commit 1aa9198
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 27 deletions.
1 change: 0 additions & 1 deletion _includes/samples/layout-elements/drawer-app.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

<demo-tabs selected="0">
<demo-tab heading="HTML">
{% highlight html %}
Expand Down
4 changes: 0 additions & 4 deletions _includes/samples/layout-elements/header-app.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
<!-- <link rel="import" href="/samples/layout-elements/coreheader.html"> -->

<!-- <link rel="import" href="/elements/demo-tabs.html"> -->

<demo-tabs selected="0">
<demo-tab heading="HTML">
{% highlight html %}
Expand Down
4 changes: 0 additions & 4 deletions _includes/samples/layout-elements/scaffold-app.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
<!-- <link rel="import" href="/samples/layout-elements/coreheader.html"> -->

<!-- <link rel="import" href="/elements/demo-tabs.html"> -->

<demo-tabs selected="0">
<demo-tab heading="HTML">
{% highlight html %}
Expand Down
1 change: 0 additions & 1 deletion _includes/samples/layout-elements/toolbar-sample.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

<demo-tabs selected="0">
<demo-tab heading="HTML">
{% highlight html %}
Expand Down
4 changes: 2 additions & 2 deletions docs/polymer/layout-elements.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ title: Layout elements
subtitle: Guide
---

<style>
<style shim-shadowdom>
.app-demo {
border: 1px solid #eee;
position: absolute;
Expand Down Expand Up @@ -92,7 +92,7 @@ Taller toolbars are useful when you want to create an app bar with tabs, for exa

If the core-header-panel is in `waterfall-tall` mode, it controls the height of the toolbar automatically, so you shouldn't set `medium-tall` or `tall` on the toolbar yourself.

**Tip:** For fancy scrolling effects where the toolbar animates between tall and condensed states, you can use [`<core-scroll-header-panel>`](doc link). See the [demos](http://localhost:8080/components/core-scroll-header-panel/demo.html) here. You may need to look at the source for the demos to implement the more complicated effects.
**Tip:** For fancy scrolling effects where the toolbar animates between tall and condensed states, you can use [`<core-scroll-header-panel>`](doc link). See the [demos](/components/core-scroll-header-panel/demo.html) here. You may need to look at the source for the demos to implement the more complicated effects.
{: .alert .alert-info }


Expand Down
5 changes: 2 additions & 3 deletions samples/layout-elements/drawer-app.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<link rel="import"
href="/components/paper-icon-button/paper-icon-button.html">
<!-- [END imports] -->
<style>
<style shim-shadowdom>
/* [START styles] */
body {
font-family: sans-serif;
Expand Down Expand Up @@ -69,8 +69,7 @@
<core-header-panel main>
<core-toolbar id="mainheader">
<paper-icon-button
id="navicon" icon="menu">
</paper-icon-button>
id="navicon" icon="menu"></paper-icon-button>
<span flex>Title</span>
</core-toolbar>
<div class="content">
Expand Down
11 changes: 5 additions & 6 deletions samples/layout-elements/header-app.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@
}
core-header-panel {
background: white;
height: 100%;
width: 100%;
/* height: 100% fails here on some browsers */
height: 100vh;
width: 100vw;
}
core-toolbar {
background-color: #03A9F4;
Expand All @@ -44,12 +45,10 @@
<core-header-panel>
<core-toolbar id="mainheader">
<paper-icon-button id="navicon"
icon="arrow-back">
</paper-icon-button>
icon="arrow-back"></paper-icon-button>
<span flex>Title</span>
<paper-icon-button id="searchbutton"
icon="search" >
</paper-icon-button>
icon="search"></paper-icon-button>
</core-toolbar>
<p>Sample content.</p>
<p>Sample content.</p>
Expand Down
2 changes: 1 addition & 1 deletion samples/layout-elements/scaffold-app.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<link rel="import"
href="/components/core-scaffold/core-scaffold.html">
<!-- [END imports] -->
<style>
<style shim-shadowdom>
/* [START styles] */
body {
font-family: sans-serif;
Expand Down
9 changes: 4 additions & 5 deletions samples/layout-elements/toolbar-sample.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@
core-toolbar {
background-color: #03A9F4;
}
paper-icon-button::shadow #clip {
paper-icon-button {
width: 40px;
height: 40px;
}
/* [END styles] */
</style>
Expand All @@ -35,12 +36,10 @@
<!-- [START html] -->
<core-toolbar class="medium-tall">
<paper-icon-button id="navicon"
icon="menu">
</paper-icon-button>
icon="menu"></paper-icon-button>
<span flex>Title</span>
<paper-icon-button id="morebutton"
icon="more-vert">
</paper-icon-button>
icon="more-vert"></paper-icon-button>
<paper-tabs class="bottom fit">
<paper-tab>ONE</paper-tab>
<paper-tab>TWO</paper-tab>
Expand Down

0 comments on commit 1aa9198

Please sign in to comment.