update some styles for rn

ant-design · May 25, 2017 · b7094e2 · b7094e2
1 parent acaeff0
commit b7094e2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/components/activity-indicator/style/index.tsx b/components/activity-indicator/style/index.tsx
@@ -1,4 +1,5 @@
 import { StyleSheet } from 'react-native';
+import variables from '../../style/themes/default';
 
 export default StyleSheet.create({
   container: {
@@ -8,7 +9,7 @@ export default StyleSheet.create({
     bottom: 0,
     right: 0,
     backgroundColor: 'transparent',
-    zIndex: 99,
+    zIndex: variables.toast_zindex,
   },
   innerContainer: {
     flex: 1,
@@ -21,18 +22,18 @@ export default StyleSheet.create({
     justifyContent: 'center',
     width: 89,
     height: 89,
-    borderRadius: 6,
-    backgroundColor: 'rgba(58, 58, 58, 0.9)',
+    borderRadius: variables.radius_md,
+    backgroundColor: variables.toast_fill,
   },
   tip: {
-    color: '#999',
-    fontSize: 14,
-    marginLeft: 8,
+    color: variables.color_text_base,
+    fontSize: variables.font_size_base,
+    marginLeft: variables.h_spacing_md,
   },
   toast: {
-    color: '#fff',
-    fontSize: 14,
-    marginTop: 4,
+    color: variables.color_text_base_inverse,
+    fontSize: variables.font_size_base,
+    marginTop: variables.v_spacing_sm,
   },
   spinner: {
     flexDirection: 'row',

diff --git a/components/style/themes/default.tsx b/components/style/themes/default.tsx
@@ -28,6 +28,7 @@ export default {
   fill_mask: 'rgba(0, 0, 0, .4)',              // 遮罩背景
   fill_overlay_inverse: 'rgba(0, 0, 0, .8)',   // 浮层背景 _ 反色，用于 toast
   color_icon_base: '#ccc',                     // 许多小图标的背景，比如一些小圆点，加减号
+  toast_fill: 'rgba(0, 0, 0, .8)',
 
   // 透明度
   opacity_disabled: '0.3',   // switch checkbox radio 等组件禁用的透明度

diff --git a/components/toast/style/index.tsx b/components/toast/style/index.tsx
@@ -18,7 +18,7 @@ export default StyleSheet.create({
   },
   innerWrap: {
     alignItems: 'center',
-    backgroundColor: variables.fill_overlay_inverse,
+    backgroundColor: variables.toast_fill,
     minWidth: 100,
   },
   iconToast: {