Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Minor layout change of order footer.

Browse source
This commit is contained in:
sandoz 2009-11-01 19:27:48 +01:00
parent e4ef6556b8
commit b8e336b9e8
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/ordering/order.rhtml
View file

@ -79,8 +79,8 @@
<b><%= order_article.article.name -%></b> <b><%= order_article.article.name -%></b>
<p> <p>
Hersteller: <%= order_article.article.manufacturer -%><br /> Hersteller: <%= order_article.article.manufacturer -%><br />
Gebinde: <%= @order.stockit? ? order_article.article.quantity_available : @unit[i] %> * <%=h order_article.article.unit %><br/>
Notiz: <%= order_article.article.note -%><br /> Notiz: <%= order_article.article.note -%><br />
Gebinde: <%= @order.stockit? ? order_article.article.quantity_available : @unit[i] %> * <%=h order_article.article.unit %>
</p> </p>
</div> </div>
</div> </div>

5
public/stylesheets/main.css
View file

@ -423,7 +423,6 @@ table#order {
z-index: 1; z-index: 1;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
width: 97.5%;
background-color: #E4EED6; background-color: #E4EED6;
border-top: 2px solid #78B74E; } border-top: 2px solid #78B74E; }
#order-footer #total-sum, .article-info #total-sum { #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 { #order-footer #total-sum #order-button input:disabled, .article-info #total-sum #order-button input:disabled {
background-color: red; } background-color: red; }
#order-footer {
right: 15px;
left: 15px; }
.article-info { .article-info {
z-index: 2; z-index: 2;
width: 50em; width: 50em;

5
public/stylesheets/print.css
View file

@ -423,7 +423,6 @@ table#order {
z-index: 1; z-index: 1;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
width: 97.5%;
background-color: #E4EED6; background-color: #E4EED6;
border-top: 2px solid #78B74E; } border-top: 2px solid #78B74E; }
#order-footer #total-sum, .article-info #total-sum { #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 { #order-footer #total-sum #order-button input:disabled, .article-info #total-sum #order-button input:disabled {
background-color: red; } background-color: red; }
#order-footer {
right: 15px;
left: 15px; }
.article-info { .article-info {
z-index: 2; z-index: 2;
width: 50em; width: 50em;

4
public/stylesheets/sass/main.sass
View file

@ -461,7 +461,6 @@ table#order
z-index: 1 z-index: 1
position: fixed position: fixed
bottom: 0 bottom: 0
width: 97.5%
background-color: #E4EED6 background-color: #E4EED6
border-top: 2px solid #78B74E border-top: 2px solid #78B74E
#total-sum #total-sum
@ -477,6 +476,9 @@ table#order
-webkit-border-radius: 3px -webkit-border-radius: 3px
input:disabled input:disabled
background-color: red background-color: red
#order-footer
right: 15px
left: 15px
.article-info .article-info
z-index: 2 z-index: 2
width: 50em width: 50em