diff --git a/CHANGELOG.md b/CHANGELOG.md index 375d57d184..b8844f5119 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ * Field inputs inside an array modal can now be focused/tabbed via keyboard * Fixes admin bar overlapping widget area add menu. +* Fixed the checkered background for gauging color transparency. ### Changes diff --git a/modules/@apostrophecms/color-field/ui/apos/components/AposColor.vue b/modules/@apostrophecms/color-field/ui/apos/components/AposColor.vue index 7be8256302..38b0e448ca 100644 --- a/modules/@apostrophecms/color-field/ui/apos/components/AposColor.vue +++ b/modules/@apostrophecms/color-field/ui/apos/components/AposColor.vue @@ -32,7 +32,7 @@ class="apos-color__active-color" :style="{ background: activeColor }" /> - +
@@ -97,7 +97,7 @@ class="apos-color__presets-color" @click="handlePreset(c)" > - +
@@ -110,7 +110,6 @@ import editableInput from '../lib/AposColorEditableInput.vue'; import saturation from '../lib/AposColorSaturation.vue'; import hue from '../lib/AposColorHue.vue'; import alpha from '../lib/AposColorAlpha.vue'; -import checkboard from '../lib/AposColorCheckerboard.vue'; const defaultOptions = { ...apos.modules['@apostrophecms/color-field'].defaultOptions }; @@ -120,8 +119,7 @@ export default { Saturation: saturation, Hue: hue, Alpha: alpha, - EditableContent: editableInput, - Checkboard: checkboard + EditableContent: editableInput }, mixins: [ colorMixin ], props: { @@ -296,10 +294,6 @@ export default { box-shadow: inset 0 0 0 1px rgb(0 0 0 / 15%), inset 0 0 4px rgb(0 0 0 / 25%); } -.apos-color__color-wrap .apos-color__checkerboard { - background-size: auto; -} - .apos-color__field { display: flex; padding-top: 4px; @@ -353,7 +347,7 @@ export default { box-shadow: inset 0 0 0 1px rgb(0 0 0 / 15%); } -.apos-color__presets-color .apos-color__checkerboard { +.apos-color__presets-color { box-shadow: inset 0 0 0 1px rgb(0 0 0 / 15%); border-radius: 3px; } diff --git a/modules/@apostrophecms/color-field/ui/apos/lib/AposColorAlpha.vue b/modules/@apostrophecms/color-field/ui/apos/lib/AposColorAlpha.vue index 5fb7c7b822..00ffc48bcf 100644 --- a/modules/@apostrophecms/color-field/ui/apos/lib/AposColorAlpha.vue +++ b/modules/@apostrophecms/color-field/ui/apos/lib/AposColorAlpha.vue @@ -1,7 +1,7 @@ + + + + diff --git a/modules/@apostrophecms/ui/ui/apos/scss/global/_theme.scss b/modules/@apostrophecms/ui/ui/apos/scss/global/_theme.scss index f21654115c..e01b2b8361 100644 --- a/modules/@apostrophecms/ui/ui/apos/scss/global/_theme.scss +++ b/modules/@apostrophecms/ui/ui/apos/scss/global/_theme.scss @@ -57,6 +57,10 @@ --a-spreadsheet: #2ecc71; --a-pdf: #e74c3c; + // Checkerboard colors + --a-checker-board-white: #fff; + --a-checker-board-gray: #d3d3d3; + // Font-Family --a-family-default: -apple-system, system-ui, "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", sans-serif, "Apple Color Emoji",