diff --git a/front/salix/styles/order-product.scss b/front/salix/styles/order-product.scss index 00eee52e25..aaa070ed83 100644 --- a/front/salix/styles/order-product.scss +++ b/front/salix/styles/order-product.scss @@ -1,18 +1,18 @@ @import "./variables"; .catalog-list { - justify-content: flex-start; align-items: flex-start; flex-wrap: wrap; + justify-content: center; & > .product { box-sizing: border-box; padding: $pad-small; - width: 33.33%; + width: 26em; + overflow: hidden; - & > div { + & > vn-card > div { display: flex; - border: $border-thin; height: 11em; .image { @@ -32,28 +32,28 @@ height: 100%; width: 100%; overflow: hidden; - padding: $pad-small; + padding: .8em; & > h3 { font-family: vn-font; margin: 0; - margin-bottom: .4em; + margin-bottom: .3em; font-weight: normal; line-height: initial; font-size: 1.2em; - max-height:2.2em; + max-height:2.4em; overflow: hidden; } & > h4 { color: $color-font-secondary; text-transform: uppercase; - margin-bottom: .4em; + margin-bottom: .3em; line-height: initial; font-size: 1em; flex: 1; } & > .tags { - padding-bottom: .4em; + padding-bottom: .2em; height: 3em; & > vn-label-value { @@ -86,11 +86,5 @@ } } } - @media screen and (max-width: 1600px) { - width: 50%; - } - @media screen and (max-width: 1280px) { - width: 100%; - } } } diff --git a/modules/order/front/catalog/index.html b/modules/order/front/catalog/index.html index 036f93993c..2ad3af2f6d 100644 --- a/modules/order/front/catalog/index.html +++ b/modules/order/front/catalog/index.html @@ -9,88 +9,90 @@
- - More than {{model.limit}} results - - - - - - - - - - -
-
-
- +
+ More than {{model.limit}} results
-
-

- {{::item.name}} -

-

- {{::item.subName}} -

-
- - - - - - -
- -
-
-
-
- - - No results + + + + + +
+ + No results + + +
+ +
+ +
+
+

+ {{::item.name}} +

+

+ {{::item.subName}} +

+
+ + + + + + +
+ +
+
+
+
diff --git a/modules/order/front/catalog/style.scss b/modules/order/front/catalog/style.scss index 17172eca05..8061cabc4f 100644 --- a/modules/order/front/catalog/style.scss +++ b/modules/order/front/catalog/style.scss @@ -1,15 +1,31 @@ @import "variables"; -vn-order-catalog .catalog-header { - border-bottom: $border-thin; +vn-order-catalog { + .catalog-header { + border-bottom: $border-thin; + padding: $pad-medium; + align-items: center; - vn-one:first-child { - padding-top: 2em; + & > vn-one { + display: flex; + flex: 1; + + span { + color: $color-font-secondary + } + } + & > vn-auto { + width: 28em; + display: flex; + overflow: hidden; + + & > * { + padding-left: $pad-medium; + } + } } - vn-one:nth-child(2) { - padding-top: 0.5em; + .catalog-list { + padding-top: $pad-small; } - span { - color: $color-font-secondary - } -} \ No newline at end of file +} + diff --git a/modules/ticket/front/picture/index.html b/modules/ticket/front/picture/index.html index 6c89214851..8e2462b448 100644 --- a/modules/ticket/front/picture/index.html +++ b/modules/ticket/front/picture/index.html @@ -8,56 +8,55 @@ auto-load="true"> - - -
-
-
- + + No results + + +
+ +
+ +
+
+

+ + {{::sale.item.name}} + +

+

+ {{::sale.item.subName}} +

+
+ + + + + +
-
-

- - {{::sale.item.name}} - -

-

- {{::sale.item.subName}} -

-
- - - - - - -
- -
-
- - - No results - - - - + +
+
+