Merge branch 'main' of https://github.com/Voltz-Corp/Eceeltec-G4

Voltz-Corp · Jun 11, 2024 · f2db648 · f2db648
2 parents 3804a89 + 53e0997
commit f2db648
Show file tree

Hide file tree

Showing 34 changed files with 445 additions and 87 deletions.
diff --git a/README.md b/README.md
@@ -200,7 +200,7 @@
 
 - <strong>H10 - Reabertura do Serviço</strong>
 
-<img width="3540" alt="h10" src="https://github.com/Voltz-Corp/Eceeltec-G4/assets/117609505/58281eed-fc22-4528-b295-924a2f7519e9">
+<img width="3540" alt="h10" src="https://github.com/Voltz-Corp/Eceeltec-G4/assets/117609505/fad484c1-112f-4351-bb25-7259e0d25b46">
 
 <br>
 

diff --git a/app_client/static/css/app_client/view_order.css b/app_client/static/css/app_client/view_order.css
@@ -53,8 +53,8 @@
 .close {
   color: var(--gray-500);
   position: absolute;
-  top: 8px;
-  right: 8px;
+  top: -2px;
+  right: -2px;
 }
 
 .close:hover,

diff --git a/app_client/static/css/base_client.css b/app_client/static/css/base_client.css
@@ -49,6 +49,10 @@ nav {
   position: relative;
 }
 
+.configs{
+  margin-left: -5px;
+}
+
 nav img {
   width: 70%;
   align-self: center;

diff --git a/app_client/static/svgs/icons-config.svg b/app_client/static/svgs/icons-config.svg
diff --git a/app_client/static/svgs/icons-edit.svg b/app_client/static/svgs/icons-edit.svg
diff --git a/app_client/static/svgs/icons-filter.svg b/app_client/static/svgs/icons-filter.svg
diff --git a/app_client/static/svgs/icons-logout.svg b/app_client/static/svgs/icons-logout.svg
diff --git a/app_client/static/svgs/icons-services.svg b/app_client/static/svgs/icons-services.svg
diff --git a/app_client/static/svgs/icons-starfull.svg b/app_client/static/svgs/icons-starfull.svg
diff --git a/app_client/static/svgs/icons-x.svg b/app_client/static/svgs/icons-x.svg
diff --git a/app_client/templates/RequestOrder/orders.html b/app_client/templates/RequestOrder/orders.html
@@ -63,7 +63,8 @@ <h1 class="title">Seus serviços</h1>
             <h3>Suas solicitações</h3>
 
             <button class="openFilterModalBtn">
-                <i data-lucide="list-filter" width="20" height="20"></i>
+                <img src="{% static 'app_company/svgs/icons-filter.svg' %}" width="auto" height="24" alt="">
+                {% comment %} <i data-lucide="list-filter" width="20" height="20"></i> {% endcomment %}
                 Filtrar
             </button>
 
@@ -74,7 +75,8 @@ <h3>Suas solicitações</h3>
                     </p>
 
                     <button type="button" class="closeFilterModalBtn">
-                        <i data-lucide="x" width="20" height="20"></i>
+                        <img src="{% static 'app_company/svgs/icons-x.svg' %}" width="auto" height="48" alt="">
+                        {% comment %} <i data-lucide="x" width="20" height="20"></i> {% endcomment %}
                     </button>
                 </header>
-Original file line number
+Diff line change
@@ Expand Up / @@ -200,7 +200,7 @@ @@
     - <strong>H10 - Reabertura do Serviço</strong>
-    <img width="3540" alt="h10" src="https://github.com/Voltz-Corp/Eceeltec-G4/assets/117609505/58281eed-fc22-4528-b295-924a2f7519e9">
+    <img width="3540" alt="h10" src="https://github.com/Voltz-Corp/Eceeltec-G4/assets/117609505/fad484c1-112f-4351-bb25-7259e0d25b46">
     <br>
@@ Expand Down @@