Poprawki kompatybilności

This commit is contained in:
2022-07-21 15:11:57 +02:00
parent e5e755fa19
commit 459c23df17
7 changed files with 117 additions and 36 deletions
-1
View File
@@ -8,7 +8,6 @@
@import './styles/global.scss'; @import './styles/global.scss';
#app { #app {
background-color: $bgCol;
color: white; color: white;
min-height: 100vh; min-height: 100vh;
+35 -11
View File
@@ -1,12 +1,13 @@
<template> <template>
<div class="order"> <div class="order">
<transition name="order-anim" mode="out-in"> <div class="order_content">
<keep-alive> <transition name="order-anim" mode="out-in">
<component :is="chosenOrderComponent" :key="chosenOrderComponent.name"></component> <keep-alive>
</keep-alive> <component :is="chosenOrderComponent" :key="chosenOrderComponent.name"></component>
</transition> </keep-alive>
</transition>
<OrderFooter /> <OrderFooter />
</div>
</div> </div>
</template> </template>
@@ -49,15 +50,34 @@ export default defineComponent({
<style lang="scss"> <style lang="scss">
@import '../styles/global.scss'; @import '../styles/global.scss';
// Order scrollbar
::-webkit-scrollbar {
width: 10px;
}
::-webkit-scrollbar-track {
background: #fff;
}
::-webkit-scrollbar-thumb {
background: #ccc;
}
::-webkit-scrollbar-thumb:hover {
background: #aaa;
}
.order { .order {
max-width: 500px; max-width: 550px;
background-color: white; background-color: white;
color: black; color: black;
padding: 0.5em; max-height: 95vh;
box-shadow: 0 0 15px 2px white; overflow-y: auto;
font-family: initial; font-size: 15px;
box-shadow: 0 0 15px 2px white;
h2 { h2 {
margin: 0; margin: 0;
@@ -75,6 +95,10 @@ export default defineComponent({
} }
} }
.order_content {
padding: 0.5em;
}
.flex-row { .flex-row {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
+16 -10
View File
@@ -23,7 +23,7 @@
</section> </section>
<section class="order_table"> <section class="order_table">
<table> <table cellborder="1">
<tbody> <tbody>
<tr class="tr-header"> <tr class="tr-header">
<td width="25%" rowspan="2"> <td width="25%" rowspan="2">
@@ -34,14 +34,14 @@
<td>do</td> <td>do</td>
<td width="10%" rowspan="2">1) prędkość najwyżej km/h</td> <td width="10%" rowspan="2">1) prędkość najwyżej km/h</td>
<td width="10%" rowspan="2">2) jechać ostrożnie</td> <td width="10%" rowspan="2">2) jechać ostrożnie</td>
<td width="25%" rowspan="2">z powodu</td> <td width="35%" rowspan="2">z powodu</td>
</tr> </tr>
<tr class="tr-header"> <tr class="tr-header">
<td colspan="2">kilometra</td> <td colspan="2">kilometra</td>
</tr> </tr>
<tr v-for="row in order.orderList"> <tr v-for="row in order.orderList" class="tr-data">
<td> <td>
<input type="text" v-model="row.name" /> <input type="text" v-model="row.name" />
</td> </td>
@@ -131,8 +131,7 @@ export default defineComponent({
} }
} }
if(this.order.other) if (this.order.other) message += `; ${this.order.other}`;
message += `; ${this.order.other}`
this.store.orderMessage = message; this.store.orderMessage = message;
}, },
@@ -161,11 +160,16 @@ th {
background-color: black; background-color: black;
margin: 0.5em 0; margin: 0.5em 0;
} }
.order_table { .order_table {
.tr-header td { .tr-header td {
padding: 1em 0.5em; padding: 1em 0.5em;
} }
.tr-data td {
padding: 0.5em 0;
}
tbody { tbody {
font-weight: normal; font-weight: normal;
text-align: center; text-align: center;
@@ -177,9 +181,9 @@ th {
} }
textarea { textarea {
resize: none; width: 80%;
height: 100%; height: 40px;
width: 90%; resize: vertical;
} }
} }
@@ -187,14 +191,16 @@ th {
border-left: 2px solid black; border-left: 2px solid black;
border-right: 2px solid black; border-right: 2px solid black;
display: flex;
flex-direction: column;
height: 250px; height: 250px;
padding: 0.5em; padding: 0.5em;
textarea { textarea {
resize: vertical; resize: vertical;
max-height: 220px; height: 220px;
width: 98%; width: 95%;
} }
} }
</style> </style>
+1 -1
View File
@@ -249,7 +249,7 @@ export default defineComponent({
}); });
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
textarea { textarea {
width: 95%; width: 95%;
height: 200px; height: 200px;
+29 -5
View File
@@ -56,14 +56,13 @@ export default defineComponent({
@import '../styles/global.scss'; @import '../styles/global.scss';
.sidebar { .sidebar {
position: absolute; position: fixed;
top: 50%; top: 50%;
left: 0; left: 0;
z-index: 999;
transform: translateY(-50%); transform: translateY(-50%);
width: 50px;
max-height: 250px;
height: 95vh;
} }
.sidebar_content { .sidebar_content {
@@ -85,7 +84,8 @@ export default defineComponent({
color: white; color: white;
background-color: #000000aa; background-color: #000000aa;
width: 50px;
height: 85px;
.bar { .bar {
position: absolute; position: absolute;
@@ -110,4 +110,28 @@ export default defineComponent({
} }
} }
} }
@media screen and (max-width: 650px) {
.sidebar {
left: 50%;
top: 0;
transform: translate(-50%, 0);
}
.sidebar_content {
grid-template-rows: 1fr;
grid-template-columns: repeat(3, 1fr);
& > button {
height: 50px;
width: 60px;
.bar {
width: 100%;
height: 4px;
}
}
}
}
</style> </style>
+27
View File
@@ -8,8 +8,10 @@ html {
padding: 0; padding: 0;
margin: 0; margin: 0;
min-height: 100vh; min-height: 100vh;
background-color: $bgCol;
font-family: 'Libre Franklin', sans-serif; font-family: 'Libre Franklin', sans-serif;
font-weight: 500;
} }
button { button {
@@ -43,3 +45,28 @@ button {
color: $accentCol; color: $accentCol;
} }
} }
select {
border: 2px solid black;
background: none;
padding: 0.1em 0;
border-radius: 0.3em;
text-align: center;
}
// Global scrollbar
::-webkit-scrollbar {
width: 10px;
}
::-webkit-scrollbar-track {
background: #333;
}
::-webkit-scrollbar-thumb {
background: #888;
}
::-webkit-scrollbar-thumb:hover {
background: #555;
}
+9 -8
View File
@@ -51,13 +51,7 @@ export default defineComponent({
<style lang="scss" scoped> <style lang="scss" scoped>
.home { .home {
display: flex;
justify-content: center;
flex-wrap: wrap;
min-height: 100vh; min-height: 100vh;
padding: 1em;
overflow-x: auto; overflow-x: auto;
@@ -67,17 +61,25 @@ export default defineComponent({
align-items: flex-start; align-items: flex-start;
justify-content: center; justify-content: center;
margin-top: 1em; margin-top: 1em;
@media screen and (max-width: 650px) {
margin-top: 60px;
}
} }
.order_container { .order_container {
font-size: 0.9rem; font-size: 0.9rem;
margin-right: 0.5em; margin-right: 0.5em;
margin-bottom: 1em; margin-bottom: 1em;
@media screen and (max-width: 550px) {
margin: 0.5em;
}
} }
} }
.message_container { .message_container {
padding: 0 1em; padding: 1em;
width: 500px; width: 500px;
h3 { h3 {
@@ -88,7 +90,6 @@ export default defineComponent({
button { button {
margin: 0 0.5em; margin: 0 0.5em;
font-size: 0.85em;
} }
@media screen and (max-width: 550px) { @media screen and (max-width: 550px) {