You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by bi...@apache.org on 2014/10/31 21:24:23 UTC
[1/3] git commit: [flex-sdk] [refs/heads/iso7skins] - Make fonts and
font colors uniform
Repository: flex-sdk
Updated Branches:
refs/heads/iso7skins 73b0af2f9 -> b224b4ac3
Make fonts and font colors uniform
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/98e59225
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/98e59225
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/98e59225
Branch: refs/heads/iso7skins
Commit: 98e59225320bbcd5e56071575004e962cc6a8386
Parents: 73b0af2
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Fri Oct 31 13:20:18 2014 -0700
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Fri Oct 31 13:20:18 2014 -0700
----------------------------------------------------------------------
frameworks/projects/mobiletheme/defaults.css | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/98e59225/frameworks/projects/mobiletheme/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/defaults.css b/frameworks/projects/mobiletheme/defaults.css
index 5d69408..1c59a72 100644
--- a/frameworks/projects/mobiletheme/defaults.css
+++ b/frameworks/projects/mobiletheme/defaults.css
@@ -965,14 +965,15 @@ global
{
color: #007AFF;
fontSize: 24;
- fontFamily: RobotoBold;
+ fontFamily: RobotoRegular;
+ fontWeight: normal;
}
ActionBar ButtonBase
{
color: #007AFF;
- fontFamily: RobotoBold;
- fontWeight: bold;
+ fontFamily: RobotoRegular;
+ fontWeight: normal;
}
ActionBar Group#actionGroup Button
@@ -983,7 +984,8 @@ global
Button
{
skinClass: ClassReference("spark.skins.ios7.ButtonSkin");
- fontFamily: RobotoBold;
+ fontFamily: RobotoRegular;
+ fontWeight: normal;
}
Button.emphasized
@@ -994,8 +996,8 @@ global
ButtonBar
{
skinClass: ClassReference("spark.skins.ios7.ButtonBarSkin");
- fontFamily: RobotoBold;
- fontWeight: "bold";
+ fontFamily: RobotoRegular;
+ fontWeight: normal;
}
Callout
@@ -1040,7 +1042,6 @@ global
CheckBox
{
chromeColor: #FFFFFF;
- color: #000000;
skinClass: ClassReference("spark.skins.ios7.CheckBoxSkin");
}
@@ -1083,8 +1084,9 @@ global
TabbedViewNavigator #tabBar
{
fontFamily: RobotoRegular;
- chromeColor: #484848;
- color: #000000;
+ chromeColor: #FFFFFF;
+ color: #007AFF;
+ highlightTextColor: #FFFFFF;
fontSize: 20;
fontWeight: normal;
iconPlacement: top;
[2/3] git commit: [flex-sdk] [refs/heads/iso7skins] - Add TODO
Posted by bi...@apache.org.
Add TODO
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/ab5b573d
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/ab5b573d
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/ab5b573d
Branch: refs/heads/iso7skins
Commit: ab5b573d6a5baf12bd034e3ed937c622dbd37422
Parents: 98e5922
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Fri Oct 31 13:21:09 2014 -0700
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Fri Oct 31 13:21:09 2014 -0700
----------------------------------------------------------------------
.../projects/mobiletheme/src/spark/skins/ios7/ButtonBarSkin.as | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ab5b573d/frameworks/projects/mobiletheme/src/spark/skins/ios7/ButtonBarSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/ButtonBarSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/ios7/ButtonBarSkin.as
index 9bc88a2..a1649b6 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/ButtonBarSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/ButtonBarSkin.as
@@ -124,6 +124,7 @@ public class ButtonBarSkin extends MobileSkin
{
dataGroup = new DataGroup();
var hLayout:ButtonBarHorizontalLayout = new ButtonBarHorizontalLayout();
+ //TODO: Gap should vary depending on current DPI
hLayout.gap = -1;
dataGroup.layout = hLayout;
addChild(dataGroup);
[3/3] git commit: [flex-sdk] [refs/heads/iso7skins] - ios7+ specific
skin for TabbedViewNavigator
Posted by bi...@apache.org.
ios7+ specific skin for TabbedViewNavigator
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/b224b4ac
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/b224b4ac
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/b224b4ac
Branch: refs/heads/iso7skins
Commit: b224b4ac378fea70346299262e421259591d8e36
Parents: ab5b573
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Fri Oct 31 13:22:20 2014 -0700
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Fri Oct 31 13:22:20 2014 -0700
----------------------------------------------------------------------
.../src/spark/skins/ios7/TabbedViewNavigatorTabBarSkin.as | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b224b4ac/frameworks/projects/mobiletheme/src/spark/skins/ios7/TabbedViewNavigatorTabBarSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/TabbedViewNavigatorTabBarSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/ios7/TabbedViewNavigatorTabBarSkin.as
index 1cf62b7..fe7a7ac 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/TabbedViewNavigatorTabBarSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/TabbedViewNavigatorTabBarSkin.as
@@ -25,9 +25,7 @@ import spark.skins.mobile.supportClasses.ButtonBarButtonClassFactory;
import spark.skins.mobile.supportClasses.TabbedViewNavigatorTabBarHorizontalLayout;
/**
- * The Android 4.x specific skin class for the Spark TabbedViewNavigator tabBar skin part.
- * It uses the ButtonBarFirstButtonSkin and ButtonBarMiddleButtonSkin as skins for first
- * middle buttons
+ * The iOS7+ specific skin class for the Spark TabbedViewNavigator tabBar skin part.
*
* @see spark.components.TabbedViewNavigator#tabBar
*
@@ -78,7 +76,7 @@ public class TabbedViewNavigatorTabBarSkin extends ButtonBarSkin
if (!lastButton)
{
lastButton = new ButtonBarButtonClassFactory(ButtonBarButton);
- lastButton.skinClass = spark.skins.ios7.ButtonBarFirstButtonSkin;
+ lastButton.skinClass = spark.skins.ios7.ButtonBarLastButtonSkin;
}
if (!middleButton)