From a4928d727a19936cd55300b5e8b5acafeaae3e44 Mon Sep 17 00:00:00 2001 From: kcppdevelopers Date: Mon, 27 Jul 2020 18:46:11 +0530 Subject: [PATCH 1/7] use woo style, PFW-661 --- assets/css/angelleye-cc-ui.css | 23 +++++++++---------- classes/wc-gateway-paypal-pro-angelleye.php | 4 ++-- ...c-gateway-paypal-pro-payflow-angelleye.php | 4 ++-- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/assets/css/angelleye-cc-ui.css b/assets/css/angelleye-cc-ui.css index 72107218c..6859ef9ab 100644 --- a/assets/css/angelleye-cc-ui.css +++ b/assets/css/angelleye-cc-ui.css @@ -1,15 +1,3 @@ -.woocommerce #payment .form-row select, .woocommerce-page #payment .form-row select { - padding: 7px; - margin: 0 6px 0 0; - border-color: #c7c1c6; - border-top-color: rgb(199, 193, 198); - border-top-color: #bbb3b9; - background-repeat: no-repeat; - background-size: 32px 20px; - border-radius: 3px; - font-size: 1.5em; - color: #939393; -} .woocommerce-page #payment .form-row select option { color: black; } @@ -30,7 +18,18 @@ .woocommerce-page #payment .form-row select.woocommerce-cc-month { width: 52%; + min-width: 100px; + margin-bottom: 10px; + + margin-right: 10px; } .woocommerce-page #payment .form-row select.woocommerce-cc-year { width: 43%; + min-width: 100px; + + +} + +.woocommerce form .form-row.woocommerce-validated select.woocommerce-cc-month, .woocommerce form .form-row.woocommerce-validated select.woocommerce-cc-year { + border: 1px solid #bbb; } \ No newline at end of file diff --git a/classes/wc-gateway-paypal-pro-angelleye.php b/classes/wc-gateway-paypal-pro-angelleye.php index 5367451de..d13893625 100644 --- a/classes/wc-gateway-paypal-pro-angelleye.php +++ b/classes/wc-gateway-paypal-pro-angelleye.php @@ -630,7 +630,7 @@ public function paypal_for_woocommerce_paypal_pro_credit_card_form_expiration_da $form_html = ""; $form_html .= '

'; $form_html .= ''; - $form_html .= 'field_name('card_expiration_month') . ' class="woocommerce-select woocommerce-cc-month mr5 wc-credit-card-form-card-cvc">'; $form_html .= ''; $months = array(); for ($i = 1; $i <= 12; $i++) : @@ -646,7 +646,7 @@ public function paypal_for_woocommerce_paypal_pro_credit_card_form_expiration_da } } $form_html .= ''; - $form_html .= 'field_name('card_expiration_year') . ' class="woocommerce-select woocommerce-cc-year ml5 wc-credit-card-form-card-cvc">'; $form_html .= ''; for ($i = date('y'); $i <= date('y') + 15; $i++) { if($this->credit_card_year_field == 'four_digit') { diff --git a/classes/wc-gateway-paypal-pro-payflow-angelleye.php b/classes/wc-gateway-paypal-pro-payflow-angelleye.php index d5c912252..440db2dff 100644 --- a/classes/wc-gateway-paypal-pro-payflow-angelleye.php +++ b/classes/wc-gateway-paypal-pro-payflow-angelleye.php @@ -1536,7 +1536,7 @@ public function paypal_for_woocommerce_paypal_pro_payflow_credit_card_form_expir $form_html = ""; $form_html .= '

