midgard/tap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:ZeusWPI/Tab

Browse source
This commit is contained in:
Tom Naessens 2014-12-09 19:45:05 +01:00
commit 539d491115
2 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/assets/stylesheets/application.css.scss
View file

@ -92,19 +92,32 @@ footer ul li {
margin-left: 15px; margin-left: 15px;
} }
.overview{ .usercontainer{
position: absolute;
width: 49%; width: 49%;
height: 49%;
border-radius: 0px; border-radius: 0px;
margin: -2px; margin: -2px;
padding: 18px; padding: 18px;
border-color: #000; border-color: #000;
border: 0px; border: 0px;
vertical-align: bottom;
font-weight: bold; font-weight: bold;
font-size: 24px; font-size: 24px;
}
.overview{
//margin-left: 2px;
width: 50%;
float: left;
border-radius: 0px;
.btn{
width: 100%;
border-color: #444;
}
} }
.center{ .center{

17
app/views/orders/overview.html.erb
View file

@ -2,14 +2,25 @@
<h3 class="center" >sort by name</h3> <h3 class="center" >sort by name</h3>
<% @users_by_name.each do |user| %> <% @users_by_name.each do |user| %>
<div class="thumbnail overview">
<%= link_to image_tag("http://placehold.it/100x100", class: "img-circle"),
new_user_order_path(user) %>
<%= link_to user.name , new_user_order_path(user), class: "btn btn-info overview", <%= link_to user.name , new_user_order_path(user), class: "btn btn-info overview",
style: get_color_style(user) %> style: get_color_style(user) %>
</div>
<% end %> <% end %>
</div> </div>
<div class="col-md-6">
<h3 class="center">sort by orders</h3>
<div class="col-md-6 ">
<h3 class="center" >sort by name</h3>
<% @users_by_order.each do |user| %> <% @users_by_order.each do |user| %>
<div class="thumbnail overview">
<%= link_to image_tag("http://babeholder.pixoil.com/img/100/100", class: "img-circle"),
new_user_order_path(user) %>
<%= link_to user.name , new_user_order_path(user), class: "btn btn-info overview", <%= link_to user.name , new_user_order_path(user), class: "btn btn-info overview",
style: get_color_style(user) %> style: get_color_style(user) %>
</div>
<% end %> <% end %>
</div>