Merge pull request #266 from antvis/fix-default-theme

fix: 默认主题中axis label调整 & tooltip 样式 & column widthRation调整
antvis · Nov 19, 2019 · 37c7e9a · 37c7e9a
2 parents 90ac31b + e38ff9c
commit 37c7e9a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/src/geoms/base.ts b/src/geoms/base.ts
@@ -21,7 +21,7 @@ export default class ElementParser {
       },
       widthRatio: {
         // 宽度所占的分类的比例
-        column: 2 / 3, // g2plot定制为2/3
+        column: 3 / 5, // g2plot定制
         rose: 0.9999999, // 玫瑰图柱状占比 1
         multiplePie: 1 / 1.3, // 多层的饼图、环图
       },

diff --git a/src/plots/bar/layer.ts b/src/plots/bar/layer.ts
@@ -70,6 +70,9 @@ export default class BaseBarLayer<T extends BarLayerConfig = BarLayerConfig> ext
         },
         label: {
           visible: true,
+          style: {
+            fill: 'rgba(0, 0, 0, 0.65)',
+          },
         },
         title: {
           visible: false,

diff --git a/src/theme/dark.ts b/src/theme/dark.ts
@@ -185,14 +185,14 @@ export const DEFAULT_DARK_THEME = {
   label: {
     offset: 12,
     style: {
-      fill: 'rgba(255, 255, 255, 0.95)',
+      fill: 'rgba(255, 255, 255, 0.65)',
       lineWidth: 1,
     },
   },
   tooltip: {
     'g2-tooltip': {
       backgroundColor: 'rgba(33,33,33, 0.95)',
-      boxShadow: '0px 0px 10px rgba(0,0,0,0.65)',
+      boxShadow: '0px 0px 8px rgba(0,0,0,0.65)',
       color: 'rgba(255, 255, 255, 0.65)',
     },
   },

diff --git a/src/theme/default.ts b/src/theme/default.ts
@@ -89,7 +89,7 @@ export const DEFAULT_GLOBAL_THEME = {
         visible: true,
         offset: 8,
         style: {
-          fill: '#a0a4aa',
+          fill: 'rgba(0,0,0,0.45)',
           fontSize: 12,
         },
       },
@@ -112,30 +112,30 @@ export const DEFAULT_GLOBAL_THEME = {
       grid: {
         visible: false,
         style: {
-          stroke: '#e3e8ec',
+          stroke: 'rgba(0, 0, 0, 0.15)',
           lineWidth: 1,
           lineDash: [0, 0],
         },
       },
       line: {
         visible: false,
         style: {
-          stroke: '#BFBFBF',
+          stroke: 'rgba(0, 0, 0, 0.45)',
           lineWidth: 1,
         },
       },
       tickLine: {
         visible: true,
         style: {
           length: 4,
-          stroke: '#bdc8d3',
+          stroke: 'rgba(0, 0, 0, 0.45)',
           lineWidth: 0.5,
         },
       },
       label: {
         visible: true,
         style: {
-          fill: '#a0a4aa',
+          fill: 'rgba(0,0,0,0.45)',
           fontSize: 12,
         },
         offset: 16,
@@ -199,4 +199,9 @@ export const DEFAULT_GLOBAL_THEME = {
       lineWidth: 2,
     },
   },
+  tooltip: {
+    'g2-tooltip': {
+      boxShadow: '0px 0px 8px rgba(0,0,0,0.15)',
+    },
+  },
 };