Skip to content

Commit

Permalink
Merge branch 'main' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
tamw-wnet committed Apr 10, 2024
2 parents de7053a + 1edd571 commit e1ee96c
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 33 deletions.
28 changes: 26 additions & 2 deletions assets/css/ea-donate-form-theme-styles.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* EA - THIRTEEN THEME STYLES */

/* EA - thirteen color settings */
:root {
--button-selected-bg-color: #007DA3;
Expand All @@ -7,7 +8,6 @@
--amount-selected-color: #ffffff !important;
--btn-at-primary: #007DA3;
--btn-at-primary-hover: #2538c4;

}

/* 2023 MWD THIRTEEN Main - THEME HEADER HTML::14410 */
Expand Down Expand Up @@ -953,6 +953,7 @@ button.uslb-btn small{

}


@media only screen and (max-width: 70em) {}

/* Modal */
Expand Down Expand Up @@ -1115,7 +1116,7 @@ div#cta-01 a {
}

.w3-button:hover, .wne-button:hover {
color: 007DA3 !important;
color: #007DA3 !important;
}

#giftSug h2 {
Expand Down Expand Up @@ -1170,3 +1171,26 @@ fieldset.at-fieldset.AdditionalInformation legend {
z-index: 100;
margin-top: 0px;
}

/* UpSell LB */

input#toggleCheckbox{
width: 30px;
height: 30px;
border: 1px solid #000;
background-color: #007DA3;
}

input#toggleCheckbox{
width: 30px;
height: 30px;
border: 1px solid #000;
background-color: #007DA3;
cursor: pointer;
}

input#toggleCheckbox:hover{
border: 1px solid #007DA3;
background-color: #007DA3;
cursor: pointer;
}
31 changes: 1 addition & 30 deletions assets/js/ea-donate-form.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// MWD - ea-donate-form.js 091823
// MWD - ea-donate-form.js 041024
var nvtag_callbacks = window.nvtag_callbacks = window.nvtag_callbacks || {};
var nvtag_callbacks = nvtag_callbacks || {};
nvtag_callbacks.postRender = nvtag_callbacks.postRender || [];
Expand All @@ -17,7 +17,6 @@ var showModal = false;
var hideGiftAdd = true;
var freq;
var otherAmt;
var passPortOtherNum = $("input[name=OtherAmount]").val()

var preFixAdjust = function(args){
// Prefix Modify title or Prefix and add to datalist
Expand Down Expand Up @@ -61,13 +60,10 @@ var cssPostRender = function( args ) {
$(".at-check").eq(1).css('margin', '0 10px');
$(".at-check").eq(2).css('margin', '0 10px');
$(".at-check").eq(3).css('margin', '0 28px');
// $(".at-check").eq(4).css('display', 'none');
$("div.at-radio").css("margin", "0");
$("div.at-radios.clearfix").css("margin", "0");
$(".edit-otheramount").attr('placeholder', 'Other');
$(".at-check").eq(3).insertBefore($(".at-form-submit"))
// console.log($(".at-check").eq(4))
// $(".at-check").eq(4).insertBefore($(".at .at-lightbox-footer-wrapper"))
return args;
});
}
Expand Down Expand Up @@ -176,7 +172,6 @@ var displayPremium = function(args) {
}
}


var wnePostRender = function (args) {
$(document).on('click','.at-radio-label-0',function(){ SelectedFrequencyBtn(); });
$(document).on('click','.at-radio-label-4',function(){ SelectedFrequencyBtn(); });
Expand Down Expand Up @@ -222,25 +217,6 @@ var wnePostRender = function (args) {
}
// End Post Render


// var alterFormCheckbox = function(args) {
// let a = args.form_definition.form_elements;
// console.log(a)
// _.each(a, function(child, index) {
// if (child.name === 'AdditionalInformation') {
// _.each(child, function(children, index) {
// let c = children;
// if(c[3].required === true){

// }
// });
// }
// });

// return args;
// };


window.nvtag_callbacks.alterErrors.push(function (args) {
var targetElement = $(".at-check").eq(3);
var children = targetElement.children();
Expand Down Expand Up @@ -276,7 +252,6 @@ window.nvtag_callbacks.alterErrors.push(function (args) {
}
});


return args;
});

Expand Down Expand Up @@ -317,10 +292,6 @@ var addLegalCopy = function () {

}




// nvtag_callbacks.alterFormDefinition.push(alterFormCheckbox);
nvtag_callbacks.postRender.push(preFixAdjust);
nvtag_callbacks.postRender.push(addLegalCopy);
nvtag_callbacks.postRender.push(wnePostRender);
Expand Down
2 changes: 1 addition & 1 deletion wnet-everyaction-wp-css-and-js.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class WNET_EveryAction_WP_CSS_and_JS {
public $version;

public function __construct() {
$this->version = '2023.09.19';
$this->version = '2024.04.10';
/* use today's date in the line above in 'xxxx.xx.xx' format to make sure CloudFront is using this version.
* If including the script elsewhere, it is generally best to also include that date as a query string
*/
Expand Down

0 comments on commit e1ee96c

Please sign in to comment.