old price display tweaks
This commit is contained in:
parent
1a5dc3ebe4
commit
133429720c
3 changed files with 25 additions and 13 deletions
|
@ -30,7 +30,19 @@ body {
|
||||||
// Example:
|
// Example:
|
||||||
// @linkColor: #ff0000;
|
// @linkColor: #ff0000;
|
||||||
|
|
||||||
// Custom styles
|
|
||||||
|
// main ui colours
|
||||||
|
@mainRedColor: #ED0606;
|
||||||
|
|
||||||
|
// article status
|
||||||
|
@articleUsedColor: green;
|
||||||
|
@articleUnusedColor: red;
|
||||||
|
@articleUnavailColor: #999;
|
||||||
|
@articleUpdatedColor: #468847;
|
||||||
|
|
||||||
|
// dim colors by this amount when the information is less important
|
||||||
|
@nonessentialDim: 35%;
|
||||||
|
|
||||||
|
|
||||||
// Fix empty dd tags in horizontal dl, see https://github.com/twitter/bootstrap/issues/4062
|
// Fix empty dd tags in horizontal dl, see https://github.com/twitter/bootstrap/issues/4062
|
||||||
.dl-horizontal {
|
.dl-horizontal {
|
||||||
|
@ -53,13 +65,6 @@ body {
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@mainRedColor: #ED0606;
|
|
||||||
|
|
||||||
@articleUsedColor: green;
|
|
||||||
@articleUnusedColor: red;
|
|
||||||
@articleUnavailColor: #999;
|
|
||||||
@articleUpdatedColor: #468847;
|
|
||||||
|
|
||||||
|
|
||||||
.logo {
|
.logo {
|
||||||
margin: 10px 0 0 30px;
|
margin: 10px 0 0 30px;
|
||||||
|
@ -258,6 +263,13 @@ tr.unavailable {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// it's a bit distracting
|
||||||
|
.icon-asterisk {
|
||||||
|
font-size: 80%;
|
||||||
|
vertical-align: middle;
|
||||||
|
padding-bottom: 0.4ex;
|
||||||
|
}
|
||||||
|
|
||||||
// allow buttons as input add-on (with proper height)
|
// allow buttons as input add-on (with proper height)
|
||||||
.input-append button.add-on {
|
.input-append button.add-on {
|
||||||
height: inherit;
|
height: inherit;
|
||||||
|
@ -282,10 +294,9 @@ i.package {
|
||||||
padding-left: 20px;
|
padding-left: 20px;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
}
|
}
|
||||||
@packageDim: 35%;
|
.package { color: tint(@textColor, @nonessentialDim); }
|
||||||
.package { color: tint(@textColor, @packageDim); }
|
.used .package { color: tint(@articleUsedColor, @nonessentialDim); }
|
||||||
.used .package { color: tint(@articleUsedColor, @packageDim); }
|
.unused .package { color: tint(@articleUnusedColor, @nonessentialDim); }
|
||||||
.unused .package { color: tint(@articleUnusedColor, @packageDim); }
|
|
||||||
.unavailable .package { color: @articleUnavailColor; }
|
.unavailable .package { color: @articleUnavailColor; }
|
||||||
|
|
||||||
.input-nano {
|
.input-nano {
|
||||||
|
|
|
@ -38,7 +38,7 @@ module OrdersHelper
|
||||||
|
|
||||||
def article_price_change_hint(order_article, gross=false)
|
def article_price_change_hint(order_article, gross=false)
|
||||||
return nil if order_article.article.price == order_article.price.price
|
return nil if order_article.article.price == order_article.price.price
|
||||||
title = "#{t('.old_price')}: #{number_to_currency order_article.article.price}"
|
title = "#{t('helpers.orders.old_price')}: #{number_to_currency order_article.article.price}"
|
||||||
title += " / #{number_to_currency order_article.article.gross_price}" if gross
|
title += " / #{number_to_currency order_article.article.gross_price}" if gross
|
||||||
"<i class='icon-asterisk' title='#{j title}'></i>".html_safe
|
"<i class='icon-asterisk' title='#{j title}'></i>".html_safe
|
||||||
end
|
end
|
||||||
|
|
|
@ -738,6 +738,7 @@ en:
|
||||||
new_invoice: New invoice
|
new_invoice: New invoice
|
||||||
show_invoice: Show invoice
|
show_invoice: Show invoice
|
||||||
orders:
|
orders:
|
||||||
|
old_price: Old price
|
||||||
option_choose: Choose supplier/stock
|
option_choose: Choose supplier/stock
|
||||||
option_stock: Stock
|
option_stock: Stock
|
||||||
order_pdf: Create PDF
|
order_pdf: Create PDF
|
||||||
|
|
Loading…
Reference in a new issue