diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 2f32111..e94bbe8 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -92,21 +92,6 @@ footer ul li { 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{ //margin-left: 2px; @@ -115,9 +100,23 @@ footer ul li { border-radius: 0px; .btn{ + margin-top: -10px; width: 100%; border-color: #444; } + + .dagschotel{ + float:left; + } + + .user_img{ + margin-left: 33%; + + } + + + + } .center{ diff --git a/app/views/orders/overview.html.erb b/app/views/orders/overview.html.erb index 7d21183..364068c 100644 --- a/app/views/orders/overview.html.erb +++ b/app/views/orders/overview.html.erb @@ -1,26 +1,2 @@ -
-

sort by name

- - <% @users_by_name.each do |user| %> -
- <%= 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) %> -
- <% end %> - -
- - -
-

sort by name

- - <% @users_by_order.each do |user| %> -
- <%= 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) %> -
- <% end %> +<%= render 'orders/user_list', users: @users_by_name %> +<%= render 'orders/user_list', users: @users_by_order %>