Merge branch 'test' into ana

This commit is contained in:
anamotaadyen
2022-11-02 11:14:03 +00:00
3 changed files with 53 additions and 27 deletions

View File

@@ -393,9 +393,10 @@ a:hover {
margin: 0;
outline: none;
padding: 0 0 0 12px;
position: relative;
position: absolute;
font-size: var(--small-text);
width: 10px;
bottom:0px;
}
@media (min-width: 768px) {
@@ -411,6 +412,7 @@ a:hover {
}
.country-selector__select {
position: relative;
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
@@ -449,8 +451,9 @@ a:hover {
margin: auto 0 auto auto;
outline: none;
padding: 0 0 0 12px;
position: relative;
position: absolute;
width: 100%;
bottom: 0px;
}
@media (min-width: 768px) {
@@ -467,7 +470,7 @@ a:hover {
border: 0;
cursor: pointer;
flex: 1;
position: relative;
height: 100%;
margin: 0 -12px 0 -42px;
outline: none;
@@ -501,8 +504,9 @@ a:hover {
margin: auto 0 auto auto;
outline: none;
padding: 0 0 0 12px;
position: relative;
position: absolute;
width: 100%;
bottom: 0px;
}
/* .left {
@@ -524,6 +528,7 @@ a:hover {
}
.textalign-selector__select {
position: relative;
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;

View File

@@ -16,8 +16,8 @@ const storedCountry = document.getElementById("country-code")
* @param {Array} payMethods - Payment methods included in the array will be "blocked"
* @param {Array} payArray - Payment methods values to include in the blockedPaymentMethods array
* @param {string} countrySettings - Value of the currently selected shopper's country
*
*/
*
*/
let r = document.querySelector(":root")
let openFirst = true
let billAdd = false
@@ -33,8 +33,8 @@ let countrySettings = "NL"
/**
* Hiding toggles of local payment methods not supported for NL (initial page load)
*
*/
*
*/
document.getElementById('trustlyCol').style.display = "none"
document.getElementById('trustlyBox').style.display = "none"
document.getElementById('trustlyToggle').style.display = "none"
@@ -97,7 +97,7 @@ const countryVariables = [
/**
* Country dropdown changes the flag image and reloads the dropin with new country values
* Calls /paymentMethods to retrieve available txvariants for that country
* @param {*} el
* @param {*} el
*/
async function changeSelect(el) {
// let countryPM = getConfiguration();
@@ -933,7 +933,7 @@ function makeBold() {
updateStyleCode()
}
}
//drop down selector for the different font styles
function changeFont() {
r.style.setProperty("--font-options", null)
@@ -966,6 +966,8 @@ function resetDynamicCSS() {
r.style.setProperty("--payments-spacing", null)
r.style.setProperty("--paymentselected-margin", null)
r.style.setProperty("--font-options", null)
r.style.setProperty("--bold-selected", null)
r.style.setProperty("--italic-selected", null)
updateColorPickers()
}

View File

@@ -29,7 +29,7 @@
/>
<style>
@import url("https://fonts.googleapis.com/css2?family=Oleo+Script:wght@700&display=swap");
@import url("https://fonts.googleapis.com/css2?family=Engagement&family=Lato:ital@1&family=Roboto+Condensed:wght@300&display=swap");
@import url('https://fonts.googleapis.com/css2?family=Engagement&family=PT+Sans+Caption&family=Roboto+Condensed:wght@300&display=swap');
</style>
<!-- local CSS -->
@@ -823,10 +823,9 @@
autocomplete="off"
>
<option
value="Segoe UI, sans-serif, Helvetica, Arial"
value="Segoe UI, sans-serif"
style="
font-family: 'Segoe UI', sans-serif, Helvetica,
Arial;
font-family: 'Segoe UI', sans-serif;
"
>
Segoe UI
@@ -841,23 +840,43 @@
</option>
<option
value="Engagement, cursive"
style="font-family: 'Engagement', cursive"
style="font-family: 'Engagement', cursive;"
>
Engagement
</option>
<option
value="Lato, sans-serif"
style="font-family: 'Lato', sans-serif"
value="Verdana, sans-serif"
style="font-family: 'Verdana', sans-serif;"
>
Lato
Verdana
</option>
<option
value="Courier New, monospace"
style="font-family: 'Courier New', monospace;"
>
Courier New
</option>
<option
value="'Trebuchet MS, sans-serif"
style="font-family: 'Trebuchet MS', sans-serif;"
>
Trebuchet MS
</option>
<option
value="Times New Roman, Times, serif"
value="Tahoma, sans-serif"
style="
font-family: 'Times New Roman', Times, serif;
font-family: 'Tahoma', sans-serif;
"
>
Times New Roman
Tahoma
</option>
<option
value="PT Sans Caption, sans-serif"
style="
font-family: 'PT Sans Caption', sans-serif;
"
>
PT Sans Caption
</option>
<option
value="Arial, Helvetica, sans-serif"
@@ -868,10 +887,9 @@
Arial
</option>
<option
value="Lucida Console, 'Courier New', monospace"
value="Lucida Console, monospace"
style="
font-family: 'Lucida Console', 'Courier New',
monospace;
font-family: 'Lucida Console', monospace;
"
>
Lucida
@@ -929,14 +947,15 @@
<option
selected
value="left"
style="text-align: left"
>
Left
</option>
<option value="center" style="text-align: center">
<option value="center"
>
Center
</option>
<option value="right" style="text-align: right">
<option value="right"
>
Right
</option>
</select>