diff --git a/CHANGELOG.md b/CHANGELOG.md index a3b180cac..2448611f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,7 +41,7 @@ and this project adheres to * [thirdparty] Add parameter condition to display centers or not (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/500) * [phonenumber] Remove placeholder in phonenumber field (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/496) * [contact] add contact button color changed plus the pipe at the side removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/506) - +* [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486) ## Test releases ### test release 2022-02-21 diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss b/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss index a53ea69d9..9f2ef7bbe 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss @@ -1,37 +1,26 @@ .confidential { display: flex; position: relative; -} -.toggle-far-twig { - i { - bottom: 0px; - right: -30px; - } + margin-right: 20px } -.toggle-close-twig { - i { - bottom: 0px; - right: -5px; - } +.toggle-container { + position: absolute; + width: 100%; + top: 0; + left: 0; + cursor: pointer; + z-index: 5; + padding-right: 1rem; } .toggle{ - margin-left: 30px; - margin-top: 5px; - cursor: pointer; position: absolute; - z-index: 5; - right: -30px -} - -.toggle-far { - bottom: 0px; - right: 20px !important; -} - -.toggle-close { - bottom: 125px; - right: 15px !important; + right: 4px; + &-twig { + position: absolute; + right: -25px; + bottom: 20px; + } } .blur { diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/blur/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/blur/index.js index 1d66d25e6..3245512e9 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/module/blur/index.js +++ b/src/Bundle/ChillMainBundle/Resources/public/module/blur/index.js @@ -2,18 +2,19 @@ require('./blur.scss'); document.querySelectorAll('.confidential').forEach(function (el) { let i = document.createElement('i'); - const classes = ['fa', 'fa-eye', 'toggle']; + const classes = ['fa', 'fa-eye-slash', 'toggle-twig']; i.classList.add(...classes); el.appendChild(i); + const toggleBlur = function(e) { for (let child of el.children) { - if (!child.classList.contains('toggle')) { + if (!child.classList.contains('toggle-twig')) { child.classList.toggle('blur'); } } - i.classList.toggle('fa-eye'); i.classList.toggle('fa-eye-slash'); + i.classList.toggle('fa-eye'); } i.addEventListener('click', toggleBlur); toggleBlur(); -}); +}); \ No newline at end of file diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js index 1dbc85dee..b1489bfb6 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js @@ -22,6 +22,7 @@ const fetchCountries = () => { */ const fetchCities = (country) => { //console.log('<<< fetching cities for', country); + // warning: do not use fetchResults (in apiMethods): we need only a **part** of the results in the db const url = `/api/1.0/main/postal-code.json?item_per_page=1000&country=${country.id}`; return fetch(url) .then(response => { diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue index f5a555520..837440524 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue @@ -3,8 +3,8 @@
-
- +
+
@@ -12,28 +12,24 @@ diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig index 54a0b86b7..3dfc27d2f 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig @@ -59,7 +59,7 @@ must be shown in such list #} {%- if render == 'list' -%} -
  • +
  • {% if options['with_picto'] %} {% endif %} @@ -68,7 +68,7 @@ {%- endif -%} {%- if render == 'inline' -%} - + {% if options['with_picto'] %} {% endif %} @@ -77,7 +77,7 @@ {%- endif -%} {%- if render == 'bloc' -%} -
    +
    {% if options['has_no_address'] == true and address.isNoAddress == true %} {% if address.postCode is not empty %}
    diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss index 92542f178..fba0516a7 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss +++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss @@ -33,6 +33,8 @@ div.banner { padding-top: 1em; padding-bottom: 1em; div.contact { + display: flex; + align-content: center; & > * { margin-right: 1em; } diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue index 713693605..7cf0dcecc 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue @@ -9,7 +9,7 @@ {{ $t('requestor.is_anonymous') }} - +