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

dagschotel button added

Browse source
This commit is contained in:
ohsab 2014-12-09 20:26:18 +01:00
parent 539d491115
commit f247e6c5ff
2 changed files with 16 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -92,21 +92,6 @@ footer ul li {
margin-left: 15px; margin-left: 15px;
} }
.usercontainer{
position: absolute;
width: 49%;
border-radius: 0px;
margin: -2px;
padding: 18px;
border-color: #000;
border: 0px;
vertical-align: bottom;
font-weight: bold;
font-size: 24px;
}
.overview{ .overview{
//margin-left: 2px; //margin-left: 2px;
@ -115,9 +100,23 @@ footer ul li {
border-radius: 0px; border-radius: 0px;
.btn{ .btn{
margin-top: -10px;
width: 100%; width: 100%;
border-color: #444; border-color: #444;
} }
.dagschotel{
float:left;
}
.user_img{
margin-left: 33%;
}
} }
.center{ .center{

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

@ -1,26 +1,2 @@
<div class="col-md-6 "> <%= render 'orders/user_list', users: @users_by_name %>
<h3 class="center" >sort by name</h3> <%= render 'orders/user_list', users: @users_by_order %>
<% @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",
style: get_color_style(user) %>
</div>
<% end %>
</div>
<div class="col-md-6 ">
<h3 class="center" >sort by name</h3>
<% @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",
style: get_color_style(user) %>
</div>
<% end %>