Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

注文画面のUIの調整 #64

Merged
merged 1 commit into from
Oct 3, 2024
Merged

注文画面のUIの調整 #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions app/templates/components/order-session.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<button
hx-delete="/orders/{{ session_id }}/item/{{ uuid }}"
hx-target="#order-session"
class="font-bold text-red-600 bg-gray-200 px-2 rounded"
class="font-bold text-white bg-red-600 px-2 rounded"
>X</button>
</div>
{% endif %}
Expand All @@ -22,18 +22,18 @@
</ul>
</div>
{% if placement_status != "" %}
<div>{{ placement_status }}</div>
<div class="text-center text-2xl">{{ placement_status }}</div>
{% endif %}
<div class="flex flex-row p-2 items-center">
<div class="basis-1/4 text-right text-xl">{{ order_items | length }} 点</div>
<div class="basis-2/4 text-center text-xl">合計: {{ total_price }}</div>
<div class="basis-1/4 text-right lg:text-2xl">{{ order_items | length }} 点</div>
<div class="basis-2/4 text-center lg:text-2xl">合計: {{ total_price }}</div>
{% if order_frozen == true %}
<button hx-post="/orders" class="basis-1/4 text-xl text-center px-2 rounded bg-gray-300">新規</button>
<button hx-post="/orders" class="basis-1/4 lg:text-xl text-center px-2 rounded bg-gray-300">新規</button>
{% else %}
<button
hx-get="/orders/{{ session_id }}/confirm"
hx-target="#order-confirm"
class="basis-1/4 text-xl text-center px-2 py-2 rounded bg-gray-300 disabled:cursor-not-allowed disabled:text-gray-700 disabled:bg-gray-100"
class="basis-1/4 lg:text-xl text-center text-white px-2 py-1 rounded bg-blue-600 disabled:cursor-not-allowed disabled:text-gray-700 disabled:bg-gray-100"
{{ 'disabled' if order_items | length == 0 else '' }}
>確定</button>
<div id="order-confirm"></div>
Expand Down
3 changes: 1 addition & 2 deletions app/templates/orders.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,10 @@
<button class="text-center text-sm px-2 rounded bg-gray-300 hidden lg:inline-block" tabindex="0">
<a href="/" tabindex="-1">ホームに戻る</a>
</button>
<button class="text-xl text-center" tabindex="0">保留</button>
<button
hx-delete="/orders/{{ session_id }}"
hx-target="#order-session"
class="text-xl text-center text-red-600 px-2 rounded bg-gray-300 hidden sm:inline-block"
class="text-xl text-center text-white px-2 rounded bg-red-600 hidden sm:inline-block"
tabindex="0"
>全消去</button>
</div>
Expand Down
20 changes: 10 additions & 10 deletions static/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -898,11 +898,6 @@ video {
background-color: rgb(37 99 235 / var(--tw-bg-opacity));
}

.bg-gray-200 {
--tw-bg-opacity: 1;
background-color: rgb(229 231 235 / var(--tw-bg-opacity));
}

.bg-gray-300 {
--tw-bg-opacity: 1;
background-color: rgb(209 213 219 / var(--tw-bg-opacity));
Expand Down Expand Up @@ -1088,11 +1083,6 @@ video {
color: rgb(17 24 39 / var(--tw-text-opacity));
}

.text-red-600 {
--tw-text-opacity: 1;
color: rgb(220 38 38 / var(--tw-text-opacity));
}

.text-white {
--tw-text-opacity: 1;
color: rgb(255 255 255 / var(--tw-text-opacity));
Expand Down Expand Up @@ -1227,6 +1217,16 @@ video {
.lg\:grid-cols-4 {
grid-template-columns: repeat(4, minmax(0, 1fr));
}

.lg\:text-2xl {
font-size: 1.5rem;
line-height: 2rem;
}

.lg\:text-xl {
font-size: 1.25rem;
line-height: 1.75rem;
}
}

@media (min-width: 1280px) {
Expand Down
Loading