flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pio...@apache.org
Subject [3/4] flex-asjs git commit: Remove “others” panel in favor of “badges” panel example
Date Fri, 06 Jan 2017 23:56:34 GMT
Remove “others” panel in favor of “badges” panel example


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/cf53944e
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/cf53944e
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/cf53944e

Branch: refs/heads/feature/fontawesome
Commit: cf53944e5c9271d27dcfadbd0b10847d38e75298
Parents: dea50c7
Author: Carlos Rovira <carlosrovira@apache.org>
Authored: Sat Jan 7 00:52:04 2017 +0100
Committer: Carlos Rovira <carlosrovira@apache.org>
Committed: Sat Jan 7 00:52:04 2017 +0100

----------------------------------------------------------------------
 .../flexjs/MDLExample/src/main/flex/Badges.mxml | 51 ++++++++++++++++++++
 .../src/main/flex/MainNavigation.mxml           | 33 ++-----------
 2 files changed, 55 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cf53944e/examples/flexjs/MDLExample/src/main/flex/Badges.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/Badges.mxml b/examples/flexjs/MDLExample/src/main/flex/Badges.mxml
new file mode 100644
index 0000000..ab21fbc
--- /dev/null
+++ b/examples/flexjs/MDLExample/src/main/flex/Badges.mxml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+-->
+<mdl:TabBarPanel xmlns:fx="http://ns.adobe.com/mxml/2009"
+                 xmlns:js="library://ns.apache.org/flexjs/basic"
+                 xmlns:mdl="library://ns.apache.org/flexjs/mdl"
+                 xmlns="http://www.w3.org/1999/xhtml">
+
+    <mdl:Grid width="50" style="margin:20px">
+        <js:Div text="account_box" className="material-icons" style="color: rgba(0, 0,
0, 0.24);">
+            <js:beads>
+                <mdl:Badge dataBadge="2" overlap="true"/>
+            </js:beads>
+        </js:Div>
+
+        <js:Span text="Inbox" className="mdl-badge" style="color: rgba(0, 0, 0, 0.24);">
+            <js:beads>
+                <mdl:Badge dataBadge="4"/>
+            </js:beads>
+        </js:Span>
+
+        <js:A id="badge1" text="Badge Normal" href="http://flex.apache.org">
+            <js:beads>
+                <mdl:Badge dataBadge="1"/>
+            </js:beads>
+        </js:A>
+
+        <js:A text="Badge No Background" href="http://flex.apache.org">
+            <js:beads>
+                <mdl:Badge dataBadge="5" noBackground="true"/>
+            </js:beads>
+        </js:A>
+    </mdl:Grid>
+
+</mdl:TabBarPanel>             
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cf53944e/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml b/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
index 028975d..bb6f43b 100644
--- a/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
@@ -47,7 +47,7 @@ limitations under the License.
             <mdl:TabBarButton text="Lists" href="#lists_panel"/>
             <mdl:TabBarButton text="Loading" href="#loading_panel"/>
             <mdl:TabBarButton text="Menu" href="#menus_panel"/>
-            <mdl:TabBarButton text="Other" href="#others_panel"/>
+            <mdl:TabBarButton text="Badges" href="#badges_panel"/>
         </mdl:TabBar>
     </mdl:Header>
     
@@ -61,7 +61,7 @@ limitations under the License.
             <mdl:NavigationLink text="Styles" href="https://getmdl.io/styles/index.html"/>
             <mdl:NavigationLink text="Customize" href="https://getmdl.io/customize/index.html"/>
             <mdl:NavigationLink text="Showcase" href="https://getmdl.io/showcase/index.html"/>
-             <mdl:NavigationLink text="FAQ" href="https://getmdl.io/faq/index.html"/>
+            <mdl:NavigationLink text="FAQ" href="https://getmdl.io/faq/index.html"/>
         </mdl:Navigation>
     </mdl:Drawer>
     
@@ -91,33 +91,8 @@ limitations under the License.
 
         <local:Menus id="menus_panel"/>
 
-        <mdl:TabBarPanel id="others_panel">
-            
-            <js:Div text="account_box" className="material-icons" style="color: rgba(0,
0, 0, 0.24);">
-                <js:beads>
-                    <mdl:Badge dataBadge="1" overlap="true"/>
-                </js:beads>
-            </js:Div>
-
-            <js:Span text="Inbox" className="mdl-badge" style="color: rgba(0, 0, 0, 0.24);">
-                <js:beads>
-                    <mdl:Badge dataBadge="4"/>
-                </js:beads>
-            </js:Span>
-
-            <js:A text="Badge No Bg" href="http://flex.apache.org">
-                <js:beads>
-                    <mdl:Badge dataBadge="5" noBackground="true"/>
-                </js:beads>
-            </js:A>
-
-            <js:A id="badge1" text="Badge Normal" href="http://flex.apache.org">
-                <js:beads>
-                    <mdl:Badge dataBadge="1"/>
-                </js:beads>
-            </js:A>
-        </mdl:TabBarPanel>
-        
+        <local:Badges id="badges_panel"/>
+
     </mdl:NavigationLayoutContent>
 
     <local:MainFooter/>


Mime
View raw message