You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ca...@apache.org on 2016/11/04 16:44:55 UTC
[36/37] git commit: [flex-asjs] [refs/heads/feature/mdl] - remove
type from badge and change jpeg to jpg
remove type from badge and change jpeg to jpg
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/aa9ac0b0
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/aa9ac0b0
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/aa9ac0b0
Branch: refs/heads/feature/mdl
Commit: aa9ac0b086d1246c0d4801e68fbe81154131bf1b
Parents: 3adb8dc
Author: Carlos Rovira <ca...@apache.org>
Authored: Fri Nov 4 11:28:15 2016 +0100
Committer: Carlos Rovira <ca...@apache.org>
Committed: Fri Nov 4 17:43:37 2016 +0100
----------------------------------------------------------------------
examples/flexjs/MDLExample/src/main/flex/App.mxml | 16 ++--------------
.../MDLExample/src/main/resources/Unknown.jpeg | Bin 50531 -> 0 bytes
.../MDLExample/src/main/resources/Unknown.jpg | Bin 0 -> 50531 bytes
3 files changed, 2 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/aa9ac0b0/examples/flexjs/MDLExample/src/main/flex/App.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/App.mxml b/examples/flexjs/MDLExample/src/main/flex/App.mxml
index 9f3fb79..111deed 100644
--- a/examples/flexjs/MDLExample/src/main/flex/App.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/App.mxml
@@ -118,12 +118,6 @@ limitations under the License.
<mdl:Badge id="badge1" text="Loving this." dataBadge="1" linkUrl="http://flex.apache.org"/>
</js:VContainer>
- <mdl:Button text="TYPE LINK" click="badge1.type = 0">
- <js:beads>
- <mdl:ButtonEffect raised="true" colored="true"/>
- </js:beads>
- </mdl:Button>
-
<mdl:Card width="512">
<js:beads>
<mdl:CardEffect shadow="2"/>
@@ -132,7 +126,7 @@ limitations under the License.
<js:Label text="Welcome" className="mdl-card__title-text"/>
</mdl:CardTitle>
<mdl:CardMedia>
- <js:Image url="../../../../src/main/resources/Unknown.jpeg" height="176"/>
+ <js:Image url="../../../../src/main/resources/Unknown.jpg" height="176"/>
</mdl:CardMedia>
<mdl:CardSupportingText>
<js:MultilineLabel text="This text might describe the photo and provide further information, such as where and when it was taken."/>
@@ -141,17 +135,11 @@ limitations under the License.
<js:beads>
<mdl:CardInnerEffect border="true"/>
</js:beads>
- <mdl:Button text="TYPE TEXT" click="badge1.type = 1">
+ <mdl:Button text="Get Started">
<js:beads>
<mdl:ButtonEffect raised="true" colored="false"/>
</js:beads>
</mdl:Button>
-
- <mdl:Button text="TYPE CONTAINER" click="badge1.type = 2; badge1.text='account_box'">
- <js:beads>
- <mdl:ButtonEffect raised="true" accent="true"/>
- </js:beads>
- </mdl:Button>
</mdl:CardActions>
</mdl:Card>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/aa9ac0b0/examples/flexjs/MDLExample/src/main/resources/Unknown.jpeg
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/resources/Unknown.jpeg b/examples/flexjs/MDLExample/src/main/resources/Unknown.jpeg
deleted file mode 100644
index 08fb201..0000000
Binary files a/examples/flexjs/MDLExample/src/main/resources/Unknown.jpeg and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/aa9ac0b0/examples/flexjs/MDLExample/src/main/resources/Unknown.jpg
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/resources/Unknown.jpg b/examples/flexjs/MDLExample/src/main/resources/Unknown.jpg
new file mode 100644
index 0000000..08fb201
Binary files /dev/null and b/examples/flexjs/MDLExample/src/main/resources/Unknown.jpg differ