mtyton
/
comfy
1
0
Forkuj 1
Kod Zgłoszenia 4 Oczekujące zmiany 1 Packages Projekty Wydania 5 Wiki Aktywność

Merge pull request #10 from mtyton/feature/mobile_view_adjustment 

improved mobile views
pull/2/head
mtyton 2023-06-08 01:41:58 +02:00 zatwierdzone przez GitHub
rodzic 81c5926261 bd04861682
commit dcb1fc5b01
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
5 zmienionych plików z 30 dodań i 42 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
artel/artel/templates/base.html
Wyświetl plik

@ -37,10 +37,10 @@
{% wagtailuserbar %}
<div class="container">
<div class="row">
<div class="col-3">
<div class="col-md-3 mt-5 ml-2">
{% main_menu max_levels=3 template="menu/custom_main_menu.html" %}
</div>
<div class="col-9 mt-5 ml-2">
<div class="col-md-9 mt-5 ml-2">
{% block content %}{% endblock %}
</div>
</div>

15
artel/artel/templates/menu/custom_main_menu.html
Wyświetl plik

@ -1,9 +1,9 @@
{% load static %}
{% load static %}
{% load menu_tags %}
<div class="d-flex flex-column flex-shrink-0 p-3 mr-5" style="width: 280px;">
<img src="{% static 'images/icons/las_ruinas_PL.png' %}" class="rounded mx-auto d-block mt-3"/>
<div class="d-flex flex-column flex-shrink-0 p-3 mr-5">
<img src="{% static 'images/icons/las_ruinas_PL.png' %}" class="img-fluid rounded mx-auto d-block mt-3" style="width: 10rem; height: 10 rem;" alt="Portal Logo"/>
<hr>
<ul class="nav navbar-nav">
{% for item in menu_items %}
@ -11,19 +11,16 @@
<a href="{{ item.href }}">{{ item.text }}</a>
{% if item.has_children_in_menu %}
<button class="btn btn-toggle" data-bs-target="#ddtoggle_{{ item.link_page.pk }}" data-bs-toggle="collapse"
aria-expanded={% if item.active_class %}"true" {% else %} "false" {% endif %}
aria-expanded={% if item.active_class %}"true" {% else %} "false" {% endif %}
aria-controls="#ddtoggle_{{ item.link_page.pk }}">
<img src = "{% static 'images/icons/caret-down.svg' %}" alt="&or;"/> </button>
{% sub_menu item template="menu/custom_submenu.html" %}
{% endif %}
</li>
</li>
{% endfor %}
</ul>
</div>
<div class="d-flex flex-column flex-shrink-0 p-3 mr-5" style="width: 280px;">
<div class="d-flex flex-column flex-shrink-0 p-3 mr-5">
<hr>
<a href={% url 'cart' %} alt="Koszyk" > Koszyk </a>
</div>

20
artel/store/templates/store/order.html
Wyświetl plik

@ -17,16 +17,12 @@
<div class="row mx-4">
<div class="col-sm-6">
<label class="order-form-label">{{form.name.label}}</label>
</div>
<div class="col-sm-6">
<label class="order-form-label">{{form.surname.label}}</label>
</div>
<div class="col-sm-6">
<div class="form-outline">
{{form.name}}
</div>
</div>
<div class="col-sm-6 mt-2 mt-sm-0">
<div class="col-sm-6">
<label class="order-form-label">{{form.surname.label}}</label>
<div class="form-outline">
{{form.surname}}
</div>
@ -35,16 +31,12 @@
<div class="row mx-4">
<div class="col-sm-6">
<label class="order-form-label">{{form.email.label}}</label>
</div>
<div class="col-sm-6">
<label class="order-form-label">{{form.phone.label}}</label>
</div>
<div class="col-sm-6">
<div class="form-outline">
{{form.email}}
</div>
</div>
<div class="col-sm-6 mt-2 mt-sm-0">
<div class="col-sm-6">
<label class="order-form-label">{{form.phone.label}}</label>
<div class="form-outline">
{{form.phone}}
</div>
@ -52,7 +44,7 @@
</div>
</div>
<div class="row mt-3 mx-4">
<div class="col-12">
<label class="order-form-label">Dane Kontaktowe</label>
</div>
@ -81,7 +73,7 @@
{{form.zip_code}}
</div>
</div>
<div class="col-12 text-end mt-3">
<div class="form-outline">
<input type="submit" value="Confirm" class="btn btn-success btn-lg">

17
artel/store/templates/store/partials/product_card.html
Wyświetl plik

@ -1,25 +1,24 @@
{% load static %}
<div class="card h-100" style="width: 15rem;">
<div class="card-header">{{item.title}}</div>
<div class="card-body">
<img src="{{item.main_image.url}}" class="rounded mx-auto d-block" style="width: 10rem; height: 10 rem;">
<div class="card h-100" >
<div class="card-header text-truncate">{{item.title}}</div>
<div class="card-body p-0">
<img src="{{item.main_image.url}}" class="img-fluid rounded mx-auto d-block" style="width: 10rem; height: 15rem;" alt="{{item.title}}">
<div class="row d-flex mt-3">
<div class="card-footer row d-flex mt-3">
<div class="col">
<input type="number" id="quantity{{item.id}}" name="quantity" min="1" value="1" class="form-control form-control-sm">
</div>
<div class="col text-end">
<button class="btn btn-outline-success add-to-cart-button"
data-product-id="{{item.id}}"
<button class="btn btn-outline-success add-to-cart-button"
data-product-id="{{item.id}}"
data-csrf-token="{{csrf_token}}"
data-add-to-cart-url={% url "cart-action-add-product" %}
data-bs-toggle="modal" data-bs-target="#addToCartModal"
>
<img src="{% static 'images/icons/cart.svg' %}" alt="Koszyk"/>
<img src="{% static 'images/icons/cart.svg' %}" style="width: 1rem; height: 1rem;" alt="Koszyk"/>
</button>
</div>
</div>
</div>
</div>

16
artel/store/templates/store/product_list_page.html
Wyświetl plik

@ -23,14 +23,14 @@
</div>
</div>
<div class="container mb-3">
<div class="row row-cols-1 row-cols-md-3 g-4">
{% for item in items %}
<div class="col">
{% include 'store/partials/product_card.html' %}
</div>
{% endfor %}
</div>
<div class="container mb-3 mt-5">
<div class="row row-cols-3 g-4 mt-3">
{% for item in items %}
<div class="col-md-4">
{% include 'store/partials/product_card.html' %}
</div>
{% endfor %}
</div>
</div>
<nav aria-label="Page navigation example">