From bf71c0c01fe000e3eea8957fd6b4d16e32ecacb5 Mon Sep 17 00:00:00 2001 From: gabemart Date: Sun, 8 Nov 2015 15:39:31 +0000 Subject: [PATCH] [#1879] Adjust spacing for delete confirm dialog --- akvo/rsr/static/scripts-src/project-main.js | 31 ++++++++++---------- akvo/rsr/static/scripts-src/project-main.jsx | 31 ++++++++++---------- akvo/rsr/static/styles-src/main.css | 6 ++-- akvo/rsr/static/styles-src/main.scss | 6 ++-- 4 files changed, 36 insertions(+), 38 deletions(-) diff --git a/akvo/rsr/static/scripts-src/project-main.js b/akvo/rsr/static/scripts-src/project-main.js index 83287e7e86..dbc05dd9be 100755 --- a/akvo/rsr/static/scripts-src/project-main.js +++ b/akvo/rsr/static/scripts-src/project-main.js @@ -1581,27 +1581,26 @@ if (firstAccordionChild !== null) { exceedTargetCheckbox.checked = true; } + descriptionEl = document.createElement('div'); + descriptionEl.classList.add('update-description'); + descriptionEl.innerHTML = update.text.replace(/\n/g,"
"); - descriptionEl = document.createElement('div'); - descriptionEl.classList.add('update-description'); - descriptionEl.innerHTML = update.text.replace(/\n/g,"
"); + updateContainer.appendChild(descriptionEl); - updateContainer.appendChild(descriptionEl); + displayPhoto(update, updateContainer); - displayPhoto(update, updateContainer); + var saveEl = document.createElement('div'); + saveEl.classList.add('save-button'); + saveEl.classList.add('clickable'); + saveEl.textContent = 'Save'; - var saveEl = document.createElement('div'); - saveEl.classList.add('save-button'); - saveEl.classList.add('clickable'); - saveEl.textContent = 'Save'; + updateContainer.appendChild(saveEl); - updateContainer.appendChild(saveEl); - - var cancelEl = document.createElement('div'); - cancelEl.classList.add('cancel-button'); - cancelEl.classList.add('clickable'); - cancelEl.textContent = 'Cancel'; - updateContainer.appendChild(cancelEl); + var cancelEl = document.createElement('div'); + cancelEl.classList.add('cancel-button'); + cancelEl.classList.add('clickable'); + cancelEl.textContent = 'Cancel'; + updateContainer.appendChild(cancelEl); return updateContainer; } diff --git a/akvo/rsr/static/scripts-src/project-main.jsx b/akvo/rsr/static/scripts-src/project-main.jsx index aacbfe585d..e8e86dda1e 100755 --- a/akvo/rsr/static/scripts-src/project-main.jsx +++ b/akvo/rsr/static/scripts-src/project-main.jsx @@ -1581,27 +1581,26 @@ if (firstAccordionChild !== null) { exceedTargetCheckbox.checked = true; } + descriptionEl = document.createElement('div'); + descriptionEl.classList.add('update-description'); + descriptionEl.innerHTML = update.text.replace(/\n/g,"
"); - descriptionEl = document.createElement('div'); - descriptionEl.classList.add('update-description'); - descriptionEl.innerHTML = update.text.replace(/\n/g,"
"); + updateContainer.appendChild(descriptionEl); - updateContainer.appendChild(descriptionEl); + displayPhoto(update, updateContainer); - displayPhoto(update, updateContainer); + var saveEl = document.createElement('div'); + saveEl.classList.add('save-button'); + saveEl.classList.add('clickable'); + saveEl.textContent = 'Save'; - var saveEl = document.createElement('div'); - saveEl.classList.add('save-button'); - saveEl.classList.add('clickable'); - saveEl.textContent = 'Save'; + updateContainer.appendChild(saveEl); - updateContainer.appendChild(saveEl); - - var cancelEl = document.createElement('div'); - cancelEl.classList.add('cancel-button'); - cancelEl.classList.add('clickable'); - cancelEl.textContent = 'Cancel'; - updateContainer.appendChild(cancelEl); + var cancelEl = document.createElement('div'); + cancelEl.classList.add('cancel-button'); + cancelEl.classList.add('clickable'); + cancelEl.textContent = 'Cancel'; + updateContainer.appendChild(cancelEl); return updateContainer; } diff --git a/akvo/rsr/static/styles-src/main.css b/akvo/rsr/static/styles-src/main.css index baa622860f..782f0ef78f 100755 --- a/akvo/rsr/static/styles-src/main.css +++ b/akvo/rsr/static/styles-src/main.css @@ -2331,8 +2331,8 @@ body.translationBarActive div.skiptranslate ~ article, body.translationBarActive .results .indicator-container .indicator-group .table tbody .delete-confirm { display: none; position: absolute; - right: 0px; - top: 40px; + right: 10px; + top: 55px; height: 90px; background-color: white; color: #202024; @@ -2449,7 +2449,7 @@ body.translationBarActive div.skiptranslate ~ article, body.translationBarActive background-color: #D1E6D1; border-left: none; } .results .update-dialog-container td .update-entry-container .update-exceed-target { - margin: 2em 0 0 0; + margin: 3em 0 1em 0; text-align: right; } .results .update-dialog-container td .update-entry-container .update-exceed-target input.exceed-value { opacity: 0; } diff --git a/akvo/rsr/static/styles-src/main.scss b/akvo/rsr/static/styles-src/main.scss index 3e18554906..73aeeb352d 100755 --- a/akvo/rsr/static/styles-src/main.scss +++ b/akvo/rsr/static/styles-src/main.scss @@ -2993,8 +2993,8 @@ body { .delete-confirm { display: none; position: absolute; - right: 0px; - top: 40px; + right: 10px; + top: 55px; height: 90px; background-color: white; color: $akvoBlack; @@ -3138,7 +3138,7 @@ body { border-left: none; } .update-exceed-target { - margin: 2em 0 0 0; + margin: 3em 0 1em 0; text-align: right; input.exceed-value { opacity: 0;