s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-12-25 06:00:28 +01:00
Code Issues Projects Releases Wiki Activity

Fix merge error

Browse Source
This commit is contained in:
Andreas Palm 2024-09-25 12:18:59 +02:00
parent 2baab98261
commit 4c5041b949
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
www/themes/new/css/styles.css
View File

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