add products

main/templates/main/index.html

@@ -81,7 +81,7 @@
                     <a href="{{ product.get_absolute_url }}">
                         <p class="card-title">{{ product.name }}</p>
                     </a>
-                    <p class="card-text text-truncate">{{ product.description }}</p>
+                    <p class="card-text text-truncate" style="color:wheat">{{ product.description }}</p>
                     <div class="d-flex justify-content-between">
                         <p><strong>{{ product.price }}₸</strong></p>
                     </div>

main/templates/main/product/detail.html

@@ -94,12 +94,9 @@
                 <div class="col-md-6">
                     <div class="product-details">
                         <h1 class="product-name" style="color: #ffffff;">{{ product.name }}</h1>
-<<<<<<< HEAD
+
-                        <p class="price" style="font-size: 35px; font-weight: bold; color: rgba(255,128,0,0.73);">{{ product.price }}₸</p>
+                        <p class="text" style="color:wheat">{{ product.description }}</p>
-=======
+                         <p class="price" style="font-size: 35px; font-weight: bold; color: rgba(255,128,0,0.73);">{{ product.price }}₸</p>
-                        <p class="price" style="font-size: 35px; font-weight: bold; color: rgba(255,128,0,0.73);">₸{{ product.price }}</p>
->>>>>>> 28b575b35ad3c9232ec053f2e1a0421dfcd41952
-                        <p class="description">{{ product.description|linebreaks }}</p>
                         <a href="{% url 'index' %}" class="btn btn-primary">Вернуться на главную</a>