'; $form_html .= ''; - $form_html .= 'field_name('card_expiration_month') . ' class="woocommerce-select woocommerce-cc-month mr5 wc-credit-card-form-card-cvc">'; $form_html .= ''; $months = array(); for ($i = 1; $i <= 12; $i++) : @@ -1557,7 +1557,7 @@ public function paypal_for_woocommerce_paypal_pro_payflow_credit_card_form_expir } } $form_html .= ''; - $form_html .= 'field_name('card_expiration_year') . ' class="woocommerce-select woocommerce-cc-year ml5 wc-credit-card-form-card-cvc">'; $form_html .= ''; for ($i = date('y'); $i <= date('y') + 15; $i++) { if ($this->credit_card_year_field == 'four_digit') { From 0332b2c2357dcfe3db5de49fc9334316b25c677a Mon Sep 17 00:00:00 2001 From: kcppdevelopers Date: Mon, 27 Jul 2020 18:47:36 +0530 Subject: [PATCH 2/7] remove space, PFW-661 --- assets/css/angelleye-cc-ui.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/assets/css/angelleye-cc-ui.css b/assets/css/angelleye-cc-ui.css index 6859ef9ab..49358157d 100644 --- a/assets/css/angelleye-cc-ui.css +++ b/assets/css/angelleye-cc-ui.css @@ -20,14 +20,11 @@ width: 52%; min-width: 100px; margin-bottom: 10px; - margin-right: 10px; } .woocommerce-page #payment .form-row select.woocommerce-cc-year { width: 43%; min-width: 100px; - - } .woocommerce form .form-row.woocommerce-validated select.woocommerce-cc-month, .woocommerce form .form-row.woocommerce-validated select.woocommerce-cc-year { From c458759dbe6ebb920aab560cd617954954dbc46f Mon Sep 17 00:00:00 2001 From: kcppdevelopers Date: Mon, 27 Jul 2020 18:56:44 +0530 Subject: [PATCH 3/7] update CSS, PFW-661 --- assets/css/angelleye-cc-ui.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/assets/css/angelleye-cc-ui.css b/assets/css/angelleye-cc-ui.css index 49358157d..16efc2faa 100644 --- a/assets/css/angelleye-cc-ui.css +++ b/assets/css/angelleye-cc-ui.css @@ -1,6 +1,3 @@ -.woocommerce-page #payment .form-row select option { - color: black; -} .et_pb_module #wcf-embed-checkout-form .woocommerce #order_review .payment_method_braintree .input-text { font-size: 21px; } @@ -21,10 +18,12 @@ min-width: 100px; margin-bottom: 10px; margin-right: 10px; + color: #43454b; } .woocommerce-page #payment .form-row select.woocommerce-cc-year { width: 43%; min-width: 100px; + color: #43454b; } .woocommerce form .form-row.woocommerce-validated select.woocommerce-cc-month, .woocommerce form .form-row.woocommerce-validated select.woocommerce-cc-year { From 9828cbb692465b2f4ef1668c3ead769ac08089fe Mon Sep 17 00:00:00 2001 From: kcppdevelopers Date: Mon, 27 Jul 2020 19:30:03 +0530 Subject: [PATCH 4/7] update CSS, PFW-661 --- assets/css/angelleye-cc-ui.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/assets/css/angelleye-cc-ui.css b/assets/css/angelleye-cc-ui.css index 16efc2faa..b3760ed58 100644 --- a/assets/css/angelleye-cc-ui.css +++ b/assets/css/angelleye-cc-ui.css @@ -14,16 +14,18 @@ } .woocommerce-page #payment .form-row select.woocommerce-cc-month { - width: 52%; + width: 45%; min-width: 100px; margin-bottom: 10px; margin-right: 10px; color: #43454b; + display: inline; } .woocommerce-page #payment .form-row select.woocommerce-cc-year { - width: 43%; + width: 45%; min-width: 100px; color: #43454b; + display: inline; } .woocommerce form .form-row.woocommerce-validated select.woocommerce-cc-month, .woocommerce form .form-row.woocommerce-validated select.woocommerce-cc-year { From 3442cba9d771787782bbdef3c4deb31a68e5e88f Mon Sep 17 00:00:00 2001 From: kcppdevelopers Date: Tue, 28 Jul 2020 08:50:33 +0530 Subject: [PATCH 5/7] Update CSS, PFW-661 --- assets/css/angelleye-cc-ui.css | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/assets/css/angelleye-cc-ui.css b/assets/css/angelleye-cc-ui.css index b3760ed58..dbf0a8783 100644 --- a/assets/css/angelleye-cc-ui.css +++ b/assets/css/angelleye-cc-ui.css @@ -4,7 +4,6 @@ .theme-Divi p.woocommerce-notice.woocommerce-notice--success.woocommerce-thankyou-order-received { margin-bottom: 1.625em; } - .woocommerce-checkout #payment div.payment_box .wc-credit-card-form-cardholder { font-size: 1.5em; padding: 8px; @@ -12,22 +11,33 @@ background-position: right .618em center; background-size: 32px 20px; } - -.woocommerce-page #payment .form-row select.woocommerce-cc-month { - width: 45%; +.woocommerce-page #payment .form-row select.woocommerce-cc-year { + width: 48%; min-width: 100px; - margin-bottom: 10px; - margin-right: 10px; color: #43454b; - display: inline; + display: inline-block; + margin-bottom: 0px; + vertical-align: baseline; } -.woocommerce-page #payment .form-row select.woocommerce-cc-year { - width: 45%; +.woocommerce-page #payment .form-row select.woocommerce-cc-month { + width: 48%; min-width: 100px; color: #43454b; - display: inline; + display: inline-block; + margin-right: 5px; + margin-bottom: 10px; + vertical-align: baseline; +} +.woocommerce-page #payment .form-row select.woocommerce-cc-month { + } - .woocommerce form .form-row.woocommerce-validated select.woocommerce-cc-month, .woocommerce form .form-row.woocommerce-validated select.woocommerce-cc-year { border: 1px solid #bbb; +} +@media (max-width:572px) { + .payment_method_paypal_pro_payflow .form-row, .payment_method_paypal_pro .form-row { + float: none !important; + width: auto !important; + margin: 0 auto 0 auto; + } } \ No newline at end of file From 1d2510f1e469c54cc93a58ba410e8e5767a3c4b0 Mon Sep 17 00:00:00 2001 From: kcppdevelopers Date: Tue, 28 Jul 2020 09:09:38 +0530 Subject: [PATCH 6/7] Update class name, PFW-661 --- assets/css/angelleye-cc-ui.css | 14 +++++++++++--- classes/wc-gateway-paypal-pro-angelleye.php | 4 ++-- .../wc-gateway-paypal-pro-payflow-angelleye.php | 4 ++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/assets/css/angelleye-cc-ui.css b/assets/css/angelleye-cc-ui.css index dbf0a8783..9c4f9117e 100644 --- a/assets/css/angelleye-cc-ui.css +++ b/assets/css/angelleye-cc-ui.css @@ -12,7 +12,7 @@ background-size: 32px 20px; } .woocommerce-page #payment .form-row select.woocommerce-cc-year { - width: 48%; + width: 48%; min-width: 100px; color: #43454b; display: inline-block; @@ -28,8 +28,16 @@ margin-bottom: 10px; vertical-align: baseline; } -.woocommerce-page #payment .form-row select.woocommerce-cc-month { - +.theme-storefront.woocommerce-page #payment .form-row select.woocommerce-cc-month, .theme-storefront.woocommerce-page #payment .form-row select.woocommerce-cc-year { + font-size: 1.41575em; + padding: 0.6180469716em; + background-color: #f2f2f2; + color: #43454b; + border: 0; + box-sizing: border-box; + font-weight: normal; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.125); + min-width: 135px; } .woocommerce form .form-row.woocommerce-validated select.woocommerce-cc-month, .woocommerce form .form-row.woocommerce-validated select.woocommerce-cc-year { border: 1px solid #bbb; diff --git a/classes/wc-gateway-paypal-pro-angelleye.php b/classes/wc-gateway-paypal-pro-angelleye.php index d13893625..e1ff7c9a1 100644 --- a/classes/wc-gateway-paypal-pro-angelleye.php +++ b/classes/wc-gateway-paypal-pro-angelleye.php @@ -1527,11 +1527,11 @@ public function angelleye_woocommerce_credit_card_form_start($current_id) { if ($this->enable_cardholder_first_last_name && $current_id == $this->id) { $fields['card-cardholder-first'] = '

