0
1
Fork 0

Artificial type adjustments

This commit is contained in:
Juan Ferrer 2019-04-16 15:54:55 +02:00
parent 774a471f3d
commit 45852245a1
4 changed files with 49 additions and 61 deletions

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
hedera-web (1.406.40) stable; urgency=low
hedera-web (1.406.41) stable; urgency=low
* Initial Release.

View File

@ -157,7 +157,7 @@
.item-info > h2
{
padding: 0;
padding-bottom: .15em;
margin-bottom: .15em;
font-weight: normal;
font-size: 1em;
text-overflow: ellipsis;
@ -178,7 +178,7 @@
{
text-transform: uppercase;
padding: 0;
padding-bottom: .2em;
margin-bottom: .2em;
font-size: .9em;
}
.item-info > .htk-button
@ -215,6 +215,7 @@
}
.tags td:first-child {
color: #999;
padding-right: .5em;
}
/* List view */
@ -270,25 +271,11 @@
{
float: right;
}
.list-view .item-info .extra
{
position: absolute;
bottom: 0;
width: 100%;
margin-top: .3em;
}
.list-view .item-info .available-price
{
clear: both;
float: right;
right: .3em;
}
.list-view .item-info .tags
{
display: block;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
margin-top: .3em;
padding-top: 1.2em;
}
.list-view .item-info .tags
{
@ -304,7 +291,7 @@
.list-view .item-info .tags td
{
display: inline-block;
padding-right: .5em
padding-right: .5em;
}
.list-view .item-info .tags td:first-child
{
@ -368,11 +355,6 @@
max-width: 4em;
vertical-align: bottom;
}
.grid-view .item-info .tags
{
position: absolute;
top: 6.6em;
}
.grid-view .item-info .tags td {
overflow: hidden;
white-space: nowrap;
@ -381,12 +363,6 @@
width: 6em;
line-height: 1.1em;
}
.grid-view .item-info .tags td:last-child {
padding-left: .5em;
}
.grid-view .item-info .tags td:first-child {
color: #999;
}
/* Card */
@ -429,6 +405,21 @@
{
height: 3em;
}
.item-card .lots-grid .cell-spin
{
max-width: initial;
width: 3em;
}
.item-card .lots-grid .cell-text
{
max-width: initial;
width: auto;
}
.item-card .lots-grid .cell-button
{
max-width: initial;
width: 1em;
}
.item-card .footer
{
text-align: center;

View File

@ -122,39 +122,37 @@
icon="add"
on-click="onAddItemClick"
class="add-button"/>
<div class="available-price">
<span class="available">
<htk-text form="item" column="available"/>
</span>
<span class="from">
<t>from</t>
</span>
<span class="price">
<htk-text form="item" column="price" format="%.2d€"/>
</span>
</div>
<h2>
<htk-text form="item" column="item"/>
</h2>
<p class="sub-name">
<htk-text form="item" column="subName"/>
</p>
<div class="extra">
<div class="available-price">
<span class="available">
<htk-text form="item" column="available"/>
</span>
<span class="from">
<t>from</t>
</span>
<span class="price">
<htk-text form="item" column="price" format="%.2d€"/>
</span>
</div>
<table class="tags">
<tr>
<td><htk-text form="item" column="tag5"/></td>
<td><htk-text form="item" column="value5"/></td>
</tr>
<tr>
<td><htk-text form="item" column="tag6"/></td>
<td><htk-text form="item" column="value6"/></td>
</tr>
<tr>
<td><htk-text form="item" column="tag7"/></td>
<td><htk-text form="item" column="value7"/></td>
</tr>
</table>
</div>
<table class="tags">
<tr>
<td><htk-text form="item" column="tag5"/></td>
<td><htk-text form="item" column="value5"/></td>
</tr>
<tr>
<td><htk-text form="item" column="tag6"/></td>
<td><htk-text form="item" column="value6"/></td>
</tr>
<tr>
<td><htk-text form="item" column="tag7"/></td>
<td><htk-text form="item" column="value7"/></td>
</tr>
</table>
</div>
</div>
</custom>
@ -222,7 +220,7 @@
JOIN tmp.itemAvailable a ON a.id = i.id
JOIN vn.itemTypeL10n l ON l.id = t.id
WHERE #filter
ORDER BY name
ORDER BY t.`order`, l.name
</db-model>
<sql-filter property="filter" type="AND">
<sql-filter-item type="EQUAL">
@ -444,7 +442,6 @@
JOIN vn.warehouse w ON w.id = p.warehouse_id
ORDER BY warehouseFk, `grouping`;
</db-model>
<htk-column-text title="_Store" column="warehouse"/>
<htk-column-spin title="_Price" column="price" unit="€" digits="2"/>
<htk-column-text title="_Pack" column="grouping" format="x%.0d"/>
<htk-column-button

View File

@ -1,6 +1,6 @@
{
"name": "hedera-web",
"version": "1.406.40",
"version": "1.406.41",
"description": "Verdnatura web page",
"license": "GPL-3.0",
"repository": {