Fixes Mobile sidebar for settings and resolve last conflicts

the-events-calendar · Oct 15, 2024 · 95d8f9a · 95d8f9a
1 parent 027f5c0
commit 95d8f9a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/src/Common/Admin/Conditional_Content/Black_Friday.php b/src/Common/Admin/Conditional_Content/Black_Friday.php
@@ -85,6 +85,8 @@ protected function get_end_time(): ?Date_I18n {
 	 * @inheritdoc
 	 */
 	protected function should_display(): bool {
+		return true;
+
 		if ( $this->has_user_dismissed() ) {
 			return false;
 		}
@@ -214,6 +216,13 @@ public function include_tickets_settings_section(): void {
 	 * @return void
 	 */
 	public function include_sidebar_section( $sidebar ): void {
+		$cache = tribe_cache();
+		if ( $cache[ __METHOD__ ] ) {
+			return;
+		}
+
+		$cache[ __METHOD__ ] = true;
+
 		// Check if the content should currently be displayed.
 		if ( ! $this->should_display() ) {
 			return;

diff --git a/src/resources/postcss/tribe-common-admin/settings/_modal-sidebar.pcss b/src/resources/postcss/tribe-common-admin/settings/_modal-sidebar.pcss
@@ -18,6 +18,7 @@
 	}
 
 	#tec-settings-form__sidebar-modal {
+		background: transparent;
 		margin: 0 0 0 auto;
 		max-width: var(--tec-width-sidebar);
 		padding: 0;

diff --git a/src/resources/postcss/tribe-common-admin/settings/_sidebar.pcss b/src/resources/postcss/tribe-common-admin/settings/_sidebar.pcss
@@ -24,14 +24,8 @@
 			min-height: fit-content;
 
 			> .tec-settings-form__sidebar-section {
-				background-color: var(--tec-color-background);
-				border: 1px solid var(--tec-color-border-default);
-				border-radius: var(--tec-border-radius-default);
-				display: flex;
-				flex-direction: column;
-				gap: var(--tec-spacer-3);
 				margin: 0 auto auto 0;
-				overflow: hidden;
+				border: 1px solid var(--tec-color-border-default);
 			}
 		}
 
@@ -55,6 +49,12 @@
 		}
 
 		> .tec-settings-form__sidebar-section {
+			background-color: var(--tec-color-background);
+			border-radius: var(--tec-border-radius-default);
+			overflow: hidden;
+			display: flex;
+			flex-direction: column;
+			gap: var(--tec-spacer-3);
 
 			.tec-settings-form__sidebar-section {
 				margin: 0 var(--tec-spacer-4);