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

Improve article header consistency

This commit is contained in:
wvengen 2015-11-18 22:42:31 +01:00
parent dcf921dc8d
commit 6a0147d2e7
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/stylesheets/bootstrap_and_overrides.css.less vendored
View File

@ -48,7 +48,7 @@ body {
// 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 {
dd { .clearfix(); } dd { .clearfix(); }
} }
@ -119,6 +119,9 @@ table {
td:first-child { td:first-child {
text-align: left; text-align: left;
} }
small {
color: inherit; // keep it readable instead of gray
}
} }
th.numeric, td.numeric { th.numeric, td.numeric {
text-align: right; text-align: right;
@ -129,7 +132,7 @@ table {
th.left, td.left { text-align: left; } th.left, td.left { text-align: left; }
th.right, td.right { text-align: right; } th.right, td.right { text-align: right; }
th.center, td.center { text-align: center; } th.center, td.center { text-align: center; }
td.main_info { td.main_info {
font-weight: bold; font-weight: bold;
} }

14
app/views/shared/articles_by/_article_single.html.haml
View File

@ -1,11 +1,13 @@
%tbody{id: "oa_#{order_article.id}"} %tbody{id: "oa_#{order_article.id}"}
- if not defined?(heading) or heading - if not defined?(heading) or heading
%tr.list-heading %tr.list-heading
%th.name{:colspan => "4"}> %th{:colspan => "4"}>
= order_article.article.name + ' ' %h4.name.pull-left
= "(#{order_article.article.unit}, #{number_to_currency order_article.price.fc_price}" = order_article.article.name
- pkg_info = pkg_helper(order_article.price) %small
= ", #{pkg_info}".html_safe unless pkg_info.blank? = "(#{order_article.article.unit}, #{number_to_currency order_article.price.fc_price}"
) - pkg_info = pkg_helper(order_article.price)
= ", #{pkg_info}".html_safe unless pkg_info.blank?
)
- for goa in order_article.group_order_articles.ordered - for goa in order_article.group_order_articles.ordered
= render 'shared/articles_by/article_single_goa', goa: goa, edit: (edit rescue nil) = render 'shared/articles_by/article_single_goa', goa: goa, edit: (edit rescue nil)

2
app/views/shared/articles_by/_articles.html.haml
View File

@ -1,4 +1,4 @@
%table.table.table-hover.list#articles_by_articles %table.table.table-condensed.table-hover.list#articles_by_articles
%thead.list-heading %thead.list-heading
%tr %tr
%th{:style => 'width:70%'}= Ordergroup.model_name.human %th{:style => 'width:70%'}= Ordergroup.model_name.human

2
app/views/shared/articles_by/_groups.html.haml
View File

@ -1,4 +1,4 @@
%table.table.table-hover.list#articles_by_groups %table.table.table-condensed.table-hover.list#articles_by_groups
%thead.list-heading %thead.list-heading
%tr %tr
%th{:style => "width:40%"}= heading_helper Article, :name %th{:style => "width:40%"}= heading_helper Article, :name