- field_name('card-cardholder-first') . '/> + field_name('card-cardholder-first') . '/>

'; $fields['card-cardholder-last'] = '

- field_name('card-cardholder-last') . '/> + field_name('card-cardholder-last') . '/>

'; foreach ($fields as $field) { diff --git a/classes/wc-gateway-paypal-pro-payflow-angelleye.php b/classes/wc-gateway-paypal-pro-payflow-angelleye.php index 440db2dff..a6a6be9ce 100644 --- a/classes/wc-gateway-paypal-pro-payflow-angelleye.php +++ b/classes/wc-gateway-paypal-pro-payflow-angelleye.php @@ -1716,11 +1716,11 @@ public function angelleye_woocommerce_credit_card_form_start($current_id) { if ($this->enable_cardholder_first_last_name && $current_id == $this->id) { $fields['card-cardholder-first'] = '

- field_name('card-cardholder-first') . ' /> + field_name('card-cardholder-first') . ' />

'; $fields['card-cardholder-last'] = '

- field_name('card-cardholder-last') . ' /> + field_name('card-cardholder-last') . ' />

'; foreach ($fields as $field) { From c95f4794cc96b13b34428e3b1801d89e0c98cb20 Mon Sep 17 00:00:00 2001 From: kcppdevelopers Date: Tue, 28 Jul 2020 10:17:07 +0530 Subject: [PATCH 7/7] Add CSS, PFW-661 --- assets/css/angelleye-cc-ui.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/assets/css/angelleye-cc-ui.css b/assets/css/angelleye-cc-ui.css index 9c4f9117e..a9b786f47 100644 --- a/assets/css/angelleye-cc-ui.css +++ b/assets/css/angelleye-cc-ui.css @@ -39,6 +39,13 @@ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.125); min-width: 135px; } +.theme-Avada.woocommerce-page #payment .form-row label[for="cc-expire-month"]{ + width: 100%; + display: block; +} + + + .woocommerce form .form-row.woocommerce-validated select.woocommerce-cc-month, .woocommerce form .form-row.woocommerce-validated select.woocommerce-cc-year { border: 1px solid #bbb; }