From 4c5041b949bf4fa89ff5e7c91836b50aab394974 Mon Sep 17 00:00:00 2001
From: Andreas Palm <ap@ewsp.de>
Date: Wed, 25 Sep 2024 12:18:59 +0200
Subject: [PATCH] Fix merge error

---
 www/themes/new/css/styles.css | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/www/themes/new/css/styles.css b/www/themes/new/css/styles.css
index e6d81a10..af00c95a 100644
--- a/www/themes/new/css/styles.css
+++ b/www/themes/new/css/styles.css
@@ -880,12 +880,15 @@ ul.menu > li > a {
 }
 
 #main.fixed .menu-wrapper {
-    width: calc(100% - 72px);
+    width: calc(100% - var(--sidebar-not-collapsed-width));
     z-index: 950;
     position: fixed;
     top: 0;
     border-bottom: 3px solid #2DCA73;
 }
+#sidebar.collapsed + #main.fixed .menu-wrapper {
+    width: calc(100% - var(--sidebar-collapsed-width));
+}
 
 #main.fixed .menu-wrapper #current{
     padding-top: 10px;
@@ -1808,10 +1811,11 @@ a.startpage {
 ::-ms-input-placeholder { /* Microsoft Edge */
     color: #BBB;
 }
-::placeholder { /* Modern Browser */
-    color: #BBB;
+:placeholder { /* Modern Browser */
+    color: #F00;
     opacity: 1; /* Firefox */
 }
+
 input.ui-autocomplete-input::-webkit-input-placeholder {
     color: #999;
     opacity: 1;
@@ -2406,6 +2410,10 @@ ul.tag-editor {
     border-color: var(--textfield-border);
     border-radius: 7px;
     padding: 0px !important;
+    min-height: 300px;
+    height: 300px;
+    resize: vertical;
+    overflow: hidden;
 }
 
 .ticket_nachricht_box fieldset {
@@ -2414,8 +2422,8 @@ ul.tag-editor {
 
 .ticket_text {
     width: 100%;
+    height: 100%;
     border: none;
-    height: 300px;
 }
 
 .ui-button-icon,
@@ -4870,3 +4878,8 @@ tilegrid
     padding: 0;
     margin: 0;
 }
+
+input:placeholder-shown.placeholder_warning {
+  background-color: var(--warning);
+}
+