Repository: flex-asjs Updated Branches: refs/heads/develop f8ae49321 -> 29926c55f
CSS descendant selector test Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/29926c55 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/29926c55 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/29926c55 Branch: refs/heads/develop Commit: 29926c55f0b673aba09c710cb1470c4019cf2959 Parents: f8ae493 Author: Carlos Rovira <[email protected]> Authored: Thu Nov 24 11:58:34 2016 +0100 Committer: Carlos Rovira <[email protected]> Committed: Thu Nov 24 11:58:34 2016 +0100 ---------------------------------------------------------------------- .../flexjs/MDLExample/src/main/flex/Cards.mxml | 17 ++++++----- .../src/main/resources/mdl-styles.css | 32 ++++++++++++++------ .../src/main/flex/org/apache/flex/mdl/Card.as | 8 +++-- 3 files changed, 36 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/29926c55/examples/flexjs/MDLExample/src/main/flex/Cards.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MDLExample/src/main/flex/Cards.mxml b/examples/flexjs/MDLExample/src/main/flex/Cards.mxml index c318d58..2839f6c 100644 --- a/examples/flexjs/MDLExample/src/main/flex/Cards.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/Cards.mxml @@ -25,8 +25,8 @@ limitations under the License. <mdl:Grid> - <mdl:Card width="512" shadow="2" style="margin:10;"> - <mdl:CardTitle className="welcomeCard__title"> + <mdl:Card className="demo-card-wide" shadow="2"> + <mdl:CardTitle> <mdl:CardTitleText text="Welcome"/> </mdl:CardTitle> <mdl:CardSupportingText> @@ -36,19 +36,16 @@ limitations under the License. <mdl:Button text="Get Started" ripple="true" colored="true"/> </mdl:CardActions> <mdl:CardMenu> - <mdl:Button icon="true" ripple="true" style="color: #fff;"> + <mdl:Button icon="true" ripple="true"> <i class="material-icons">share</i> </mdl:Button> </mdl:CardMenu> </mdl:Card> - <mdl:Card width="320" height="320" shadow="2" style="margin:10;"> - <mdl:CardTitle className="dogTitle" expand="true"> + <mdl:Card className="demo-card-square" shadow="2" style="margin:10;"> + <mdl:CardTitle expand="true"> <mdl:CardTitleText text="Update"/> </mdl:CardTitle> - <!--<mdl:CardMedia> - <js:Image url="assets/Unknown.jpg" height="176"/> - </mdl:CardMedia>--> <mdl:CardSupportingText> <js:MultilineLabel text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenan convallis."/> </mdl:CardSupportingText> @@ -64,6 +61,10 @@ limitations under the License. </mdl:CardActions> </mdl:Card> + + <!--<mdl:CardMedia> + <js:Image url="assets/Unknown.jpg" height="176"/> + </mdl:CardMedia>--> </mdl:Grid> </mdl:TabBarPanel> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/29926c55/examples/flexjs/MDLExample/src/main/resources/mdl-styles.css ---------------------------------------------------------------------- diff --git a/examples/flexjs/MDLExample/src/main/resources/mdl-styles.css b/examples/flexjs/MDLExample/src/main/resources/mdl-styles.css index 7ff6479..924e030 100644 --- a/examples/flexjs/MDLExample/src/main/resources/mdl-styles.css +++ b/examples/flexjs/MDLExample/src/main/resources/mdl-styles.css @@ -40,20 +40,32 @@ Image IBeadView: ClassReference("org.apache.flex.html.beads.ImageView"); } -.welcomeCard__title { +.layoutTransparent { + background: url('assets/transparent.jpg') center / cover; + color: white; +} + +.demo-card-wide.mdl-card { + width: 512px; +} +.demo-card-wide > .mdl-card__title { color: #fff; height: 176px; background: url('assets/welcome_card.jpg') center / cover; } +.demo-card-wide > .mdl-card__menu { + color: #fff; +} -.dogTitle -{ - color: #fff; - height: 176px; - background: url('assets/dog.png') bottom right 15% no-repeat #46B6AC; +.demo-card-square.mdl-card { + width: 320px; + height: 320px; } -.layoutTransparent { - background: url('assets/transparent.jpg') center / cover; - color: white; -} \ No newline at end of file +.demo-card-square > .mdl-card__title { + color: #fff; + background: url('assets/dog.png') bottom right 15% no-repeat #46B6AC; +} + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/29926c55/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Card.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Card.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Card.as index fbf4196..751e0ae 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Card.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Card.as @@ -96,12 +96,14 @@ package org.apache.flex.mdl } public function set shadow(value:Number):void { - if(value == 0 || value == 2 || value == 3 || value == 4 || value == 6 || value == 8 || value == 16) + if(value == 2 || value == 3 || value == 4 || value == 6 || value == 8 || value == 16) { _shadow = value; - className += (_shadow != 0 ? " mdl-shadow--" + _shadow + "dp" : ""); - } + className += " mdl-shadow--" + _shadow + "dp"; + } else { + className += ""; + } } } }
