Address Styling Issues on Entry (Edit/New) and Style Pages

css/custom_theme.css.php

@@ -871,8 +871,8 @@
 	border-radius:50%;
 }
 
-.with_frm_style .frm_checkbox input[type=checkbox]{
-	border-radius: calc(var(--border-radius) / 2);
+.with_frm_style .frm_checkbox input[type=checkbox] {
+	border-radius: calc(var(--border-radius) / 2) !important;
 }
 
 .with_frm_style .frm_radio input[type=radio],

css/frm_admin.css

@@ -1410,7 +1410,7 @@ body.frm-hidden-overflow {
 .post-type-frm_display.wp-core-ui .button-primary,
 .frm-button-primary,
 .wp-core-ui .button-primary.frm-button-primary,
-.frm_single_entry_page .button-primary {
+.frm_single_entry_page #frm-publishing .button-primary {
 	background-color: var(--primary-500) !important;
 	color: #fff !important;
 }
@@ -3853,21 +3853,18 @@ input[type="checkbox"] {
 }
 
 .frm-white-body input[type="checkbox"]:checked,
-.frm_wrap input[type="checkbox"]:checked,
-body[class*="frm-admin"] #wpbody-content input[type="checkbox"]:checked {
+.frm_wrap input[type="checkbox"]:checked {
 	background-color: var(--primary-500);
 	border-color: var(--primary-500) !important;
 }
 
 .frm-white-body input[type="checkbox"]:checked:focus,
-.frm_wrap input[type="checkbox"]:checked:focus,
-body[class*="frm-admin"] #wpbody-content input[type="checkbox"]:checked:focus {
+.frm_wrap input[type="checkbox"]:checked:focus {
 	border-color: var(--primary-500);
 }
 
 .frm-white-body input[type="checkbox"]:checked::before,
-.frm_wrap input[type="checkbox"]:checked::before,
-body[class*="frm-admin"] #wpbody-content input[type="checkbox"]:checked::before {
+.frm_wrap input[type="checkbox"]:checked::before {
 	content: '';
 	display: block;
 	width: 100% !important;
@@ -3884,19 +3881,6 @@ body[class*="frm-admin"] #wpbody-content input[type="checkbox"]:checked::before
 	margin-right: 5px;
 }
 
-.frm_single_entry_page .with_frm_style .frm_radio input[type=radio] {
-	margin: 5px 0;
-	width: 18px;
-	position: relative; /* override Bootstrap */
-}
-
-.frm_single_entry_page .with_frm_style .frm_radio input[type=radio]:before {
-	position: relative !important;
-	left: calc(50% - 6px);
-	top: calc(50% - 6px);
-	margin: 0 !important;
-}
-
 .frm_inner_field_container {
 	margin-bottom: 10px;
 }
@@ -4534,7 +4518,7 @@ li.frm_field_box > ul.frm_grid_container {
 
 /* Image options for Radio and Checkbox */
 
-.frm_image_options .frm_image_option_container {
+body:not(.frm-admin-page-styles):not(.frm-admin-page-entries) .frm_image_options .frm_image_option_container {
 	--field-border-width: 1px;
 	--border-color: var(--grey-300);
 	--border-color-active: var(--primary-500);
@@ -8221,9 +8205,9 @@ button.frm_choose_image_box,
 	line-height: var(--leading);
 }
 
-.frm-white-body textarea:focus,
-.frm-white-body input:focus,
-.frm-white-body select:focus,
+.frm-white-body:not(.frm-admin-page-styles):not(.frm-admin-page-entries) textarea:focus,
+.frm-white-body:not(.frm-admin-page-styles):not(.frm-admin-page-entries) input:focus,
+.frm-white-body:not(.frm-admin-page-styles):not(.frm-admin-page-entries) select:focus,
 .frm_wrap input:focus,
 .frm_wrap select:focus,
 .wp-core-ui .frm_wrap select:focus,
@@ -8234,6 +8218,17 @@ button.frm_choose_image_box,
 	box-shadow: none !important;
 }
 
+/*
+Pages like Entries and Styles need the border-color and box-shadow properties without the !important flag.
+To achieve this, we exclude them above and duplicate these rules specifically for those pages without using !important.
+*/
+.wp-admin .frm_fields_container textarea:focus,
+.wp-admin .frm_fields_container input:focus,
+.wp-admin .frm_fields_container select:focus {
+	border-color: var(--primary-500);
+	box-shadow: none;
+}
+
 #postbox-container-2 textarea,
 .frm_wrap textarea,
 .field-group textarea {