diff --git a/debian/changelog b/debian/changelog index d02a0b61..eaba64d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (22.46.10) stable; urgency=low +hedera-web (22.46.11) stable; urgency=low * Initial Release. diff --git a/forms/ecomerce/basket/style.scss b/forms/ecomerce/basket/style.scss index 3d47f636..f46a077c 100644 --- a/forms/ecomerce/basket/style.scss +++ b/forms/ecomerce/basket/style.scss @@ -51,7 +51,7 @@ overflow: hidden; } .basket .line > .info > h2 { - font-size: .9rem; + font-size: 1rem; font-weight: normal; margin: 0; } diff --git a/forms/ecomerce/catalog/style.scss b/forms/ecomerce/catalog/style.scss index 156c5fab..bbe4cba1 100644 --- a/forms/ecomerce/catalog/style.scss +++ b/forms/ecomerce/catalog/style.scss @@ -1,5 +1,5 @@ -@import "../../../js/htk/style/classes"; +@import "htk/style/classes"; .catalog { margin-right: $side-panel-width; @@ -127,10 +127,6 @@ font-weight: bold; color: red; } - & > h2 { - text-overflow: ellipsis; - overflow: hidden; - } .item-id { float: right; } @@ -139,16 +135,16 @@ bottom: 0; right: 0; white-space: nowrap; - font-size: .95em; + font-size: .95rem; text-align: right; align-items: middle; - column-gap: .2em; + column-gap: 3px; display: flex; & > * { - border-radius: .2em; - padding: .1em .3em; - border: .1em transparent solid; + border-radius: 3px; + padding: 1px 5px; + border: 1px transparent solid; box-sizing: border-box; } } @@ -173,7 +169,9 @@ & > h2 { font-weight: normal; font-size: 1rem; - margin-bottom: .15em; + margin-bottom: 1px; + text-overflow: ellipsis; + overflow: hidden; } & > .sub-name { margin: 0; @@ -184,7 +182,7 @@ white-space: nowrap; overflow: hidden; text-transform: uppercase; - margin-bottom: .2em; + margin-bottom: 1px; } .item-id { font-size: .9rem; @@ -192,7 +190,7 @@ } & > p { margin: 0; - margin-bottom: .2em; + margin-bottom: 1px; } } @@ -202,7 +200,7 @@ .list-view, .item-card { .item-tags { - font-size: .8em; + font-size: .8rem; display: table; color: #333; margin: 0; @@ -211,7 +209,7 @@ td:first-child { color: #999; - padding-right: .5em; + padding-right: 7px; } } } @@ -245,8 +243,8 @@ justify-content: center; } .item-box { - border-radius: .6em; - box-shadow: .05em .05em .2em rgba(0, 0, 0, .1); + border-radius: 8px; + box-shadow: 1px 1px 3px rgba(0, 0, 0, .1); overflow: hidden; background-color: white; flex-direction: column; @@ -264,14 +262,14 @@ flex: auto; overflow: hidden; margin: 10px; - height: 158px; + height: 175px; & > h2 { - max-height: 48px; + max-height: 3rem; } & > .item-tags { position: absolute; - top: 74px; + top: 82px; } } } @@ -280,7 +278,7 @@ /* List view */ .list-view { - border-radius: .6em; + border-radius: 8px; box-shadow: .05em .05em .2em rgba(0, 0, 0, .1); overflow: hidden; background-color: white; @@ -326,7 +324,7 @@ } td { display: inline-block; - padding-right: .5em; + padding-right: 7px; &:first-child { display: none; @@ -344,20 +342,25 @@ } .item-card { font-size: .9rem; - width: 20em; + max-width: 320px; + overflow: hidden; & > .top { - padding: 1em; + padding: 14px; & > .item-info { - margin-left: 9em; - height: 8em; + margin-left: 126px; + height: 112px; + + & > h2 { + max-height: 4.5rem; + } } & > .htk-image { - height: 8em; - width: 8em; + height: 112px; + width: 112px; float: left; - border-radius: .3em; + border-radius: 4px; } & > .desc { clear: both; diff --git a/forms/ecomerce/ticket/style.scss b/forms/ecomerce/ticket/style.scss index f3b6ac24..e3814122 100644 --- a/forms/ecomerce/ticket/style.scss +++ b/forms/ecomerce/ticket/style.scss @@ -3,9 +3,9 @@ .ticket .head { padding: 0; - padding-bottom: .2em; + padding-bottom: 3px; border-bottom: 1px solid #DDD; - margin-bottom: 1em; + margin-bottom: 1px; } .ticket .head > div > div { margin: 15px 0; @@ -14,7 +14,7 @@ margin: 0; } .ticket .head p { - margin: .2em 0; + margin: 3px 0; } .ticket .head p.important { font-size: 1.2rem; @@ -24,8 +24,8 @@ text-align: right; } .ticket .packages { - margin-top: 1em; - padding-top: 1em; + margin-top: 14px; + padding-top: 14px; border-top: 1px solid #DDD; display: block; } @@ -59,7 +59,7 @@ overflow: hidden; } .ticket .line > .info > h2 { - font-size: .9rem; + font-size: 1rem; font-weight: normal; margin-bottom: 2px; } diff --git a/js/htk/style/responsive.scss b/js/htk/style/responsive.scss index 1bf3fb5b..2e031f0f 100644 --- a/js/htk/style/responsive.scss +++ b/js/htk/style/responsive.scss @@ -1,16 +1,16 @@ // Standard -body { font-size: 14px; } +html { font-size: 15px; } // Smartphone, portrait -@media screen and (min-width:320px) { body { font-size: 13px; } } -// Smartphone, landscape -@media screen and (min-width:480px) { body { font-size: 13px; } } +@media screen and (min-width:320px) { html { font-size: 15px; } } +// Smartphone, html +@media screen and (min-width:480px) { html { font-size: 15px; } } // Tablet, portrait -@media screen and (min-width:600px) { body { font-size: 13px; } } +@media screen and (min-width:600px) { html { font-size: 15px; } } // Tablet, landscape -@media screen and (min-width:801px) { body { font-size: 13px; } } +@media screen and (min-width:801px) { html { font-size: 16px; } } // Big screen and landscape tablets, laptop and desktop -@media screen and (min-width:1025px) { body { font-size: 14px; } } +@media screen and (min-width:1025px) { html { font-size: 16px; } } // Hi-res laptop and desktop -@media screen and (min-width:1281px) { body { font-size: 14px; } } +@media screen and (min-width:1281px) { html { font-size: 16px; } } diff --git a/js/vn/scope.js b/js/vn/scope.js index 6e13784e..d0e78c08 100644 --- a/js/vn/scope.js +++ b/js/vn/scope.js @@ -2,7 +2,7 @@ const VnObject = require('./object'); const kebabToCamel = require('./string-util').kebabToCamel; let scopeUid = 0; -window.vnWatchers = 0; +Vn.nWatchers = 0; module.exports = new Class({ Extends: VnObject @@ -15,7 +15,7 @@ module.exports = new Class({ this.parent = parent; this.uid = ++scopeUid; this.$ = parent ? Object.create(parent.$) : {}; - vnWatchers += exprValues.length; + Vn.nWatchers += exprValues.length; if (parent) { parent.ref(); @@ -148,7 +148,7 @@ module.exports = new Class({ } ,_destroy() { - vnWatchers -= this.exprValues.length; + Vn.nWatchers -= this.exprValues.length; for (const object of this.objects) if (object instanceof VnObject) { diff --git a/js/vn/vn.js b/js/vn/vn.js index 81072db7..a53a8431 100644 --- a/js/vn/vn.js +++ b/js/vn/vn.js @@ -1,7 +1,9 @@ require('mootools'); -Vn = module.exports = { +Vn = module.exports = {}; + +Object.assign(Vn, { Locale : require('./locale') ,Enum : require('./enum') ,Type : require('./type') @@ -375,4 +377,4 @@ Vn = module.exports = { return this.isMobileCached; } -}; +}); diff --git a/package.json b/package.json index 85e8c8cf..78403bfd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "22.46.10", + "version": "22.46.11", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": {