Skip to content

Commit

Permalink
fixing the last few icons
Browse files Browse the repository at this point in the history
  • Loading branch information
Sophia-15 committed Jun 11, 2024
1 parent cf63ed7 commit 6b37cc6
Show file tree
Hide file tree
Showing 16 changed files with 487 additions and 34 deletions.
23 changes: 23 additions & 0 deletions app_client/static/css/app_client/create_order.css
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,29 @@ button {
margin-top: 8px;
}

.order span svg {
width: 32px;
}

.order span svg .cls-1 {
fill: none;
stroke: #fff;
stroke-miterlimit: 10;
stroke-width: 63px;
}

.order span svg .cls-2 {
fill: var(--red-600);
}

.order span svg .cls-2, .cls-3 {
stroke-width: 0px;
}

.order span svg .cls-3 {
fill: #fff;
}

.orderHeader {
display: flex;
align-items: flex-start;
Expand Down
23 changes: 23 additions & 0 deletions app_client/static/css/app_client/rating.css
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,29 @@
margin-top: 16px;
}

.error-message svg {
width: 32px;
}

.error-message .cls-1 {
fill: none;
stroke: #fff;
stroke-miterlimit: 10;
stroke-width: 63px;
}

.error-message .cls-2 {
fill: var(--red-600);
}

.error-message .cls-2, .cls-3 {
stroke-width: 0px;
}

.error-message .cls-3 {
fill: #fff;
}

.ratingContent textarea {
width: 100%;
height: 200px;
Expand Down
53 changes: 53 additions & 0 deletions app_client/static/css/app_client/view_order.css
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,23 @@
color: var(--green-600);
}

.price div svg {
margin-bottom: 3px;
margin-left: -2px;
}

.price div svg .cls-1 {
fill: transparent;
}

.price div svg .cls-1, .price div svg .cls-2 {
stroke-width: 0px;
}

.price div svg .cls-2 {
fill: var(--green-600);
}

.price span {
color: var(--green-900);
font-weight: 600;
Expand Down Expand Up @@ -180,6 +197,18 @@
color: var(--green-600);
}

.waitingForm .yes div svg .cls-1 {
fill: none;
stroke: var(--green-600);
stroke-miterlimit: 10;
stroke-width: 63px;
}

.waitingForm .yes div svg {
margin-top: -4px;
margin-left: -2px;
}

.waitingForm .yes label {
color: var(--green-900);
}
Expand All @@ -189,6 +218,30 @@
color: var(--red-600);
}

.waitingForm .no div svg {
width: 80px;
margin-left: 2px;
}

.waitingForm .no div svg .cls-1 {
fill: #fff;
}

.waitingForm .no div svg .cls-1, .cls-2 {
stroke: var(--red-600);
stroke-miterlimit: 10;
stroke-width: 63px;
}

.waitingForm .no div svg .cls-2 {
fill: var(--red-600);
}

.waitingForm .yes div svg {
margin-top: -4px;
margin-left: -2px;
}

