Merge "Update json style files with the new 'fontStyle' format." into devel/master

Paul Wisbey · Gerrit Code Review
2 parents 893be957 b9b579ad
Showing 3 changed files with 2 additions and 3 deletions
resources/style/demo-theme.json.in
resources/style/mobile/demo-theme.json.in
shared/view.h
@@ -27,7 +27,7 @@
     },
     "TextLabel":
     {
-      "fontStyle":"Regular",
+      "fontStyle":{"weight":"normal"},
       "pointSize":18
     },
     "LauncherLabel":
@@ -24,7 +24,7 @@
     },
     "TextLabel":
     {
-      "fontStyle":"Regular",
+      "fontStyle":{"weight":"normal"},
       "pointSize":18
     },
     "TextLabelFontSize0":
@@ -46,7 +46,6 @@ struct ViewStyle
 const ViewStyle DEFAULT_VIEW_STYLE( 0.1f, 0.7f, 80.f, 4.f );
  
 const char*                   DEFAULT_TEXT_STYLE_FONT_FAMILY("HelveticaNue");
-const char*                   DEFAULT_TEXT_STYLE_FONT_STYLE("Regular");
 const float                   DEFAULT_TEXT_STYLE_POINT_SIZE( 8.0f );
  
 const Dali::Toolkit::Alignment::Padding DEFAULT_PLAY_PADDING(12.0f, 12.0f, 12.0f, 12.0f);