From b8e336b9e843d47fe8cc7aabd5810298e9ea7f25 Mon Sep 17 00:00:00 2001 From: sandoz Date: Sun, 1 Nov 2009 19:27:48 +0100 Subject: [PATCH] Minor layout change of order footer. --- app/views/ordering/order.rhtml | 2 +- public/stylesheets/main.css | 5 ++++- public/stylesheets/print.css | 5 ++++- public/stylesheets/sass/main.sass | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/views/ordering/order.rhtml b/app/views/ordering/order.rhtml index 985fc1b4..839e4296 100644 --- a/app/views/ordering/order.rhtml +++ b/app/views/ordering/order.rhtml @@ -79,8 +79,8 @@ <%= order_article.article.name -%>

Hersteller: <%= order_article.article.manufacturer -%>
+ Gebinde: <%= @order.stockit? ? order_article.article.quantity_available : @unit[i] %> * <%=h order_article.article.unit %>
Notiz: <%= order_article.article.note -%>
- Gebinde: <%= @order.stockit? ? order_article.article.quantity_available : @unit[i] %> * <%=h order_article.article.unit %>

diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css index 6d951bc3..907ddbc0 100644 --- a/public/stylesheets/main.css +++ b/public/stylesheets/main.css @@ -423,7 +423,6 @@ table#order { z-index: 1; position: fixed; bottom: 0; - width: 97.5%; background-color: #E4EED6; border-top: 2px solid #78B74E; } #order-footer #total-sum, .article-info #total-sum { @@ -440,6 +439,10 @@ table#order { #order-footer #total-sum #order-button input:disabled, .article-info #total-sum #order-button input:disabled { background-color: red; } +#order-footer { + right: 15px; + left: 15px; } + .article-info { z-index: 2; width: 50em; diff --git a/public/stylesheets/print.css b/public/stylesheets/print.css index 0742836c..bab3639f 100644 --- a/public/stylesheets/print.css +++ b/public/stylesheets/print.css @@ -423,7 +423,6 @@ table#order { z-index: 1; position: fixed; bottom: 0; - width: 97.5%; background-color: #E4EED6; border-top: 2px solid #78B74E; } #order-footer #total-sum, .article-info #total-sum { @@ -440,6 +439,10 @@ table#order { #order-footer #total-sum #order-button input:disabled, .article-info #total-sum #order-button input:disabled { background-color: red; } +#order-footer { + right: 15px; + left: 15px; } + .article-info { z-index: 2; width: 50em; diff --git a/public/stylesheets/sass/main.sass b/public/stylesheets/sass/main.sass index e085bea2..c03ece96 100644 --- a/public/stylesheets/sass/main.sass +++ b/public/stylesheets/sass/main.sass @@ -461,7 +461,6 @@ table#order z-index: 1 position: fixed bottom: 0 - width: 97.5% background-color: #E4EED6 border-top: 2px solid #78B74E #total-sum @@ -477,6 +476,9 @@ table#order -webkit-border-radius: 3px input:disabled background-color: red +#order-footer + right: 15px + left: 15px .article-info z-index: 2 width: 50em