diff --git a/modules/member/skins/simple_world/common_header.html b/modules/member/skins/simple_world/common_header.html
index 6092d1867..3c692a32c 100644
--- a/modules/member/skins/simple_world/common_header.html
+++ b/modules/member/skins/simple_world/common_header.html
@@ -1,5 +1,18 @@
+
+ {@
+ if(!$layout_info->primary_color)
+ $layout_info->primary_color = 'red';
+ if(!$layout_info->primary_color && $layout_info->customized_primary_color)
+ $layout_info->primary_color = 'customized';
+ if(!$layout_info->customized_primary_color)
+ $layout_info->customized_primary_color = '#f44336';
+ }
+
+
+ {@$layout_info->primary_color = 'red';}
+
{@
$material_colors = array(
'red' => '#f44336',
@@ -28,24 +41,21 @@
'customized' => $layout_info->customized_primary_color,
);
}
-
- {@
- if(!$layout_info->primary_color && $layout_info->customized_primary_color)
- $layout_info->primary_color = 'customized';
- if(!$layout_info->primary_color)
- $layout_info->primary_color = 'red';
- if(!$layout_info->customized_primary_color)
- $layout_info->customized_primary_color = '#f44336';
- }
-
-
- {@$layout_info->primary_color = 'blue';}
-
{@$colorset = $material_colors[$member_config->colorset];}
{@$skin_color = $material_colors[$layout_info->primary_color];}
+
+
+ {@$skin_color = trim($colorset)}
+
+ {@$skin_color = trim($colorset)[1].trim($colorset)[1].trim($colorset)[2].trim($colorset)[2].trim($colorset)[3].trim($colorset)[3]}
+
+
+ {@$skin_color = '#f44336'}
+
+
-
+
{@$skin_color = $layout_info->primary_color}
{@$skin_color = $layout_info->primary_color[1].$layout_info->primary_color[1].$layout_info->primary_color[2].$layout_info->primary_color[2].$layout_info->primary_color[3].$layout_info->primary_color[3]}
@@ -54,9 +64,6 @@
{@$skin_color = '#f44336'}
-
- {@$skin_color = $colorset}
-
{@Context::set('simple_less_value', array('red' => hexdec(substr($skin_color, 1, 2)), 'green' => hexdec(substr($skin_color, 3, 2)), 'blue' => hexdec(substr($skin_color, 5, 2)) ))}
diff --git a/modules/member/skins/simple_world/css/css.less b/modules/member/skins/simple_world/css/css.less
index 43156161b..57534b821 100644
--- a/modules/member/skins/simple_world/css/css.less
+++ b/modules/member/skins/simple_world/css/css.less
@@ -68,7 +68,7 @@ script, style
.rx_simple_member a
{
- color: @color;
+ .text-contrast(#fff; darken(@color,5%); lighten(@color,5%));
text-decoration: none;
}
/* Horizontal align */
diff --git a/modules/message/skins/simple_world/common_header.html b/modules/message/skins/simple_world/common_header.html
index 3f5be653b..a8853ec30 100644
--- a/modules/message/skins/simple_world/common_header.html
+++ b/modules/message/skins/simple_world/common_header.html
@@ -1,7 +1,19 @@
{@Context::addMetaTag("viewport", "width=device-width, user-scalable=yes")}
-
+
+ {@
+ if(!$layout_info->primary_color)
+ $layout_info->primary_color = 'red';
+ if(!$layout_info->primary_color && $layout_info->customized_primary_color)
+ $layout_info->primary_color = 'customized';
+ if(!$layout_info->customized_primary_color)
+ $layout_info->customized_primary_color = '#f44336';
+ }
+
+
+ {@$layout_info->primary_color = 'red';}
+
{@
$material_colors = array(
'red' => '#f44336',
@@ -30,25 +42,21 @@
'customized' => $layout_info->customized_primary_color,
);
}
-
- {@
- if(!$layout_info->primary_color && $layout_info->customized_primary_color)
- $layout_info->primary_color = 'customized';
- if(!$layout_info->primary_color)
- $layout_info->primary_color = 'red';
- if(!$layout_info->customized_primary_color)
- $layout_info->customized_primary_color = '#f44336';
- }
-
-
-
- {@$layout_info->primary_color = 'blue';}
-
-
+{@$colorset = $material_colors[$member_config->colorset];}
{@$skin_color = $material_colors[$layout_info->primary_color];}
+
+
+ {@$skin_color = trim($colorset)}
+
+ {@$skin_color = trim($colorset)[1].trim($colorset)[1].trim($colorset)[2].trim($colorset)[2].trim($colorset)[3].trim($colorset)[3]}
+
+
+ {@$skin_color = '#f44336'}
+
+
-
+
{@$skin_color = $layout_info->primary_color}
{@$skin_color = $layout_info->primary_color[1].$layout_info->primary_color[1].$layout_info->primary_color[2].$layout_info->primary_color[2].$layout_info->primary_color[3].$layout_info->primary_color[3]}
diff --git a/widgets/content/skins/simple_rectangle/content.html b/widgets/content/skins/simple_rectangle/content.html
index 1b8cf0bff..8c0ed9561 100644
--- a/widgets/content/skins/simple_rectangle/content.html
+++ b/widgets/content/skins/simple_rectangle/content.html
@@ -1,6 +1,19 @@
{@$layout_info = Context::get('layout_info')}
+
+ {@
+ if(!$layout_info->primary_color)
+ $layout_info->primary_color = 'red';
+ if(!$layout_info->primary_color && $layout_info->customized_primary_color)
+ $layout_info->primary_color = 'customized';
+ if(!$layout_info->customized_primary_color)
+ $layout_info->customized_primary_color = '#f44336';
+ }
+
+
+ {@$layout_info->primary_color = 'red';}
+
{@
$material_colors = array(
'red' => '#f44336',
@@ -29,24 +42,21 @@
'customized' => $layout_info->customized_primary_color,
);
}
-
- {@
- if(!$layout_info->primary_color && $layout_info->customized_primary_color)
- $layout_info->primary_color = 'customized';
- if(!$layout_info->primary_color)
- $layout_info->primary_color = 'red';
- if(!$layout_info->customized_primary_color)
- $layout_info->customized_primary_color = '#f44336';
- }
-
-
- {@$layout_info->primary_color = 'blue';}
-
-{@$colorset = $material_colors[$colorset];}
+{@$colorset = $material_colors[$member_config->colorset];}
{@$skin_color = $material_colors[$layout_info->primary_color];}
+
+
+ {@$skin_color = trim($colorset)}
+
+ {@$skin_color = trim($colorset)[1].trim($colorset)[1].trim($colorset)[2].trim($colorset)[2].trim($colorset)[3].trim($colorset)[3]}
+
+
+ {@$skin_color = '#f44336'}
+
+
-
+
{@$skin_color = $layout_info->primary_color}
{@$skin_color = $layout_info->primary_color[1].$layout_info->primary_color[1].$layout_info->primary_color[2].$layout_info->primary_color[2].$layout_info->primary_color[3].$layout_info->primary_color[3]}
@@ -55,9 +65,6 @@
{@$skin_color = '#f44336'}
-
- {@$skin_color = $colorset}
-
{@Context::set('less_color', array('red' => hexdec(substr($skin_color, 1, 2)), 'green' => hexdec(substr($skin_color, 3, 2)), 'blue' => hexdec(substr($skin_color, 5, 2)), 'thumbnail_height' => intval($widget_info->thumbnail_height), 'thumbnail_width' => intval($widget_info->thumbnail_width)))}