.waitingForm .no label {
color: var(--red-900);
}
Expand Down
40 changes: 35 additions & 5 deletions app_client/templates/RequestOrder/create-OS.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,13 @@
{% for error in errors %}
{% if error.field == 'type'%}
<span>
<i data-lucide="octagon-alert"></i>
<svg id="Camada_1" data-name="Camada 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1080 1080">
<circle class="cls-2" cx="552.05" cy="594.76" r="313.14"/>
<g>
<line class="cls-1" x1="548.89" y1="385.43" x2="550.67" y2="692.99"/>
<ellipse class="cls-3" cx="549.78" cy="768.54" rx="34.67" ry="35.56"/>
</g>
</svg>
{{ error.message }}
</span>
{% endif %}
Expand All @@ -35,7 +41,13 @@
{% for error in errors %}
{% if error.field == 'other'%}
<span>
<i data-lucide="octagon-alert"></i>
<svg id="Camada_1" data-name="Camada 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1080 1080">
<circle class="cls-2" cx="552.05" cy="594.76" r="313.14"/>
<g>
<line class="cls-1" x1="548.89" y1="385.43" x2="550.67" y2="692.99"/>
<ellipse class="cls-3" cx="549.78" cy="768.54" rx="34.67" ry="35.56"/>
</g>
</svg>
{{ error.message }}
</span>
{% endif %}
Expand All @@ -50,7 +62,13 @@
{% for error in errors %}
{% if error.field == 'brand'%}
<span>
<i data-lucide="octagon-alert"></i>
<svg id="Camada_1" data-name="Camada 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1080 1080">
<circle class="cls-2" cx="552.05" cy="594.76" r="313.14"/>
<g>
<line class="cls-1" x1="548.89" y1="385.43" x2="550.67" y2="692.99"/>
<ellipse class="cls-3" cx="549.78" cy="768.54" rx="34.67" ry="35.56"/>
</g>
</svg>
{{ error.message }}
</span>
{% endif %}
Expand All @@ -64,7 +82,13 @@
{% for error in errors %}
{% if error.field == 'model'%}
<span>
<i data-lucide="octagon-alert"></i>
<svg id="Camada_1" data-name="Camada 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1080 1080">
<circle class="cls-2" cx="552.05" cy="594.76" r="313.14"/>
<g>
<line class="cls-1" x1="548.89" y1="385.43" x2="550.67" y2="692.99"/>
<ellipse class="cls-3" cx="549.78" cy="768.54" rx="34.67" ry="35.56"/>
</g>
</svg>
{{ error.message }}
</span>
{% endif %}
Expand All @@ -80,7 +104,13 @@
{% for error in errors %}
{% if error.field == 'description'%}
<span>
<i data-lucide="octagon-alert"></i>
<svg id="Camada_1" data-name="Camada 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1080 1080">
<circle class="cls-2" cx="552.05" cy="594.76" r="313.14"/>
<g>
<line class="cls-1" x1="548.89" y1="385.43" x2="550.67" y2="692.99"/>
<ellipse class="cls-3" cx="549.78" cy="768.54" rx="34.67" ry="35.56"/>
</g>
</svg>
{{ error.message }}
</span>
{% endif %}
Expand Down
34 changes: 30 additions & 4 deletions app_client/templates/RequestOrder/rateservice.html
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,13 @@ <h1>Avaliação de serviço</h1>
{% for error in errors %}
{% if error.field == 'attendance' %}
<span class="error-message">
<i data-lucide="octagon-alert"></i>
<svg id="Camada_1" data-name="Camada 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1080 1080">
<circle class="cls-2" cx="552.05" cy="594.76" r="313.14"/>
<g>
<line class="cls-1" x1="548.89" y1="385.43" x2="550.67" y2="692.99"/>
<ellipse class="cls-3" cx="549.78" cy="768.54" rx="34.67" ry="35.56"/>
</g>
</svg>
{{ error.message }}
</span>
{% endif %}
Expand Down Expand Up @@ -164,7 +170,14 @@ <h1>Avaliação de serviço</h1>
{% for error in errors %}
{% if error.field == 'service' %}
<span class="error-message">
<i data-lucide="octagon-alert"></i>

<svg id="Camada_1" data-name="Camada 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1080 1080">
<circle class="cls-2" cx="552.05" cy="594.76" r="313.14"/>
<g>
<line class="cls-1" x1="548.89" y1="385.43" x2="550.67" y2="692.99"/>
<ellipse class="cls-3" cx="549.78" cy="768.54" rx="34.67" ry="35.56"/>
</g>
</svg>
{{ error.message }}
</span>
{% endif %}
Expand Down Expand Up @@ -227,7 +240,14 @@ <h1>Avaliação de serviço</h1>
{% for error in errors %}
{% if error.field == 'time' %}
<span class="error-message">
<i data-lucide="octagon-alert"></i>

