Merge remote-tracking branch 'origin/main'

This commit is contained in:
SDE
2023-08-31 12:28:38 +03:00
2 changed files with 31 additions and 12 deletions

View File

@@ -1216,6 +1216,7 @@
margin-left: 2%; margin-left: 2%;
margin-bottom: 5%; margin-bottom: 5%;
height: 100%; height: 100%;
overflow-wrap: break-word;
} }
.container_subscribe.light{ .container_subscribe.light{
@@ -1228,6 +1229,7 @@
.container_subscribe.light .first-decr-subscribe{ .container_subscribe.light .first-decr-subscribe{
color: #000000; color: #000000;
} }
.first-decr-subscribe{ .first-decr-subscribe{
@@ -1330,13 +1332,26 @@
vertical-align: top; vertical-align: top;
} }
.container_subscribe.light .items_subscribe.unselected:before{ /*.container_subscribe.light .items_subscribe.unselected:before{*/
/* content: url(/static/img/svg/cross.svg);*/
/*}*/
/*.container_subscribe.dark .items_subscribe.unselected::before{*/
/* content: url(/static/img/svg/cross.svg);*/
/* filter: brightness(0) saturate(100%) invert(29%) sepia(0%) saturate(6232%) hue-rotate(340deg) brightness(110%) contrast(60%);*/
/*}*/
.items_subscribe.unselect:before{
content: url(/static/img/svg/cross.svg); content: url(/static/img/svg/cross.svg);
/*filter: brightness(0) saturate(100%) invert(89%) sepia(0%) saturate(0%) hue-rotate(273deg) brightness(95%) contrast(92%);*/
/*filter: brightness(0) saturate(100%) invert(40%) sepia(12%) saturate(3%) hue-rotate(35deg) brightness(91%) contrast(91%);*/
filter: brightness(0) saturate(100%) invert(81%) sepia(1%) saturate(460%) hue-rotate(31deg) brightness(84%) contrast(81%);
} }
.container_subscribe.dark .items_subscribe.unselected:before{ .items_subscribe.unselect{
content: url(/static/img/svg/cross.svg); /*color: #d1d1d1;*/
filter: brightness(0) saturate(100%) invert(29%) sepia(0%) saturate(6232%) hue-rotate(340deg) brightness(110%) contrast(60%); /*color: #626262;*/
color: #a5a5a5;
} }
.items_subscribe > text{ .items_subscribe > text{

View File

@@ -18,29 +18,33 @@
</div> </div>
<div class="type_of_subscribes"> <div class="type_of_subscribes">
{% for subscribe in subscribes %} {% for subscribe in subscribes %}
<div class="container_subscribe light"> <div class="container_subscribe light" style="background: {{ subscribe.bg_color }}">
<div class="first-decr-subscribe"> <div class="first-decr-subscribe">
<div> <div style="color: {{ subscribe.text_color }}">
{{ subscribe.name }} {{ subscribe.name }}
</div> </div>
<div class="price_subscribe"> <div class="price_subscribe">
{{ subscribe.price }} {% if subscribe.price %}
{{ subscribe.price|floatformat }}$
{% else %}
Бесплатно
{% endif %}
</div> </div>
<div class="periud_subscribe"> <div class="periud_subscribe" style="color: {{ subscribe.text_color }}">
Период: {{ subscribe.period_name }} Период: {{ subscribe.period_name }}
</div> </div>
</div> </div>
<div class="options_subscribe"> <div class="options_subscribe">
<div class="options_subscribe_title light"> <div class="options_subscribe_title light" style="color: {{ subscribe.text_color }}">
Опции: Опции:
</div> </div>
<div class="list_options_subscribe"> <div class="list_options_subscribe">
<ul class="option_list"> <ul class="option_list">
{% for opt in subscribe.options.all %} {% for opt in subscribe.options.all %}
<li class="items_subscribe select"><text>{{ opt.name }}</text></li> <li class="items_subscribe select" style="color: {{ subscribe.text_color }}"><text>{{ opt.name }}</text></li>
{% endfor %} {% endfor %}
{% for opt_dis in subscribe.options.disabled_options %} {% for opt_dis in subscribe.disabled_options %}
<li class="items_subscribe unselect"><text>{{ opt.name }}</text></li> <li class="items_subscribe unselect"><text>{{ opt_dis.name }}</text></li>
{% endfor %} {% endfor %}
</ul> </ul>