diff --git a/app/views/catalog/index.rhtml b/app/views/catalog/index.rhtml index 92db4bf..a17ec83 100644 --- a/app/views/catalog/index.rhtml +++ b/app/views/catalog/index.rhtml @@ -42,22 +42,26 @@ <% if product.description %>
  • <%= _('description') %> -
    -
    <%= txt2html(product.description || '') %>
    +
    +
    +
    <%= txt2html(product.description || '') %>
    +
  • <% end %> <% if product.is_open_price? %>
  • <%= _('price composition') %> -
    -
    - <% product.inputs.each do |i| %> -
    -
    <%= i.product_category.name %>
    - <%= price_span i.price_per_unit * i.amount_used, :class => 'search-product-input-price' %> -
    - <% end %> +
    +
    +
    + <% product.inputs.each do |i| %> +
    +
    <%= i.product_category.name %>
    + <%= price_span i.price_per_unit * i.amount_used, :class => 'search-product-input-price' %> +
    + <% end %> +
  • <% end %> @@ -65,12 +69,14 @@ <% if product.inputs.count > 0 %>
  • <%= _('inputs and raw materials') %> -
    -
    - <% product.inputs.each do |i| %> -
    <%= "#{i.amount_used} #{i.unit.singular} #{_('of')} " if i.has_all_price_details? %> - <%= "#{i.product_category.name}" %>
    - <% end %> +
    +
    +
    + <% product.inputs.each do |i| %> +
    <%= "#{i.amount_used} #{i.unit.singular} #{_('of')} " if i.has_all_price_details? %> + <%= "#{i.product_category.name}" %>
    + <% end %> +
  • <% end %> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 086c4ce..58222a3 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -2988,13 +2988,18 @@ div#activation_enterprise div { padding: 10px 30px 10px 0; margin-bottom: 10px; } -#product-list .expand-box.hover { +#product-list .expand-box:hover { background-color: #28F091; } #product-list .expand-box { background-color: #1EB46D; margin-bottom: 3px; - border-radius: 10px 0 0 10px; + -moz-border-radius-topleft: 10px; + -moz-border-radius-topright: 0px; + -moz-border-radius-bottomright: 0px; + -moz-border-radius-bottomleft: 10px; + -webkit-border-radius: 10px 0px 0px 10px; + border-radius: 10px 0px 0px 10px; width: 202px; } #product-list .expand-box > span { @@ -3038,6 +3043,8 @@ div#activation_enterprise div { max-height: 200px; width: 160px; border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; background: #DCFFD7; border: 2px solid #1EB46D; min-height: 30px; @@ -3062,10 +3069,12 @@ div#activation_enterprise div { #product-list li.product.not-available .product-unit { color: #ACACAC !important; } -#product-list .product-link a { - line-height: 29px; +#product-list .product-link { + margin-top: 5px; + margin-bottom: 5px; color: #006672; font-weight: bold; + text-align: left; } #product-list .prop { float:right; -- libgit2 0.21.2