From 5de857d6be29f3871863dbd592e3f6150c0b8735 Mon Sep 17 00:00:00 2001 From: scottjehl Date: Fri, 15 Oct 2010 20:15:49 -0400 Subject: [PATCH 1/4] edits to persist pages --- docs/toolbars/footer-persist-a.html | 8 +++----- docs/toolbars/footer-persist-b.html | 2 +- docs/toolbars/footer-persist-c.html | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/docs/toolbars/footer-persist-a.html b/docs/toolbars/footer-persist-a.html index 3c56c535..1c46aa65 100755 --- a/docs/toolbars/footer-persist-a.html +++ b/docs/toolbars/footer-persist-a.html @@ -10,20 +10,18 @@
-

Fixed Header

+

Friends

Back Options
-
-

Friends

This page is a demo of a persistent footer navigation bar. At the foot of the page, you'll see a persistent horizontal navigation bar. Click on any of the links, and you'll see the page content transition but the footer remain fixed: The footer sticks persistently even when transitioning to a new HTML page, because the footer on all four HTML pages has the same data-id attribute.

-
+ -
    +
    • A
    • Adam Kinkaid
    • Alex Wickerham
      • diff --git a/docs/toolbars/footer-persist-b.html b/docs/toolbars/footer-persist-b.html index e733c61f..65d9515b 100755 --- a/docs/toolbars/footer-persist-b.html +++ b/docs/toolbars/footer-persist-b.html @@ -10,7 +10,7 @@
      -

      Fixed Header

      +

      Albums

      Back Options
      diff --git a/docs/toolbars/footer-persist-c.html b/docs/toolbars/footer-persist-c.html index 189ff5f3..50b3d555 100755 --- a/docs/toolbars/footer-persist-c.html +++ b/docs/toolbars/footer-persist-c.html @@ -10,7 +10,7 @@
      -

      Fixed Header

      +

      Inbox

      Back Options
      From b28acb814bbf18b51b155c927e3f24bfea452ef7 Mon Sep 17 00:00:00 2001 From: PattyToland Date: Fri, 15 Oct 2010 20:18:12 -0400 Subject: [PATCH 2/4] content edits --- docs/toolbars/docs-headers.html | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/docs/toolbars/docs-headers.html b/docs/toolbars/docs-headers.html index 4882d3c6..7b93bb50 100755 --- a/docs/toolbars/docs-headers.html +++ b/docs/toolbars/docs-headers.html @@ -17,7 +17,9 @@

      Header structure

      -

      The header is an toolbar at the top of the page that usually contains the page title text and optional buttons positioned in the the left or right of the title for navigation or actions. The title text is normally an H1 heading element but it's possible to use any heading level (H1-H6) to allow for semantic flexibility. For example, a page containing multiple mobile 'pages' may use a H1 element on the home 'page' and a H2 element on the secondary pages. All heading levels are styled identically by default to maintain visual consistency.

      +

      The header is an toolbar at the top of the page that usually contains the page title text, and optional buttons positioned to the the left and/or right of the title for navigation or actions.

      + +

      The title text is normally an H1 heading element but it's possible to use any heading level (H1-H6) to allow for semantic flexibility. For example, a page containing multiple mobile 'pages' may use a H1 element on the home 'page' and a H2 element on the secondary pages. All heading levels are styled identically by default to maintain visual consistency.

      @@ -27,22 +29,25 @@
      -

      The header toolbar will be be themed with the "a" swatch by default (black in the default theme) but you can easily set the theme swatch color.

      +

      Default header features

      +

      The header toolbar is themed with the "a" swatch by default (black in the default theme) but you can easily set the theme swatch color.

      + +

      Page title

      -

      See that "back" button? The framework automatically generates a "back" button for you to automate the process of including this common navigation element on every page. To prevent the back button from being added to a header either add your own button to the left slot (see below) or, add this attribute: data-nobackbtn="true" to the header container. +

      See that "back" button? The framework automatically generates a "back" button on every page, to simplify the process of including this common navigation element. To prevent the back button from being added to a header, either add your own button to the left slot (see below) or, add this attribute: data-nobackbtn="true" to the header container.

      Adding buttons

      -

      In the standard header configuration, there are slots buttons on either side of the text heading. Each button is typically an anchor element but any valid button markup will work. To save space, buttons in toolbars are set to inline styling so the button is only as wide as the text and icons they contain.

      +

      In the standard header configuration, there are slots for buttons on either side of the text heading. Each button is typically an anchor element, but any valid button markup will work. To save space, buttons in toolbars are set to inline styling so the button is only as wide as the text and icons they contain.

      Default button positioning

      -

      The header plugin looks for immediate children of the header container and will automatically set the first link found into the left button slot and the second link into the right button slot. In this example, the 'Cancel' button will appear in the left slot and 'Save' will appear in the right slot because of their sequence in the source order.

      +

      The header plugin looks for immediate children of the header container, and automatically sets the first link in the left button slot and the second link in the right. In this example, the 'Cancel' button will appear in the left slot and 'Save' will appear in the right slot based on their sequence in the source order. 

      			

From eb76e53f60d0689109e72f43b2ef4819440c582d Mon Sep 17 00:00:00 2001
From: PattyToland 
Date: Fri, 15 Oct 2010 20:22:41 -0400
Subject: [PATCH 3/4] edits

---
 docs/toolbars/docs-headers.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/toolbars/docs-headers.html b/docs/toolbars/docs-headers.html
index 7b93bb50..72e2d368 100755
--- a/docs/toolbars/docs-headers.html
+++ b/docs/toolbars/docs-headers.html
@@ -64,7 +64,7 @@
 				
      Edit Contact
      
 				Save
      -

      Buttons automatically adapt to the color of the bar they sit in so a link in a header bar with the "a" swatch color will also be styled as "a" colored buttons. To make the right button visually stand out, use add the data-theme attribute and set the color swatch for the button, "b" in this case.

      +

      Buttons automatically adapt to the swatch color of the bar they sit in, so a link in a header bar with the "a" color will also be styled as "a" colored buttons. It's simple to make a button visually stand out — here, we add the data-theme attribute and set the color swatch for the button to "b" to make the "Save" button pop.

      Cancel From 1a7e6876916067528b3f07e52d61b927d97ea599 Mon Sep 17 00:00:00 2001 From: PattyToland Date: Fri, 15 Oct 2010 20:24:33 -0400 Subject: [PATCH 4/4] edits --- docs/toolbars/docs-headers.html | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/toolbars/docs-headers.html b/docs/toolbars/docs-headers.html index 72e2d368..5f0db398 100755 --- a/docs/toolbars/docs-headers.html +++ b/docs/toolbars/docs-headers.html @@ -66,6 +66,14 @@

      Buttons automatically adapt to the swatch color of the bar they sit in, so a link in a header bar with the "a" color will also be styled as "a" colored buttons. It's simple to make a button visually stand out — here, we add the data-theme attribute and set the color swatch for the button to "b" to make the "Save" button pop.

      + 
      
+				Cancel
+				
      Edit Contact
      
+				Save
+
      + + +
      Cancel

      Edit Contact