diff --git a/src/diagrams/er/styles.js b/src/diagrams/er/styles.js index 1ac964602..907d813b6 100644 --- a/src/diagrams/er/styles.js +++ b/src/diagrams/er/styles.js @@ -14,11 +14,7 @@ const getStyles = (options) => fill: ${options.attributeBackgroundColorEven}; stroke: ${options.nodeBorder}; } - - .attributeBoxText { - color: ${options.attributeTextColor}; - } - + .relationshipLabelBox { fill: ${options.tertiaryColor}; opacity: 0.7; @@ -28,9 +24,9 @@ const getStyles = (options) => } } - .relationshipLine { - stroke: ${options.lineColor}; - } + .relationshipLine { + stroke: ${options.lineColor}; + } `; export default getStyles; diff --git a/src/themes/erDiagram-oldHardcodedValues.ts b/src/themes/erDiagram-oldHardcodedValues.ts index 24b7de7fd..8f88a70cd 100644 --- a/src/themes/erDiagram-oldHardcodedValues.ts +++ b/src/themes/erDiagram-oldHardcodedValues.ts @@ -5,4 +5,3 @@ */ export const oldAttributeBackgroundColorOdd = '#ffffff'; export const oldAttributeBackgroundColorEven = '#f2f2f2'; -export const oldAttributeBoxTextColor = '#ff0000'; diff --git a/src/themes/theme-base.js b/src/themes/theme-base.js index 557774030..86338c13c 100644 --- a/src/themes/theme-base.js +++ b/src/themes/theme-base.js @@ -3,7 +3,6 @@ import { mkBorder } from './theme-helpers'; import { oldAttributeBackgroundColorEven, oldAttributeBackgroundColorOdd, - oldAttributeBoxTextColor, } from './erDiagram-oldHardcodedValues'; class Theme { @@ -229,7 +228,6 @@ class Theme { /* -------------------------------------------------- */ /* EntityRelationship diagrams */ - this.attributeTextColor = this.attributeTextColor || oldAttributeBoxTextColor; this.attributeBackgroundColorOdd = this.attributeBackgroundColorOdd || oldAttributeBackgroundColorOdd; this.attributeBackgroundColorEven = diff --git a/src/themes/theme-dark.js b/src/themes/theme-dark.js index e946a9d6f..d0ea1269e 100644 --- a/src/themes/theme-dark.js +++ b/src/themes/theme-dark.js @@ -1,10 +1,5 @@ import { invert, lighten, darken, rgba, adjust } from 'khroma'; import { mkBorder } from './theme-helpers'; -import { - oldAttributeBackgroundColorEven, - oldAttributeBackgroundColorOdd, - oldAttributeBoxTextColor, -} from './erDiagram-oldHardcodedValues'; class Theme { constructor() { @@ -228,7 +223,6 @@ class Theme { /* -------------------------------------------------- */ /* EntityRelationship diagrams */ - this.attributeTextColor = this.attributeTextColor || oldAttributeBoxTextColor; this.attributeBackgroundColorOdd = this.attributeBackgroundColorOdd || lighten(this.background, 12); this.attributeBackgroundColorEven = diff --git a/src/themes/theme-default.js b/src/themes/theme-default.js index f6233f4e2..a8abbfc57 100644 --- a/src/themes/theme-default.js +++ b/src/themes/theme-default.js @@ -3,7 +3,6 @@ import { mkBorder } from './theme-helpers'; import { oldAttributeBackgroundColorEven, oldAttributeBackgroundColorOdd, - oldAttributeBoxTextColor, } from './erDiagram-oldHardcodedValues'; class Theme { @@ -266,7 +265,6 @@ class Theme { /* -------------------------------------------------- */ /* EntityRelationship diagrams */ - this.attributeTextColor = this.attributeTextColor || oldAttributeBoxTextColor; this.attributeBackgroundColorOdd = this.attributeBackgroundColorOdd || oldAttributeBackgroundColorOdd; this.attributeBackgroundColorEven = diff --git a/src/themes/theme-forest.js b/src/themes/theme-forest.js index 439e5f6c1..d02d46e5a 100644 --- a/src/themes/theme-forest.js +++ b/src/themes/theme-forest.js @@ -3,7 +3,6 @@ import { mkBorder } from './theme-helpers'; import { oldAttributeBackgroundColorEven, oldAttributeBackgroundColorOdd, - oldAttributeBoxTextColor, } from './erDiagram-oldHardcodedValues'; class Theme { @@ -229,7 +228,6 @@ class Theme { /* -------------------------------------------------- */ /* EntityRelationship diagrams */ - this.attributeTextColor = this.attributeTextColor || oldAttributeBoxTextColor; this.attributeBackgroundColorOdd = this.attributeBackgroundColorOdd || oldAttributeBackgroundColorOdd; this.attributeBackgroundColorEven = diff --git a/src/themes/theme-neutral.js b/src/themes/theme-neutral.js index 3c43a73f4..c4bbf8241 100644 --- a/src/themes/theme-neutral.js +++ b/src/themes/theme-neutral.js @@ -3,7 +3,6 @@ import { mkBorder } from './theme-helpers'; import { oldAttributeBackgroundColorEven, oldAttributeBackgroundColorOdd, - oldAttributeBoxTextColor, } from './erDiagram-oldHardcodedValues'; // const Color = require ( 'khroma/dist/color' ).default @@ -270,7 +269,6 @@ class Theme { /* -------------------------------------------------- */ /* EntityRelationship diagrams */ - this.attributeTextColor = this.attributeTextColor || oldAttributeBoxTextColor; this.attributeBackgroundColorOdd = this.attributeBackgroundColorOdd || oldAttributeBackgroundColorOdd; this.attributeBackgroundColorEven =