<svg id="Camada_1" data-name="Camada 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1080 1080">
<circle class="cls-2" cx="552.05" cy="594.76" r="313.14"/>
<g>
<line class="cls-1" x1="548.89" y1="385.43" x2="550.67" y2="692.99"/>
<ellipse class="cls-3" cx="549.78" cy="768.54" rx="34.67" ry="35.56"/>
</g>
</svg>
{{ error.message }}
</span>
{% endif %}
Expand All @@ -248,7 +268,13 @@ <h1>Avaliação de serviço</h1>
{% for error in errors %}
{% if error.field == 'review_notes' %}
<span class="error-message">
<i data-lucide="octagon-alert"></i>
<svg id="Camada_1" data-name="Camada 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1080 1080">
<circle class="cls-2" cx="552.05" cy="594.76" r="313.14"/>
<g>
<line class="cls-1" x1="548.89" y1="385.43" x2="550.67" y2="692.99"/>
<ellipse class="cls-3" cx="549.78" cy="768.54" rx="34.67" ry="35.56"/>
</g>
</svg>
{{ error.message }}
</span>
{% endif %}
Expand Down
14 changes: 11 additions & 3 deletions app_client/templates/RequestOrder/vieworder.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@
{% if order.status == "AGUARDANDO_CONFIRMACAO" %}
<div class="price">
<div>
<i data-lucide="dollar-sign"></i>
<svg id="Camada_1" data-name="Camada 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1080 1080">
<circle class="cls-1" cx="552.05" cy="594.76" r="313.14"/>
<path class="cls-2" d="M665.82,588.09c-10.55-14.45-26.04-35.63-59.79-51.98-10.37-5.06-20.52-10.54-30.82-15.71s-19.79-12.17-30.1-17.1c-2.22-1.06-3.95-2.21-6.13-3.35-4.88-2.55-5.33-6.57-5.99-11.55-.79-5.99-.95-12.06-.95-18.09,0-8.56,1.63-14.97,4.89-19.25,3.26-4.28,8.15-6.42,14.67-6.42,8.05,0,13.09,2.33,15.1,6.99,2.01,4.66,3.02,15.73,3.02,33.23v20.53h102.99v-21.96c0-19.01-1.01-32.99-3.02-41.92-2.01-8.93-7.77-18.63-17.26-29.09-9.49-10.45-23.12-18.87-40.85-25.24-10.9-3.91-23.22-6.62-36.97-8.13l-.39-31.48-44.67-.22.59,30.89c-18.64,1.37-35.41,5.05-50.32,11.08-19.28,7.8-32.94,18.87-41,33.23-8.06,14.36-12.08,36.65-12.08,66.88,0,21.3,3.74,39.69,11.22,55.19,7.48,15.5,28.29,32.75,62.43,51.76,40.66,22.44,59.19,37.67,62.56,43.05,3.26,5.19,4.15,14.68,4.15,32.74,0,13.12.59,20.44-1.78,24.89-2.46,4.62-4.91,5.7-13.15,5.7-7.67,0-12.8-3.04-15.39-9.13-2.59-6.08-3.88-19.3-3.88-39.64v-23.96h-102.99v18.25c0,31.56,3.93,55.14,11.8,70.73,7.86,15.59,22.3,27.95,43.3,37.08,13.04,5.66,27.72,9.57,44.04,11.72l.14,41.25h44.74l-.13-39.64c21.14-1.17,39.6-5.28,55.35-12.33,18.89-8.46,32.37-20.53,40.42-36.22,8.05-15.69,12.08-38.93,12.08-69.73,0-27.57-5.28-48.58-15.82-63.03Z"/>
</svg>
</div>

{% if comma %}
Expand Down Expand Up @@ -95,14 +98,19 @@
<div class="options">
<div class="radioOption yes">
<div>
<i data-lucide="check" stroke-width="3"></i>
<svg id="Camada_1" data-name="Camada 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1080 1080">
<polyline class="cls-1" points="355.11 621.78 486.67 746.22 746.22 483.11"/>
</svg>
</div>
<label for="yes">Sim, prosseguir</label><br>
<input type="radio" id="yes" name="choise" value="yes" checked>
</div>
<div class="radioOption no">
<div>
<i data-lucide="x" stroke-width="3"></i>
<svg id="Camada_1" data-name="Camada 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1080 1080">
<line class="cls-2" x1="373" y1="441.44" x2="625.44" y2="691.22"/>
<line class="cls-1" x1="369.61" y1="693.17" x2="621.72" y2="443.05"/>
</svg>
</div>
<label for="no" id="labelNo">Não, cancelar</label><br>
<input type="radio" id="no" name="choise" value="no">
Expand Down
23 changes: 23 additions & 0 deletions app_company/static/app_company/css/order-request-detail.css
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,29 @@ span {
margin-top: 8px;
}

span svg {
width: 32px;
}

span svg .cls-1 {
fill: none;
stroke: #fff;
stroke-miterlimit: 10;
stroke-width: 63px;
}

span svg .cls-2 {
fill: var(--red-600);
}

span svg .cls-2, .cls-3 {
stroke-width: 0px;
}

span svg .cls-3 {
fill: #fff;
}

input::-webkit-outer-spin-button,
input::-webkit-inner-spin-button {
-webkit-appearance: none;
Expand Down
23 changes: 23 additions & 0 deletions app_company/static/app_company/css/register-employee.css
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,29 @@ form .actions {
margin-top: 8px;
}

.info-container span svg {
width: 32px;
}

.info-container span svg .cls-1 {
fill: none;
stroke: #fff;
stroke-miterlimit: 10;
stroke-width: 63px;
}

.info-container span svg .cls-2 {
fill: var(--red-600);
}

.info-container span svg .cls-2, .cls-3 {
stroke-width: 0px;
}

.info-container span svg .cls-3 {
fill: #fff;
}

label {
text-align: left;
margin-bottom: 8px;
Expand Down
Loading

0 comments on commit 6b37cc6

Please sign in to comment.