From: vladfo <fvv2011@gmail.com>
Date: Tue, 24 Sep 2024 12:43:33 +0000 (+0300)
Subject: Merge branch 'refs/heads/develop' into feature_fomichev_erp_177_store_cluster_update
X-Git-Tag: 1.5~4^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=61dcba1e87bb8e38532cad2379af3ee3b4717fa8;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'refs/heads/develop' into feature_fomichev_erp_177_store_cluster_update

# Conflicts:
#	erp24/web/css/select2-container-and-other-styles-fix.css
---

61dcba1e87bb8e38532cad2379af3ee3b4717fa8
diff --cc erp24/web/css/select2-container-and-other-styles-fix.css
index ddc1f576,d1797703..75a0945f
--- a/erp24/web/css/select2-container-and-other-styles-fix.css
+++ b/erp24/web/css/select2-container-and-other-styles-fix.css
@@@ -49,21 -49,50 +49,70 @@@
      text-overflow: ellipsis;
  }
  
+ /* Стили для модального окна */
+ .custom-modal {
+     position: fixed;
+     top: 0;
+     left: 0;
+     width: 100%;
+     height: 100%;
+     background-color: rgba(0, 0, 0, 0.5); /* затемненный фон */
+     z-index: 9999; /* всегда поверх */
+ }
+ 
+ .custom-modal-content {
+     position: absolute;
+     top: 10%;
+     left: 10%;
+     width: 80%; /* Ширина 80% */
+     background-color: white;
+     padding: 20px;
+     box-shadow: 0 5px 15px rgba(0, 0, 0, 0.3);
+     border-radius: 5px;
+     overflow-y: auto; /* если контент выходит за пределы */
+     max-height: 80vh; /* максимум высоты окна */
+ }
+ 
+ .close {
+     float: right;
+     font-size: 28px;
+     font-weight: bold;
+     cursor: pointer;
+ }
+ 
+ .close:hover,
+ .close:focus {
+     color: red;
+     text-decoration: none;
+     cursor: pointer;
+ }
+ 
+ /* Отключение скролла страницы */
+ .no-scroll {
+     overflow: hidden;
+ }
+ 
+ .main-chat-list .media.selected_task {
+     background-color: #adaeaf;
+ }
+ 
++
++
 +.cluster-index svg {
 +
 +    display:inline-block;
 +    font-size:inherit;
 +    height:1em;
 +    overflow:visible;
 +    vertical-align:-.125em;
 +    width:1.125em
 +}
 +
 +.cluster-view svg{
 +    display:inline-block;
 +    font-size:inherit;
 +    height:1em;
 +    overflow:visible;
 +    vertical-align:-.125em;
 +    width:.875em
 +}