diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php index 20f95e958..895294402 100644 --- a/admin/survey/classes/class.GDPR.php +++ b/admin/survey/classes/class.GDPR.php @@ -64,7 +64,7 @@ class GDPR{ echo '
'; - echo '
'; + echo '
'; echo '
'; echo ''; @@ -82,7 +82,7 @@ class GDPR{ echo '
'; - echo '
'; + echo '
'; echo '
'; echo ''; @@ -101,7 +101,7 @@ class GDPR{ echo '
'; - echo '
'; + echo '
'; echo '
'; echo ''; diff --git a/admin/survey/script/GDPR_seznam_anket.js b/admin/survey/script/GDPR_seznam_anket.js index 796a73414..2c548b320 100644 --- a/admin/survey/script/GDPR_seznam_anket.js +++ b/admin/survey/script/GDPR_seznam_anket.js @@ -31,8 +31,13 @@ function test_function() { // GDPR ANKETE togle var box1 = document.getElementsByClassName("num_box1")[0]; + var box1_Color = document.getElementById("num_box1"); + + box1_Color.style.backgroundColor="rgba(20, 255, 0, 0.05)"; + if (!inputs.checked){ + box1_Color.style.background="#ffffff"; box1.classList.remove("checked"); @@ -42,6 +47,9 @@ function test_function() { }; } else{ + + box1_Color.style.background="rgba(20, 255, 0, 0.05)"; + // box1.classList.toggle("checked"); box1.classList.add("checked"); @@ -54,9 +62,11 @@ function test_function() { // potencialno GDPR ankete togle var box2 = document.getElementsByClassName("num_box2")[0]; + var box2_Color = document.getElementById("num_box2"); if (!potenc_gdpr.checked){ + box2_Color.style.backgroundColor="#ffffff"; box2.classList.remove("checked"); for(var i=0; i < red_row.length; i++){ @@ -64,6 +74,7 @@ function test_function() { }; } else{ + box2_Color.style.backgroundColor="rgba(20, 255, 0, 0.05)"; box2.classList.add("checked"); for(var i=0; i < red_row.length; i++){ diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 6424e27b3..23c7527b7 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -10048,11 +10048,23 @@ textarea:focus { } .box-container .checked { border: #1E88E5 solid 1px; - background-color: #FFEFEF; } .box-container .num_box2 { margin: 0px 32px; } +.box-container #num_box1 { + background-color: rgba(20, 255, 0, 0.05); +} +.box-container #num_box2 { + background-color: rgba(255, 0, 0, 0.05); +} +table.gdpr_surveys tr.green_row td { + background-color: rgba(20, 255, 0, 0.05) !important; +} + +table.gdpr_surveys tr.red_row td { + background-color: rgba(255, 0, 0, 0.05) !important; +} table { margin: 8px 0; @@ -11119,10 +11131,10 @@ table.gdpr_surveys td { border: 1px solid #E5E5E5; } table.gdpr_surveys tr.red_row td { - background-color: #FFEFEF !important; + background-color: #FFEFEF; } table.gdpr_surveys tr.green_row td { - background-color: #a8eea8 !important; + background-color: #a8eea8; } table.gdpr_surveys.requests td div.gdpr_requests_wrap { max-width: 204px; diff --git a/resources/sass/admin_new/components/form/seznam_anket.scss b/resources/sass/admin_new/components/form/seznam_anket.scss index 06fcbc2f4..efeebd5a9 100644 --- a/resources/sass/admin_new/components/form/seznam_anket.scss +++ b/resources/sass/admin_new/components/form/seznam_anket.scss @@ -63,12 +63,29 @@ .checked { border: #1E88E5 solid 1px; - background-color: #FFEFEF; + } .num_box2{ margin: 0px 32px ; } + #num_box1 { + background-color: rgba(20, 255, 0, 0.05); + } + #num_box2{ + background-color: rgba(255, 0, 0, 0.05); + } + #num_box3{ + // + } +} + +table.gdpr_surveys tr.green_row td { + background-color: rgba(20, 255, 0, 0.05) !important; +} +table.gdpr_surveys tr.red_row td{ + // background-color: #FF0000 !important; + background-color: rgba(255, 0, 0, 0.05) !important; } \ No newline at end of file diff --git a/resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss b/resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss index e94f6cb49..8f9c3c780 100644 --- a/resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss +++ b/resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss @@ -25,12 +25,12 @@ table { tr.red_row { td { - background-color: $light-red !important; + background-color: $light-red ; } } tr.green_row { td { - background-color: $light-green !important; + background-color: $light-green ; } }