-
- You deserve an explanation, so please don't skip this 1-minute read. It's {{ currentDayName }},
- {{ currentDate }}, and this message will be up only briefly. Please reflect on how often you've visited
- Wikipedia this year and if you're able to give €5 back.
-
- The internet we were promised—a place of free, collaborative, and accessible knowledge—is under constant
- threat. On Wikipedia, volunteers work together to create and verify the pages you rely on, supported by
- tools that undo vandalism within minutes, ensuring the information you seek is trustworthy.
+ We ask you to reflect on the number of times you visited Wikipedia in the past year and if you're able to give €5 back.
+
- Just 1% of our readers donate, so if you have given in the past and Wikipedia still provides you with €5 - worth of knowledge, donate today. If you are undecided, remember any contribution helps, whether it's €5 or - €25. Thank you. + Your gift strengthens the knowledge of today and tomorrow. Just 1% of our readers donate, so if + you have given in the past and Wikipedia still provides you with €5 worth of knowledge, kindly donate + today. If you are undecided, remember that any contribution helps, whether it's €5 or €25. Thank you.
+ If Wikipedia has given you €5 worth of knowledge this year, please give back. +
++ If you can, please join the 1% of readers who give. Thank you. +
+Every year we are dependent on the support of people like you. Yearly donations ' + + 'help sustainably and enable long term development.
' + + 'No risks attached, you can tell us to stop at any time.
' +}; + +export default messages; diff --git a/banners/english/C24_WMDE_Desktop_EN_05/messages_var.ts b/banners/english/C24_WMDE_Desktop_EN_05/messages_var.ts new file mode 100644 index 000000000..4b3e5c0e9 --- /dev/null +++ b/banners/english/C24_WMDE_Desktop_EN_05/messages_var.ts @@ -0,0 +1,28 @@ +import CustomAmountFormEn from '@src/components/DonationForm/Forms/messages/CustomAmountForm.en'; +import DynamicCampaignTextEn from '@src/utils/DynamicContent/messages/DynamicCampaignText.en'; +import { TranslationMessages } from '@src/Translator'; +import UpgradeToYearlyEn from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.en'; +import SoftCloseEn from '@src/components/SoftClose/messages/SoftClose.en'; +import AddressFormEn from '@src/components/DonationForm/Forms/messages/AddressForm.en'; +import FooterEn from '@src/components/Footer/messages/Footer.en'; +import MainDonationFormEn from '@src/components/DonationForm/Forms/messages/MainDonationForm.en'; +import AlreadyDonatedModalEn from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.en'; +import FallbackBanner from '@src/components/FallbackBanner/messages/FallbackBanner.en'; + +const messages: TranslationMessages = { + ...CustomAmountFormEn, + ...DynamicCampaignTextEn, + ...UpgradeToYearlyEn, + ...SoftCloseEn, + ...AddressFormEn, + ...FooterEn, + ...MainDonationFormEn, + ...AlreadyDonatedModalEn, + ...FallbackBanner, + 'upgrade-to-yearly-copy': 'Every year we are dependent on the support of people like you. Yearly donations ' + + 'help sustainably and enable long term development.
' + + 'No risks attached, you can tell us to stop at any time.
', + 'donation-receipt-checkbox-label': 'Please send me a tax deductible donation receipt to my postal address.' +}; + +export default messages; diff --git a/banners/english/C24_WMDE_Desktop_EN_05/styles/Banner.scss b/banners/english/C24_WMDE_Desktop_EN_05/styles/Banner.scss new file mode 100644 index 000000000..f88657686 --- /dev/null +++ b/banners/english/C24_WMDE_Desktop_EN_05/styles/Banner.scss @@ -0,0 +1,17 @@ +@use 'src/themes/Treedip/variables/fonts'; + +.wmde-banner { + &-wrapper { + font-size: 14px; + font-family: fonts.$ui; + box-shadow: var( --main-box-shadow ); + background-color: var( --main-background ); + color: var( --main-color ); + } + + &--closed { + .wmde-banner-wrapper { + display: none; + } + } +} diff --git a/banners/english/C24_WMDE_Desktop_EN_05/styles/FallbackBanner.scss b/banners/english/C24_WMDE_Desktop_EN_05/styles/FallbackBanner.scss new file mode 100644 index 000000000..2361a26cf --- /dev/null +++ b/banners/english/C24_WMDE_Desktop_EN_05/styles/FallbackBanner.scss @@ -0,0 +1,136 @@ +@use 'src/themes/Treedip/variables/globals'; +@use 'src/themes/Treedip/variables/fonts'; + +$breakpoint: 800px; + +.wmde-banner { + &-fallback { + width: 100%; + height: 150px; + display: flex; + flex-direction: column; + background: var( --fallback-background ); + box-shadow: var( --main-box-shadow ); + + @media ( min-width: $breakpoint ) { + height: auto; + min-height: 250px; + padding: 4px; + } + + &-small, + &-large { + display: flex; + flex-direction: column; + flex: 1 1 auto; + } + + &-small { + align-items: center; + border: 4px solid var( --fallback-border ); + border-radius: 4px; + padding: 8px; + + .wmde-banner-progress-bar { + height: 25px; + line-height: 25px; + } + + .wmde-banner-progress-bar-text, + .wmde-banner-progress-bar-fill-wrapper { + height: 25px; + } + + .wmde-banner-progress-bar-fill { + line-height: 20px; + } + + .wmde-banner-fallback-button { + margin: 0 0 8px; + } + + .wmde-banner-selection-input-text, + .wmde-banner-selection-input-input { + font-family: fonts.$content; + font-size: 14px; + font-weight: normal; + } + } + + &-large { + align-items: stretch; + } + + &-usage-link { + color: var( --fallback-uof-link ); + } + + &-message { + flex: 1 1 auto; + display: flex; + flex-direction: column; + background: var( --fallback-message-background ); + border: 4px solid var( --fallback-message-border ); + border-radius: 4px; + padding: 8px 0; + } + + &-bank-item { + display: block; + + &-label { + font-weight: bold; + } + } + + .wmde-banner-close { + height: 16px; + width: 16px; + top: 8px; + right: 8px; + margin: 0; + padding: 0; + + @media ( min-width: $breakpoint ) { + height: 30px; + width: 30px; + top: 12px; + right: 12px; + } + } + + .wmde-banner-slider-container { + padding: 0 0 8px; + } + + .wmde-banner-slide-content { + font-size: 14px; + p { + margin-bottom: 8px; + } + } + + .wmde-banner-slider-navigation-previous, + .wmde-banner-slider-navigation-next { + align-items: end; + } + + .wmde-banner-slider-pagination-dot { + cursor: default; + } + + .wmde-banner-message { + flex: 1 1 auto; + + p { + margin-bottom: 0; + } + } + } + + &--pending { + .wmde-banner-fallback { + box-shadow: none; + } + } +} diff --git a/banners/english/C24_WMDE_Desktop_EN_05/styles/MainBanner.scss b/banners/english/C24_WMDE_Desktop_EN_05/styles/MainBanner.scss new file mode 100644 index 000000000..518b8c959 --- /dev/null +++ b/banners/english/C24_WMDE_Desktop_EN_05/styles/MainBanner.scss @@ -0,0 +1,44 @@ +$banner-height: 357px !default; +$form-width: 300px !default; + +.wmde-banner { + &-main { + min-height: $banner-height; + display: flex; + flex-direction: column; + padding: 12px 24px 0; + } + + &-content { + display: flex; + flex-direction: row; + flex-grow: 1; + } + + &-message { + padding: 0 15px; + } + + &-column-left { + display: flex; + flex-direction: column; + justify-content: center; + flex: 1 1 auto; + margin-bottom: 0; + overflow-y: hidden; + margin-right: 30px; + padding: 0 0 10px; + background: var( --message-background ); + border: 5px solid var( --message-border ); + border-radius: 9px; + } + + &-column-right { + order: 2; + flex: 0 0 $form-width; + display: flex; + flex-direction: column; + width: $form-width; + padding: 10px 0; + } +} diff --git a/banners/english/C24_WMDE_Desktop_EN_05/styles/styles.scss b/banners/english/C24_WMDE_Desktop_EN_05/styles/styles.scss new file mode 100644 index 000000000..1e0e5a7f3 --- /dev/null +++ b/banners/english/C24_WMDE_Desktop_EN_05/styles/styles.scss @@ -0,0 +1,61 @@ +// This is the file where we import the theme-specific component styles +@use 'src/themes/Treedip/swatches/skin_vector-2022' with ( + $slider: true, + $select-group-bubble: true, + $select-group-image-label: true, + $upgrade-to-yearly: true, + $fallback-banner: true, + $progress-bar: true, + $soft-close: true, +); +@use 'src/themes/Treedip/variables/breakpoints'; +@use 'src/components/BannerConductor/banner-transition'; +@use 'Banner'; +@use 'MainBanner' with ( + $banner-height: 355px, + $form-width: 300px +); +@use 'src/themes/UseOfFunds/swatches/skin_vector-2022' as uof-vector-2022; +@use 'src/themes/UseOfFunds/UseOfFunds'; +@use 'src/themes/Treedip/defaults'; +@use 'src/themes/Treedip/ButtonClose/ButtonClose' with ( + $padding: 4px, + $top: 12px, + $right: 8px, + $margin: -4.5px +); +@use 'src/themes/Treedip/ProgressBar/ProgressBarAlternative' with ( + $progress-bar-margin: 0 15px +); +@use 'src/themes/Treedip/DonationForm/DonationForm'; +@use 'src/themes/Treedip/DonationForm/MultiStepDonation'; +@use 'src/themes/Treedip/DonationForm/BubbleForm/SelectGroupBubble'; +@use 'src/themes/Treedip/DonationForm/BubbleForm/SelectGroupRadioBubbles' with ( + $height: 34px, + $font-size: 14px +); +@use 'src/themes/Treedip/DonationForm/BubbleForm/SelectCustomAmountRadioBubble' with ( + $height: 34px, + $font-size: 14px +); +@use 'src/themes/Treedip/DonationForm/BubbleForm/SelectGroupBubbleImageLabel'; +@use 'src/themes/Treedip/DonationForm/SubComponents/SmsBox'; +@use 'src/themes/Treedip/DonationForm/Forms/MainDonationForm' with ( + $padding: 14px 0 0 +); +@use 'src/themes/Treedip/DonationForm/Forms/UpgradeToYearlyButtonForm' with ( + $font-size: 14px +); +@use 'src/themes/Treedip/Footer/FooterAlreadyDonated' with ( + $right-column-width: 300px +); +@use 'src/themes/Treedip/Footer/SelectionInput'; +@use 'src/themes/Treedip/Message/Message' with ( + $font-sizes: ( 1400px: 15px, 1600px: 16px, 1800px: 18px ) +); +@use 'src/themes/Treedip/Slider/KeenSlider'; +@use 'src/themes/Treedip/SoftClose/SoftClose'; +@use 'FallbackBanner'; +@use 'src/themes/Fijitiv/FallbackBanner/FallbackButton'; +@use 'src/themes/Fijitiv/FallbackBanner/LargeFooter'; +@use 'src/themes/Fijitiv/FallbackBanner/SmallFooter'; diff --git a/banners/english/C24_WMDE_Desktop_EN_05/styles/styles_var.scss b/banners/english/C24_WMDE_Desktop_EN_05/styles/styles_var.scss new file mode 100644 index 000000000..7a126e0a0 --- /dev/null +++ b/banners/english/C24_WMDE_Desktop_EN_05/styles/styles_var.scss @@ -0,0 +1,61 @@ +// This is the file where we import the theme-specific component styles +@use 'src/themes/Treedip/swatches/skin_vector-2022' with ( + $slider: true, + $select-group-bubble: true, + $select-group-image-label: true, + $upgrade-to-yearly: true, + $fallback-banner: true, + $progress-bar: true, + $soft-close: true, +); +@use 'src/themes/Treedip/variables/breakpoints'; +@use 'src/components/BannerConductor/banner-transition'; +@use 'Banner'; +@use 'MainBanner' with ( + $banner-height: 355px, + $form-width: 300px +); +@use 'src/themes/UseOfFunds/swatches/skin_vector-2022' as uof-vector-2022; +@use 'src/themes/UseOfFunds/UseOfFunds'; +@use 'src/themes/Treedip/defaults'; +@use 'src/themes/Treedip/ButtonClose/ButtonClose' with ( + $padding: 4px, + $top: 12px, + $right: 8px, + $margin: -4.5px +); +@use 'src/themes/Treedip/ProgressBar/ProgressBarAlternative' with ( + $progress-bar-margin: 0 15px +); +@use 'src/themes/Treedip/DonationForm/DonationForm'; +@use 'src/themes/Treedip/DonationForm/MultiStepDonation'; +@use 'src/themes/Treedip/DonationForm/BubbleForm/SelectGroupBubble'; +@use 'src/themes/Treedip/DonationForm/BubbleForm/SelectGroupRadioBubbles' with ( + $height: 34px, + $font-size: 14px +); +@use 'src/themes/Treedip/DonationForm/BubbleForm/SelectCustomAmountRadioBubble' with ( + $height: 34px, + $font-size: 14px +); +@use 'src/themes/Treedip/DonationForm/BubbleForm/SelectGroupBubbleImageLabel'; +@use 'src/themes/Treedip/DonationForm/SubComponents/SmsBox'; +@use 'src/themes/Treedip/DonationForm/Forms/MainDonationFormDonationReceipt' with ( + $padding: 14px 0 0 +); +@use 'src/themes/Treedip/DonationForm/Forms/UpgradeToYearlyButtonForm' with ( + $font-size: 14px +); +@use 'src/themes/Treedip/Footer/FooterAlreadyDonated' with ( + $right-column-width: 300px +); +@use 'src/themes/Treedip/Footer/SelectionInput'; +@use 'src/themes/Treedip/Message/Message' with ( + $font-sizes: ( 1400px: 15px, 1600px: 16px, 1800px: 18px ) +); +@use 'src/themes/Treedip/Slider/KeenSlider'; +@use 'src/themes/Treedip/SoftClose/SoftClose'; +@use 'FallbackBanner'; +@use 'src/themes/Fijitiv/FallbackBanner/FallbackButton'; +@use 'src/themes/Fijitiv/FallbackBanner/LargeFooter'; +@use 'src/themes/Fijitiv/FallbackBanner/SmallFooter'; diff --git a/campaign_info.toml b/campaign_info.toml index 190cb701a..1d201832b 100644 --- a/campaign_info.toml +++ b/campaign_info.toml @@ -139,9 +139,9 @@ tracking = "wpde-mob01-241028-var" [english] name = "English Desktop" icon = "desktop" -campaign = "C24_WMDE_Desktop_EN_04" -description = "Based on CTRL desktop EN 03" -campaign_tracking = "en04-ba-241113" +campaign = "C24_WMDE_Desktop_EN_05" +description = "Based on CTRL desktop EN 04" +campaign_tracking = "en05-ba-241126" preview_link = "/wiki/Main_Page?devbanner={{banner}}&banner=B22_WMDE_local_prototype" preview_link_darkmode = "/wiki/Main_Page?devbanner={{banner}}&banner=B22_WMDE_local_prototype&vectornightmode=1" preview_url = 'https://en.wikipedia.org/wiki/Main_Page?banner={{banner}}&devMode' @@ -149,14 +149,14 @@ wrapper_template = "wikipedia_org" use_of_funds_source = "MediaWiki:WMDE_Fundraising/UseOfFunds_2024_EN" [english.banners.ctrl] -filename = "./banners/english/C24_WMDE_Desktop_EN_04/banner_ctrl.ts" -pagename = "B24_WMDE_Desktop_EN_04_ctrl" -tracking = "org-en04-241113-ctrl" +filename = "./banners/english/C24_WMDE_Desktop_EN_05/banner_ctrl.ts" +pagename = "B24_WMDE_Desktop_EN_05_ctrl" +tracking = "org-en05-241126-ctrl" [english.banners.var] -filename = "./banners/english/C24_WMDE_Desktop_EN_04/banner_var.ts" -pagename = "B24_WMDE_Desktop_EN_04_var" -tracking = "org-en04-241113-var" +filename = "./banners/english/C24_WMDE_Desktop_EN_05/banner_var.ts" +pagename = "B24_WMDE_Desktop_EN_05_var" +tracking = "org-en05-241126-var" [english.test_matrix] platform = ["edge", "firefox_win10", "chrome_win10", "safari", "firefox_macos", "chrome_macos", "firefox_linux", "chrome_linux"] diff --git a/package-lock.json b/package-lock.json index 448496332..3d5f71755 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4499,9 +4499,9 @@ "license": "MIT" }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -8920,9 +8920,9 @@ "license": "MIT" }, "node_modules/npm-run-all/node_modules/cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz", + "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==", "dev": true, "license": "MIT", "dependencies": { diff --git a/src/components/DonationForm/Forms/MainDonationFormDonationReceipt.scss b/src/components/DonationForm/Forms/MainDonationFormDonationReceipt.scss new file mode 100644 index 000000000..04192c9a6 --- /dev/null +++ b/src/components/DonationForm/Forms/MainDonationFormDonationReceipt.scss @@ -0,0 +1,31 @@ +@mixin layout { + &-sub-form-donation { + .wmde-banner-form-field-group { + border: 0; + margin: 0; + display: block; + + &-legend { + width: 100%; + position: relative; + padding: 0; + } + } + } + + .wmde-banner-form-donation-receipt-checkbox { + display: inline-block; + cursor: pointer; + position: relative; + padding: 0 0 10px 24px; + + input[ type='checkbox' ] { + display: block; + float: left; + height: 16px; + margin: 0 0 0 -24px; + transition: background 0.15s ease-out; + width: 16px; + } + } +} diff --git a/src/components/DonationForm/Forms/MainDonationFormDonationReceipt.vue b/src/components/DonationForm/Forms/MainDonationFormDonationReceipt.vue new file mode 100644 index 000000000..266e8ba63 --- /dev/null +++ b/src/components/DonationForm/Forms/MainDonationFormDonationReceipt.vue @@ -0,0 +1,176 @@ + + + + + + diff --git a/src/components/DonationForm/Forms/MainDonationFormPaymentsAndReceiptButton.vue b/src/components/DonationForm/Forms/MainDonationFormPaymentsAndReceiptButton.vue new file mode 100644 index 000000000..a64f6820c --- /dev/null +++ b/src/components/DonationForm/Forms/MainDonationFormPaymentsAndReceiptButton.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue b/src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue index 2649f47bc..ffe5d9741 100644 --- a/src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue +++ b/src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue @@ -1,551 +1,4 @@ - + + - - diff --git a/src/themes/Treedip/DonationForm/BubbleForm/SelectCustomAmountRadioBubble.scss b/src/themes/Treedip/DonationForm/BubbleForm/SelectCustomAmountRadioBubble.scss index 68dd716bc..a7604bd17 100644 --- a/src/themes/Treedip/DonationForm/BubbleForm/SelectCustomAmountRadioBubble.scss +++ b/src/themes/Treedip/DonationForm/BubbleForm/SelectCustomAmountRadioBubble.scss @@ -71,3 +71,14 @@ $font-size: 0.9em !default; } } } + +html[ lang='en' ] .wmde-banner { + .wmde-banner-select-custom-amount-euro-symbol { + right: auto; + left: 20px; + } + + .wmde-banner-select-custom-amount-input { + padding: 0 10px 0 30px; + } +} diff --git a/src/themes/Treedip/DonationForm/Forms/MainDonationFormDonationReceipt.scss b/src/themes/Treedip/DonationForm/Forms/MainDonationFormDonationReceipt.scss new file mode 100644 index 000000000..279055b90 --- /dev/null +++ b/src/themes/Treedip/DonationForm/Forms/MainDonationFormDonationReceipt.scss @@ -0,0 +1,46 @@ +@use '../../variables/globals'; +@use '../../variables/fonts'; +@use '../../../../components/DonationForm/Forms/MainDonationFormDonationReceipt'; + +$padding: 0 !default; + +.wmde-banner { + @include MainDonationFormDonationReceipt.layout; + + &-sub-form-donation { + padding: $padding; + + .wmde-banner-form-field-group { + padding: 0 0 10px; + + &-legend { + display: none; + visibility: hidden; + font-family: fonts.$ui; + font-size: 12px; + line-height: 13px; + color: var( --main-color ); + } + } + } + + &-form-donation-receipt-checkbox { + input[ type='checkbox' ] { + cursor: pointer; + appearance: none; + background: var( --input-checkbox-background ); + border: 1px solid var( --input-checkbox-border ); + border-radius: 2px; + transition: background 0.15s ease-out; + + &:checked { + background: var( --input-checkbox-background-checked ) url( "data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 1 1'%3E%3Cpath d='M.04.627.146.52.43.804.323.91zm.177.177L.854.167.96.273.323.91z' style='fill:%23fff'/%3E%3C/svg%3E" ) no-repeat 50%; + border-color: var( --input-checkbox-border-checked ); + } + } + + label { + cursor: pointer; + } + } +} diff --git a/src/themes/Treedip/DonationForm/SubComponents/TransactionFees.scss b/src/themes/Treedip/DonationForm/SubComponents/TransactionFees.scss index ca29ce0da..b71d1ad05 100644 --- a/src/themes/Treedip/DonationForm/SubComponents/TransactionFees.scss +++ b/src/themes/Treedip/DonationForm/SubComponents/TransactionFees.scss @@ -13,8 +13,8 @@ transition: background 0.15s ease-out; &:checked { - background: var( --input-checkbox-checked-background ) url( "data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 1 1'%3E%3Cpath d='M.04.627.146.52.43.804.323.91zm.177.177L.854.167.96.273.323.91z' style='fill:%23fff'/%3E%3C/svg%3E" ) no-repeat 50%; - border-color: var( --input-checkbox-checked-background ); + background: var( --input-checkbox-background-checked ) url( "data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 1 1'%3E%3Cpath d='M.04.627.146.52.43.804.323.91zm.177.177L.854.167.96.273.323.91z' style='fill:%23fff'/%3E%3C/svg%3E" ) no-repeat 50%; + border-color: var( --input-checkbox-background-checked ); } } } diff --git a/src/themes/Treedip/swatches/color_dark.scss b/src/themes/Treedip/swatches/color_dark.scss index 3f1cdb2c7..44731ebad 100644 --- a/src/themes/Treedip/swatches/color_dark.scss +++ b/src/themes/Treedip/swatches/color_dark.scss @@ -52,8 +52,11 @@ $blue800: #20303f; --input-selection-color: #{$grey100}; --input-selection-selected-background: #{$red600}; --input-selection-selected-color: #{$white}; - --input-checkbox-border: #{$grey200}; - --input-checkbox-checked-background: #{$blue700}; + + --input-checkbox-background: #{$white}; + --input-checkbox-border: #{$grey500}; + --input-checkbox-background-checked: #{$blue700}; + --input-checkbox-border-checked: #{$white}; --animated-highlight-color: #{$white}; /* stylelint-disable */ diff --git a/src/themes/Treedip/swatches/color_light.scss b/src/themes/Treedip/swatches/color_light.scss index 2dd2d8b19..3061bd40e 100644 --- a/src/themes/Treedip/swatches/color_light.scss +++ b/src/themes/Treedip/swatches/color_light.scss @@ -51,8 +51,11 @@ $blue700: #2a4b8d; --input-selection-color: #{$black}; --input-selection-selected-background: #{$red600}; --input-selection-selected-color: #{$white}; + + --input-checkbox-background: transparent; --input-checkbox-border: #{$grey500}; - --input-checkbox-checked-background: #{$blue600}; + --input-checkbox-background-checked: #{$blue700}; + --input-checkbox-border-checked: #{$blue700}; --animated-highlight-color: #{$grey700}; /* stylelint-disable */ diff --git a/test/banners/english/C24_WMDE_Desktop_EN_05/components/BannerCtrl.spec.ts b/test/banners/english/C24_WMDE_Desktop_EN_05/components/BannerCtrl.spec.ts new file mode 100644 index 000000000..87c1a797b --- /dev/null +++ b/test/banners/english/C24_WMDE_Desktop_EN_05/components/BannerCtrl.spec.ts @@ -0,0 +1,141 @@ +import { beforeEach, describe, test } from 'vitest'; +import { mount, VueWrapper } from '@vue/test-utils'; +import Banner from '@banners/english/C24_WMDE_Desktop_EN_05/components/BannerCtrl.vue'; +import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates'; +import { newDynamicContent } from '@test/banners/dynamicCampaignContent'; +import { useOfFundsContent } from '@test/banners/useOfFundsContent'; +import { formItems } from '@test/banners/formItems'; +import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn'; +import { useOfFundsFeatures } from '@test/features/UseOfFunds'; +import { bannerContentAnimatedTextFeatures, bannerContentDateAndTimeFeatures, bannerContentDisplaySwitchFeatures, bannerContentFeatures } from '@test/features/BannerContent'; +import { TrackerStub } from '@test/fixtures/TrackerStub'; +import { donationFormFeatures } from '@test/features/forms/MainDonation_UpgradeToYearlyButton'; +import { useFormModel } from '@src/components/composables/useFormModel'; +import { resetFormModel } from '@test/resetFormModel'; +import { bannerAutoHideFeatures, bannerMainFeatures } from '@test/features/MainBanner'; +import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent'; +import { alreadyDonatedModalFeatures } from '@test/features/AlreadyDonatedModal'; +import { softCloseFeatures } from '@test/features/SoftCloseDesktop'; +import { Timer } from '@src/utils/Timer'; +import { TimerStub } from '@test/fixtures/TimerStub'; + +const formModel = useFormModel(); +const translator = ( key: string ): string => key; + +describe( 'BannerCtrl.vue', () => { + + beforeEach( () => { + resetFormModel( formModel ); + } ); + + const getWrapper = ( dynamicContent: DynamicContent = null, timer: Timer = null ): VueWrapper