fix: cleanup styles

- remove publicshare.css as redundant - keep footer in place, adjust width if talk sidebar is open Signed-off-by: Maksim Sukharev <[email protected]>
nextcloud · Oct 24, 2024 · 2e58fa4 · 2e58fa4
1 parent d36b4dc
commit 2e58fa4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 89 deletions.
diff --git a/css/publicshare.css b/css/publicshare.css
diff --git a/lib/PublicShare/TemplateLoader.php b/lib/PublicShare/TemplateLoader.php
@@ -74,7 +74,6 @@ public function handle(Event $event): void {
 		}
 
 		Util::addStyle(Application::APP_ID, 'icons');
-		Util::addStyle(Application::APP_ID, 'publicshare');
 		Util::addScript(Application::APP_ID, 'talk-public-share-sidebar');
 
 		$this->publishInitialStateForGuest();

diff --git a/src/PublicShareSidebar.vue b/src/PublicShareSidebar.vue
@@ -256,16 +256,18 @@ export default {
 body .modal-wrapper * {
 	box-sizing: border-box;
 }
+
+#content-vue:has(#talk-sidebar) ~ footer {
+	width: calc(100% - 2 * var(--body-container-margin) - clamp(300px, 27vw, 500px));
+}
 </style>
 
 <style lang="scss" scoped>
 /* Properties based on the app-sidebar */
 #talk-sidebar {
 	position: relative;
 	flex-shrink: 0;
-	width: 27vw;
-	min-width: 300px;
-	max-width: 500px;
+	width: clamp(300px, 27vw, 500px);
 
 	background: var(--color-main-background);
 	border-left: 1px solid var(--color-border);

diff --git a/src/mainPublicShareSidebar.js b/src/mainPublicShareSidebar.js
@@ -42,18 +42,8 @@ Vue.use(Vuex)
 
 const pinia = createPinia()
 
-/**
- *
- */
-function adjustLayout() {
-	document.querySelector('#app-content').appendChild(document.querySelector('footer'))
-}
-
-adjustLayout()
-
 // An "isOpen" boolean should be passed to the component, but as it is a
 // primitive it would not be reactive; it needs to be wrapped in an object and
-
 // that object passed to the component to get reactivity.
 const sidebarState = reactive({
 	isOpen: false,