From ba6e736a2bbe6ba47ee7d37c15e447327476725f Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Fri, 27 Sep 2024 11:12:13 +0000
Subject: Schmuckbild aus der Sidebar entfernen

Closes #4398

Merge request studip/studip!3214
---
 resources/assets/stylesheets/highcontrast.scss     |  5 ---
 resources/assets/stylesheets/scss/responsive.scss  |  4 ---
 resources/assets/stylesheets/scss/sidebar.scss     | 38 +---------------------
 .../components/responsive/ResponsiveNavigation.vue |  2 +-
 templates/sidebar/sidebar.php                      | 20 ++----------
 5 files changed, 4 insertions(+), 65 deletions(-)

diff --git a/resources/assets/stylesheets/highcontrast.scss b/resources/assets/stylesheets/highcontrast.scss
index 277e383..d081c2c 100644
--- a/resources/assets/stylesheets/highcontrast.scss
+++ b/resources/assets/stylesheets/highcontrast.scss
@@ -202,11 +202,6 @@ button.button[disabled]:hover {
 
 /* SIDEBAR AND WIDGETS */
 
-#sidebar .sidebar-image {
-    background-image: unset;
-    background: $black;
-}
-
 .studip-widget .widget-header,
 .sidebar-widget-header {
     background-color: $black !important;
diff --git a/resources/assets/stylesheets/scss/responsive.scss b/resources/assets/stylesheets/scss/responsive.scss
index e84a8a8..1298dc8 100644
--- a/resources/assets/stylesheets/scss/responsive.scss
+++ b/resources/assets/stylesheets/scss/responsive.scss
@@ -331,10 +331,6 @@ $sidebarOut: -330px;
             visibility: visible;
         }
 
-        .sidebar-image {
-            display: none;
-        }
-
         > .sidebar-widget {
             margin-top: 0;
         }
diff --git a/resources/assets/stylesheets/scss/sidebar.scss b/resources/assets/stylesheets/scss/sidebar.scss
index c161778..9b25dfe 100644
--- a/resources/assets/stylesheets/scss/sidebar.scss
+++ b/resources/assets/stylesheets/scss/sidebar.scss
@@ -4,7 +4,6 @@
     display: inline-block;
     height: max-content;
     margin-bottom: $page-margin + 35px;
-    margin-top: 15px;
     padding: 0 5px 7px 15px;
     position: sticky;
     text-align: left;
@@ -12,23 +11,6 @@
     width: $sidebar-width;
     z-index: 2;
 
-    .sidebar-image {
-        width: calc($sidebar-width - 2px);
-        height: 60px;
-        max-height: 60px;
-
-        background-image: url("#{$image-path}/sidebar/noicon-sidebar.png");
-        background-size: cover;
-
-        position: relative;
-        &-with-context {
-            margin-bottom: 0px;
-        }
-
-        display: flex;
-        align-items: flex-end;
-    }
-
     .sidebar-context {
         flex: 0;
 
@@ -39,25 +21,7 @@
     }
 
     .sidebar-title {
-        flex: 1;
-
-        box-sizing: border-box;
-        max-height: 60px;
-        padding: 12px 15px 0;
-        border-bottom: 12px solid transparent;
-
-        color: var(--white);
-        font-size: 1.2em;
-        overflow: hidden;
-        word-break: break-word;
-        position: relative;
-        line-height: 1.1;
-        text-align: left;
-        text-overflow: ellipsis;
-        /* it may happen that some browser does not support the following, then (...) won't appear */
-        display: -webkit-box;
-        -webkit-line-clamp: 2;
-        -webkit-box-orient: vertical;
+        display: none;
     }
 
     .sidebar-widget.sidebar-widget-has-extra {
diff --git a/resources/vue/components/responsive/ResponsiveNavigation.vue b/resources/vue/components/responsive/ResponsiveNavigation.vue
index d9c391d..e53e19c 100644
--- a/resources/vue/components/responsive/ResponsiveNavigation.vue
+++ b/resources/vue/components/responsive/ResponsiveNavigation.vue
@@ -510,7 +510,7 @@ export default {
             if (this.isResponsive || (this.isFullscreen && !this.isFocusMode)) {
                 this.moveHelpbar();
 
-                this.contentbarTitle = document.querySelector('.sidebar-image .sidebar-title')?.textContent;
+                this.contentbarTitle = document.querySelector('.sidebar-title')?.textContent;
                 const siteTitle = document.getElementById('site-title');
                 if (siteTitle) {
                     siteTitle.dataset.originalTitle = siteTitle.textContent.trim();
diff --git a/templates/sidebar/sidebar.php b/templates/sidebar/sidebar.php
index 9aa72de..6d8ca58 100644
--- a/templates/sidebar/sidebar.php
+++ b/templates/sidebar/sidebar.php
@@ -1,24 +1,8 @@
 <!-- Start sidebar -->
 <aside id="sidebar" aria-label="<?= _('Seitenleiste') ?>">
-    <div class="sidebar-image <? if ($avatar) echo 'sidebar-image-with-context'; ?>">
-    <? if ($avatar) : ?>
-        <div class="sidebar-context">
-        <? if ($avatar->is_customized()) : ?>
-            <a href="<?= htmlReady($avatar->getURL(Avatar::NORMAL)) ?>"
-               data-lightbox="sidebar-avatar"
-               data-title="<?= htmlReady(PageLayout::getTitle()) ?>">
-        <? endif ?>
-                <?= $avatar->getImageTag(Avatar::MEDIUM) ?>
-        <? if ($avatar->is_customized()) : ?>
-            </a>
-        <? endif ?>
-        </div>
-    <? endif ?>
-        <div class="sidebar-title">
-            <?= htmlReady($title) ?>
-        </div>
+    <div class="sidebar-title" style="display:none">
+        <?= htmlReady($title) ?>
     </div>
-
     <? foreach ($widgets as $index => $widget): ?>
         <?= $widget->render(['base_class' => 'sidebar']) ?>
     <? endforeach; ?>
-- 
cgit v1.0