From b3583f41dc5925c030b8624caec21a335be47f02 Mon Sep 17 00:00:00 2001
From: Lieu Le <lieult84@gmail.com>
Date: Fri, 13 Sep 2019 13:35:47 +0700
Subject: [PATCH] update

---
 assets/opalestate.css             | 13 ++++++++-----
 assets/scss/opalestate/_form.scss | 10 ++++++++--
 assets/scss/submission.scss       |  3 ++-
 assets/submission.css             |  5 ++---
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/assets/opalestate.css b/assets/opalestate.css
index c7432ca3..40b3c154 100755
--- a/assets/opalestate.css
+++ b/assets/opalestate.css
@@ -1911,12 +1911,11 @@ button.opal-collapse-button {
   -ms-user-select: none;
   user-select: none;
   line-height: 1; }
-  .form-item--types .group-item .custom-checkbox-label {
-    z-index: -1; }
   .form-item--types .group-item input[type="checkbox"] {
     position: absolute;
     opacity: 0;
-    cursor: pointer; }
+    cursor: pointer;
+    z-index: 2; }
     .form-item--types .group-item input[type="checkbox"]:checked ~ .custom-checkbox-label {
       background-color: #2f73e9; }
       .form-item--types .group-item input[type="checkbox"]:checked ~ .custom-checkbox-label::after {
@@ -1928,6 +1927,9 @@ button.opal-collapse-button {
   float: none;
   width: 100%; }
 
+.select2-container--default .select2-results__option--highlighted[aria-selected] {
+  background-color: #2f73e9 !important; }
+
 .more-options-label {
   display: inline-block;
   position: relative;
@@ -1941,9 +1943,10 @@ button.opal-collapse-button {
   .more-options-label input[type="checkbox"] {
     position: absolute;
     opacity: 0;
-    cursor: pointer; }
+    cursor: pointer;
+    z-index: 2; }
     .more-options-label input[type="checkbox"]:checked ~ .custom-checkbox-label {
-      background-color: #02ce76; }
+      background-color: #2f73e9; }
       .more-options-label input[type="checkbox"]:checked ~ .custom-checkbox-label::after {
         display: block; }
   .more-options-label:hover input ~ .custom-checkbox-label {
diff --git a/assets/scss/opalestate/_form.scss b/assets/scss/opalestate/_form.scss
index 579b5e99..df854701 100755
--- a/assets/scss/opalestate/_form.scss
+++ b/assets/scss/opalestate/_form.scss
@@ -218,12 +218,13 @@ button.opal-collapse-button{
 		user-select: none;
 		line-height: 1;
 		.custom-checkbox-label{
-			z-index: -1;
+			//z-index: -1;
 		}
 		input[type="checkbox"]{
 			position: absolute;
 			opacity: 0;
 			cursor: pointer;
+			z-index: 2;
 			&:checked ~ .custom-checkbox-label{
 				background-color: $primary;
 				&::after{
@@ -248,6 +249,10 @@ button.opal-collapse-button{
 	}
 }
 
+.select2-container--default .select2-results__option--highlighted[aria-selected] {
+	background-color: $primary !important;
+}
+
 .more-options-label{
 	display: inline-block;
     position: relative;
@@ -262,8 +267,9 @@ button.opal-collapse-button{
 		position: absolute;
 		opacity: 0;
 		cursor: pointer;
+		z-index: 2;
 		&:checked ~ .custom-checkbox-label{
-			background-color: $secondary;
+			background-color: $primary;
 			&::after{
 				display: block;
 			}
diff --git a/assets/scss/submission.scss b/assets/scss/submission.scss
index f5fd233d..10e307ab 100755
--- a/assets/scss/submission.scss
+++ b/assets/scss/submission.scss
@@ -245,6 +245,7 @@
 				position: absolute;
 				opacity: 0;
 				cursor: pointer;
+				z-index: 2;
 				&:checked ~ span.custom-checkbox-label{
 					background-color: $primary;
 					&::after{
@@ -253,7 +254,7 @@
 				}
 			}
 			.custom-checkbox-label{
-				z-index: -1;
+				//z-index: -1;
 			}
 		}
 	}
diff --git a/assets/submission.css b/assets/submission.css
index bd2e7bc0..1490ed8a 100755
--- a/assets/submission.css
+++ b/assets/submission.css
@@ -287,13 +287,12 @@
   .opalestate-submission-tab .cmb2-checkbox-list li input[type="checkbox"] {
     position: absolute;
     opacity: 0;
-    cursor: pointer; }
+    cursor: pointer;
+    z-index: 2; }
     .opalestate-submission-tab .cmb2-checkbox-list li input[type="checkbox"]:checked ~ span.custom-checkbox-label {
       background-color: #2f73e9; }
       .opalestate-submission-tab .cmb2-checkbox-list li input[type="checkbox"]:checked ~ span.custom-checkbox-label::after {
         display: block; }
-  .opalestate-submission-tab .cmb2-checkbox-list li .custom-checkbox-label {
-    z-index: -1; }
 
 .opalestate-submission-tab button.btn.submission-next-btn {
   position: relative;