Fix prompt in expandable search, rework buttons layout
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/37248573 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/37248573 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/37248573 Branch: refs/heads/feature/fontawesome Commit: 37248573757f4da60939c1ad71342068be79b8fc Parents: b31b86f Author: Carlos Rovira <[email protected]> Authored: Sun Jan 1 19:49:25 2017 +0100 Committer: Carlos Rovira <[email protected]> Committed: Sun Jan 1 19:49:25 2017 +0100 ---------------------------------------------------------------------- .../MDLExample/src/main/flex/Buttons.mxml | 74 ++++++++------------ .../MDLExample/src/main/flex/TextFields.mxml | 7 ++ .../apache/flex/mdl/beads/ExpandableSearch.as | 1 - 3 files changed, 38 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/37248573/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml b/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml index 93c3fd4..0be4e70 100644 --- a/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml @@ -22,51 +22,39 @@ limitations under the License. xmlns="http://www.w3.org/1999/xhtml";> <!-- Buttons https://getmdl.io/components/index.html#buttons-section --> - <mdl:Grid> - - <mdl:GridCell column="1"> - <mdl:Button className="mdlbtn"/> - </mdl:GridCell> + <mdl:Grid width="100"> - <mdl:GridCell column="1"> - <!-- Fab button --> - <mdl:Button id="mybtn" fab="true" colored="true"> - <mdl:beads> - <mdl:Tooltip text="A simple tooltip"/> - </mdl:beads> - <mdl:materialIcon> - <mdl:MaterialIconAdd/> - </mdl:materialIcon> - </mdl:Button> - </mdl:GridCell> + <mdl:Button className="mdlbtn" style="display:block;"/> - <mdl:GridCell column="2"> - <!-- Fab with Ripple --> - <mdl:Button fab="true" ripple="true"> - <mdl:materialIcon> - <mdl:MaterialIconFace size="48"/> - </mdl:materialIcon> - </mdl:Button> - </mdl:GridCell> - - <mdl:GridCell column="2"> - <!-- Raised button --> - <mdl:Button text="COLORED" raised="true" colored="true"/> - </mdl:GridCell> - - <mdl:GridCell column="2"> - <!-- Raised button with ripple --> - <mdl:Button text="ACCENT" raised="true" ripple="true" accent="true"/> - </mdl:GridCell> - - <mdl:GridCell column="2"> - <!-- Raised disabled button--> - <mdl:Button text="DISABLED" raised="true"> - <mdl:beads> - <mdl:Disabled/> - </mdl:beads> - </mdl:Button> - </mdl:GridCell> + <!-- Fab button --> + <mdl:Button id="mybtn" fab="true" colored="true" style="display:block;"> + <mdl:beads> + <mdl:Tooltip text="A simple tooltip"/> + </mdl:beads> + <mdl:materialIcon> + <mdl:MaterialIconAdd/> + </mdl:materialIcon> + </mdl:Button> + + <!-- Fab with Ripple --> + <mdl:Button fab="true" ripple="true" style="display:block;"> + <mdl:materialIcon> + <mdl:MaterialIconFace size="48"/> + </mdl:materialIcon> + </mdl:Button> + + <!-- Raised button --> + <mdl:Button text="COLORED" raised="true" colored="true" style="display:block;"/> + + <!-- Raised button with ripple --> + <mdl:Button text="ACCENT" raised="true" ripple="true" accent="true"/> + + <!-- Raised disabled button--> + <mdl:Button text="DISABLED" raised="true"> + <mdl:beads> + <mdl:Disabled/> + </mdl:beads> + </mdl:Button> </mdl:Grid> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/37248573/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml b/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml index 9cbf2ae..a448b9a 100644 --- a/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/TextFields.mxml @@ -68,6 +68,13 @@ limitations under the License. </mdl:beads> </mdl:TextField> + <mdl:TextField floatingLabel="true" width="100%"> + <mdl:beads> + <mdl:TextPrompt prompt="Floating and Expandible..."/> + <mdl:ExpandableSearch/> + </mdl:beads> + </mdl:TextField> + <mdl:TextArea width="100%"> <mdl:beads> <mdl:TextPrompt prompt="Text lines..."/> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/37248573/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ExpandableSearch.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ExpandableSearch.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ExpandableSearch.as index c853bdc..711cabd 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ExpandableSearch.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/ExpandableSearch.as @@ -100,7 +100,6 @@ package org.apache.flex.mdl.beads div.appendChild(TextField(host).label); TextField(host).input.setAttribute('id', searchId); - TextField(host).label.innerHTML = "Expandible..."; } else {
