Resolve some feedback in catalog section

src/Web/WebMVC/Controllers/CatalogController.cs

@@ -2,14 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Net.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.eShopOnContainers.WebMVC.Models;
-using Microsoft.Extensions.Options;
-using Newtonsoft.Json;
+using Microsoft.eShopOnContainers.WebMVC.Models.Pagination;
 using Microsoft.eShopOnContainers.WebMVC.Services;
 using Microsoft.eShopOnContainers.WebMVC.Models.CatalogViewModels;
-using BikeSharing_Private_Web_Site.Services.Pagination;
+
 
 namespace Microsoft.eShopOnContainers.WebMVC.Controllers
 {
@@ -36,9 +33,9 @@ namespace Microsoft.eShopOnContainers.WebMVC.Controllers
                 PaginationInfo = new PaginationInfo()
                 {
                     ActualPage = page ?? 0,
-                    ItemsPerPage = (_catalogSvc.TotalItems < itemsPage) ? _catalogSvc.TotalItems : itemsPage,
-                    TotalItems = _catalogSvc.TotalItems, 
-                    TotalPages = int.Parse(Math.Ceiling(((decimal)_catalogSvc.TotalItems / itemsPage)).ToString())
+                    ItemsPerPage = (catalog.Count < itemsPage) ? catalog.Count : itemsPage,
+                    TotalItems = catalog.Count, 
+                    TotalPages = int.Parse(Math.Ceiling(((decimal)catalog.Count / itemsPage)).ToString())
                 }
             };
 

src/Web/WebMVC/Models/CartViewModels/IndexViewModel.cs

@@ -1,5 +1,4 @@
-using BikeSharing_Private_Web_Site.Services.Pagination;
-using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Rendering;
 using System;
 using System.Collections.Generic;
 using System.Linq;

src/Web/WebMVC/Models/CatalogViewModels/IndexViewModel.cs

@@ -1,5 +1,5 @@
-using BikeSharing_Private_Web_Site.Services.Pagination;
-using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.eShopOnContainers.WebMVC.Models.Pagination;
 using System;
 using System.Collections.Generic;
 using System.Linq;

src/Web/WebMVC/Models/Pagination/PaginationInfo.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace BikeSharing_Private_Web_Site.Services.Pagination
+namespace Microsoft.eShopOnContainers.WebMVC.Models.Pagination
 {
     public class PaginationInfo
     {

src/Web/WebMVC/Services/CatalogService.cs

@@ -18,60 +18,12 @@ namespace Microsoft.eShopOnContainers.WebMVC.Services
         private readonly IOptions<AppSettings> _settings;
         private HttpClient _apiClient;
         private readonly string _remoteServiceBaseUrl;
-        private int _totalItems;
-
-        public int TotalItems 
-        {
-            get
-            {
-                return _totalItems;
-            }
-        }
-
+  
         public CatalogService(IOptions<AppSettings> settings) {
             _settings = settings;
             _remoteServiceBaseUrl = $"{_settings.Value.CatalogUrl}/api/v1/catalog/";
-
-            #region fake data
-            _items = new List<CatalogItem>()
-            {
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = "Roslyn Red T-Shirt", Name = "Roslyn Red T-Shirt", Price = 12, PictureUri = "https://fakeimg.pl/370x240/EEEEEE/000/?text=RoslynRedT-Shirt"  },
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = "Cupt Black & White Mug", Name = "Cupt Black & White Mug", Price= 17, PictureUri = "https://fakeimg.pl/370x240/EEEEEE/000/?text=CuptBlack&WhiteMug" },
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = "Prism White T-Shirt", Name = "Prism White T-Shirt", Price = 12, PictureUri = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.PrismWhiteT-Shirt" },
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = ".NET Bot Black Sweatshirt", Name = ".NET Bot Black Sweatshirt", Price = decimal.Parse("19.5"), PictureUri = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.NETBotBlack" },
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = "Roslyn Red T-Shirt", Name = "Roslyn Red T-Shirt", Price = 12, PictureUri = "http://fakeimg.pl/370x240/EEEEEE/000/?text=RoslynRedT-Shirt"  },
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = "Cupt Black & White Mug", Name = "Cupt Black & White Mug", Price= 17, PictureUri = "https://fakeimg.pl/370x240/EEEEEE/000/?text=CuptBlack&WhiteMug" },
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = "Prism White T-Shirt", Name = "Prism White T-Shirt", Price = 12, PictureUri = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.PrismWhiteT-Shirt" },
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = ".NET Bot Black Sweatshirt", Name = ".NET Bot Black Sweatshirt", Price = decimal.Parse("19.5"), PictureUri = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.NETBotBlack" },
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = "Roslyn Red T-Shirt", Name = "Roslyn Red T-Shirt", Price = 12, PictureUri = "http://fakeimg.pl/370x240/EEEEEE/000/?text=RoslynRedT-Shirt"  },
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = "Cupt Black & White Mug", Name = "Cupt Black & White Mug", Price= 17, PictureUri = "https://fakeimg.pl/370x240/EEEEEE/000/?text=CuptBlack&WhiteMug" },
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = "Prism White T-Shirt", Name = "Prism White T-Shirt", Price = 12, PictureUri = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.PrismWhiteT-Shirt" },
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = ".NET Bot Black Sweatshirt", Name = ".NET Bot Black Sweatshirt", Price = decimal.Parse("19.5"), PictureUri = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.NETBotBlack" },
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = "Roslyn Red T-Shirt", Name = "Roslyn Red T-Shirt", Price = 12, PictureUri = "http://fakeimg.pl/370x240/EEEEEE/000/?text=RoslynRedT-Shirt"  },
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = "Cupt Black & White Mug", Name = "Cupt Black & White Mug", Price= 17, PictureUri = "https://fakeimg.pl/370x240/EEEEEE/000/?text=CuptBlack&WhiteMug" },
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = "Prism White T-Shirt", Name = "Prism White T-Shirt", Price = 12, PictureUri = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.PrismWhiteT-Shirt" },
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = ".NET Bot Black Sweatshirt", Name = ".NET Bot Black Sweatshirt", Price = decimal.Parse("19.5"), PictureUri = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.NETBotBlack" },
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = "Roslyn Red T-Shirt", Name = "Roslyn Red T-Shirt", Price = 12, PictureUri = "http://fakeimg.pl/370x240/EEEEEE/000/?text=RoslynRedT-Shirt"  },
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = "Cupt Black & White Mug", Name = "Cupt Black & White Mug", Price= 17, PictureUri = "https://fakeimg.pl/370x240/EEEEEE/000/?text=CuptBlack&WhiteMug" },
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = "Prism White T-Shirt", Name = "Prism White T-Shirt", Price = 12, PictureUri = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.PrismWhiteT-Shirt" },
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = ".NET Bot Black Sweatshirt", Name = ".NET Bot Black Sweatshirt", Price = decimal.Parse("19.5"), PictureUri = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.NETBotBlack" },
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = "Roslyn Red T-Shirt", Name = "Roslyn Red T-Shirt", Price = 12, PictureUri = "http://fakeimg.pl/370x240/EEEEEE/000/?text=RoslynRedT-Shirt"  },
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = "Cupt Black & White Mug", Name = "Cupt Black & White Mug", Price= 17, PictureUri = "https://fakeimg.pl/370x240/EEEEEE/000/?text=CuptBlack&WhiteMug" },
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = "Prism White T-Shirt", Name = "Prism White T-Shirt", Price = 12, PictureUri = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.PrismWhiteT-Shirt" },
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = ".NET Bot Black Sweatshirt", Name = ".NET Bot Black Sweatshirt", Price = decimal.Parse("19.5"), PictureUri = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.NETBotBlack" },
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = "Roslyn Red T-Shirt", Name = "Roslyn Red T-Shirt", Price = 12, PictureUri = "http://fakeimg.pl/370x240/EEEEEE/000/?text=RoslynRedT-Shirt"  },
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = "Cupt Black & White Mug", Name = "Cupt Black & White Mug", Price= 17, PictureUri = "https://fakeimg.pl/370x240/EEEEEE/000/?text=CuptBlack&WhiteMug" },
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = "Prism White T-Shirt", Name = "Prism White T-Shirt", Price = 12, PictureUri = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.PrismWhiteT-Shirt" },
-                new CatalogItem() { Id = Guid.NewGuid().ToString(), Description = ".NET Bot Black Sweatshirt", Name = ".NET Bot Black Sweatshirt", Price = decimal.Parse("19.5"), PictureUri = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.NETBotBlack" }
-            };
-            #endregion
         }
          
-        public CatalogItem GetCatalogItem(string Id)
-        {
-            return _items.Where(x => x.Id.Equals(Id)).FirstOrDefault();
-        }
-
         public async Task<Catalog> GetCatalogItems(int page,int take, int? brand, int? type)
         {
             _apiClient = new HttpClient();
@@ -89,9 +41,6 @@ namespace Microsoft.eShopOnContainers.WebMVC.Services
             var dataString = await _apiClient.GetStringAsync(catalogUrl);
             var response = JsonConvert.DeserializeObject<Catalog>(dataString);
 
-            var res = _items;
-            _totalItems = response.Count;
-
             return response;
         }
 

src/Web/WebMVC/Services/ICatalogService.cs

@@ -9,10 +9,7 @@ namespace Microsoft.eShopOnContainers.WebMVC.Services
 {
     public interface ICatalogService
     {
-        int TotalItems { get; }
-
         Task<Catalog> GetCatalogItems(int page, int take, int? brand, int? type);
-        CatalogItem GetCatalogItem(string Id);
         Task<IEnumerable<SelectListItem>> GetBrands();
         Task<IEnumerable<SelectListItem>> GetTypes();
     }

src/Web/WebMVC/Startup.cs

@@ -54,8 +54,8 @@ namespace Microsoft.eShopOnContainers.WebMVC
             services.AddSession();
 
             // Add application services.
-            services.AddSingleton<ICatalogService, CatalogService>(); //CCE: Once services are integrated, a singleton is not needed we can left transient.
-            services.AddSingleton<IOrderingService, OrderingService>();
+            services.AddTransient<ICatalogService, CatalogService>(); 
+            services.AddSingleton<IOrderingService, OrderingService>(); //CCE: Once services are integrated, a singleton is not needed we can left transient.
             services.AddTransient<IBasketService, BasketService>();
 
             services.Configure<AppSettings>(Configuration);

src/Web/WebMVC/Views/Account/Register.cshtml

@@ -8,9 +8,9 @@
         <li style="margin-right: 65px;"><a asp-area="" asp-controller="Account" asp-action="Login">LOGIN</a></li>
     </ul>
 </div>
-<div class="container cart-index-container">
-    <h4 class="order-create-section-title">CREATE NEW ACCOUNT</h4>
+<div class="container register-container">
     <form asp-controller="Account" asp-action="Register" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal">
+        <h4 class="order-create-section-title">CREATE NEW ACCOUNT</h4>
         <div asp-validation-summary="All" class="text-danger"></div>
         <div class="row">
             <div class="form-group col-sm-6">

src/Web/WebMVC/Views/Catalog/Index.cshtml

@@ -19,7 +19,9 @@
                     <img src="~/images/arrow-down.png" class="select-filter-arrow" />
                     <select asp-for="@Model.TypesFilterApplied" asp-items="@Model.Types" class="select-filter"></select>
                 </div>
-                <input type="submit" class="btn-brand btn-brand-small btn-brand-small-filter btn-catalog-apply" value="APPLY" />
+                <button type="submit" class="btn-brand btn-brand-small btn-brand-small-filter btn-catalog-apply">
+                    <img src="~/images/arrow-right.svg" />
+                </button>
             </form>
         </div>
     </div>
@@ -28,7 +30,7 @@
     @if (Model.CatalogItems.Count() > 0)
     {
         <div class="container es-pager-top">
-            @Html.Partial("_pagination", Model)
+            @Html.Partial("_pagination", Model.PaginationInfo)
         </div>
         <div class="row">
             @foreach (var catalogItem in Model.CatalogItems)
@@ -40,7 +42,7 @@
 
         </div>
         <div class="container es-pager-bottom">
-            @Html.Partial("_pagination", Model)
+            @Html.Partial("_pagination", Model.PaginationInfo)
         </div>
     }
     else

src/Web/WebMVC/Views/Catalog/_pagination.cshtml

@@ -1,12 +1,12 @@
-@model Microsoft.eShopOnContainers.WebMVC.Models.CatalogViewModels.IndexViewModel
+@model Microsoft.eShopOnContainers.WebMVC.Models.Pagination.PaginationInfo
 
 <div class="row">
     <div class="col-xs-4">
         <nav>
             <ul>
                 <li class="page-item">
-                    <a class="text previous @Model.PaginationInfo.Previous" id="Previous"
-                       href="@Url.Action("Index","Catalog", new { page = Model.PaginationInfo.ActualPage -1 })"
+                    <a class="text previous @Model.Previous" id="Previous"
+                       href="@Url.Action("Index","Catalog", new { page = Model.ActualPage -1 })"
                        aria-label="Previous">
                         <span>Previous</span>
                     </a>
@@ -14,13 +14,13 @@
             </ul>
         </nav>
     </div>
-    <div class="col-xs-4 u-align-center"><span>Showing @Html.DisplayFor(modelItem => modelItem.PaginationInfo.ItemsPerPage) of @Html.DisplayFor(modelItem => modelItem.PaginationInfo.TotalItems) products - Page @(Model.PaginationInfo.ActualPage + 1) of @Html.DisplayFor(x => x.PaginationInfo.TotalPages)</span></div>
+    <div class="col-xs-4 u-align-center"><span>Showing @Html.DisplayFor(modelItem => modelItem.ItemsPerPage) of @Html.DisplayFor(modelItem => modelItem.TotalItems) products - Page @(Model.ActualPage + 1) of @Html.DisplayFor(x => x.TotalPages)</span></div>
     <div class="col-xs-4">
         <nav>
             <ul>
                 <li class="page-item">
-                    <a class="text next @Model.PaginationInfo.Next" id="Next"
-                       href="@Url.Action("Index","Catalog", new { page = Model.PaginationInfo.ActualPage + 1 })"
+                    <a class="text next @Model.Next" id="Next"
+                       href="@Url.Action("Index","Catalog", new { page = Model.ActualPage + 1 })"
                        aria-label="Next">
                         <span>Next</span>
                     </a>

src/Web/WebMVC/Views/Shared/Components/Cart/Default.cshtml

@@ -5,7 +5,7 @@
 }
 
 <div>
-    <a asp-area="" asp-controller="Cart" asp-action="Index"><img src="~/images/cart.png" class="fr layout-cart-image hidden-xs @Model.Disabled" />
+    <a asp-area="" asp-controller="Cart" asp-action="Index"><img src="~/images/cart.png" class="fr layout-cart-image @Model.Disabled" />
        
     </a>
     <div class="layout-cart-badge @Model.Disabled">

src/Web/WebMVC/Views/Shared/Components/CartList/Default.cshtml

@@ -36,7 +36,7 @@
 
                     <tr>
                         <td class="cart-product-column"><img class="cart-product-image" src="@item.PictureUrl" /></td>
-                        <td class="cart-product-column">@item.ProductName</td>
+                        <td class="cart-product-column"><span class="cart-product-column-name">@item.ProductName</span></td>
                         <td class="cart-product-column">ROSLYN</td>
                         <td class="cart-product-column">$ @item.UnitPrice</td>
                         <td class="cart-product-column">
@@ -46,23 +46,37 @@
                         <td class="cart-product-column cart-total-value">$ @Math.Round(item.Quantity * item.UnitPrice,2)</td>
                     </tr>
                 }
+                <tr class="cart-totals">
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td>
+                        <input type="submit"
+                               class="btn btn-default cart-refresh-button"
+                               value=""
+                               name="action" />
+                    </td>
+                    <td>
+                        <div class="cart-total-value">
+                            <div class="cart-total-label"><span>TOTAL</span></div>
+                            <span>$ @Model.Total()</span>
+                        </div>
+                    </td>
+                </tr>
             </tbody>
         </table>
     </section>
 </div>
-<div class="col-md-offset-8 col-md-4">
-    <input type="submit"
-           class="btn btn-default cart-refresh-button"
-           value=""
-           name="action" />
+@*<div class="col-md-offset-8 col-md-4">
     <div class="cart-section-total">
-        @*<div class="cart-subtotal-label"><span>SUBTOTAL</span></div>
+        <div class="cart-subtotal-label"><span>SUBTOTAL</span></div>
             <div class="cart-subtotal-value"><span>$ @Model.Total()</span></div>
             <div class="cart-subtotal-label"><span>TAX</span></div>
-            <div class="cart-subtotal-value"><span>$ 4.20</span></div>*@
+            <div class="cart-subtotal-value"><span>$ 4.20</span></div>
         <div class="cart-total-label"><span>TOTAL</span></div>
         <div class="cart-total-value"><span>$ @Model.Total()</span></div>
     </div>
-</div>
+</div>*@
 
 

src/Web/WebMVC/Views/Shared/_Layout.cshtml

@@ -20,13 +20,13 @@
     <div class="navbar navbar-inverse navbar-fixed-top es-header">
         <div class="container">
             <div class="row">
-                <div class="navbar-header col-sm-8 col-xs-8">
+                <div class="navbar-header col-sm-6 col-xs-8">
                    <a asp-area="" asp-controller="Catalog" asp-action="Index">
                         <div class="navbar-brand">
                         </div>
                     </a>
                 </div>
-                <div class="navbar-header col-sm-4 col-xs-4 text-center">
+                <div class="navbar-header col-sm-6 col-xs-4 text-center">
                     @await Html.PartialAsync("_LoginPartial")
                 </div>
             </div>

src/Web/WebMVC/Views/Shared/_LoginPartial.cshtml

@@ -10,7 +10,8 @@
         <div class="nav navbar-nav navbar-right mt-15">
             @await Component.InvokeAsync("Cart", new { user = await UserManager.GetUserAsync(User) })
             <div class="fr login-user">
-                <span>@UserManager.GetUserName(User)<i class="down-arrow"></i></span>
+                <span class="hidden-xs">@UserManager.GetUserName(User)</span>
+                <i class="down-arrow"></i>
                 <div class="login-user-dropdown-content">
                     <a asp-controller="Order" asp-action="Index">MY ORDERS<i class="myorders-icon"></i></a>
                     <a href="javascript:document.getElementById('logoutForm').submit()">LOG OUT<i class="logout-icon"></i></a>

src/Web/WebMVC/appsettings.json

@@ -3,8 +3,7 @@
     //"DefaultConnection": "Server=127.0.0.1,5433;Database=aspnet-Microsoft.eShopOnContainers.WebMVC;User Id=sa;Password=Pass@word"
     "DefaultConnection": "Server=identity.data;Database=aspnet-Microsoft.eShopOnContainers.WebMVC;User Id=sa;Password=Pass@word"
   },
-  "CatalogUrl": "http://catalog.api",
-  //"CatalogUrl": "http://localhost:5001",
+  "CatalogUrl": "http://localhost:5001",
   "OrderingUrl": "http://localhost:2446/",
   "Logging": {
     "IncludeScopes": false,

src/Web/WebMVC/wwwroot/css/site.css

@@ -14,6 +14,7 @@ body {
     padding-top: 80px;
     /*padding-bottom: 20px;*/
     font-family: Montserrat,sans-serif;
+    min-width:480px;
 }
 
 .mt-15 {
@@ -163,8 +164,7 @@ select::-ms-expand {
 }
 
 .btn-brand-small {
-    width: 120px;
-    font-size: 14px;
+    width: 45px;
 }
 
     .btn-brand-small::before {
@@ -206,8 +206,7 @@ select::-ms-expand {
 }
 
 .btn-catalog-apply {
-    padding-left: 10px;
-    padding-top: 13px;
+    padding:0;
 }
 
 .form-label {
@@ -222,12 +221,10 @@ select::-ms-expand {
     border-radius: 0;
     padding: 10px;
     height: 45px;
-    width: 360px;
-    max-width: 360px;
 }
 
 .form-input-small {
-    max-width: 100px;
+    max-width: 100px!important;
 }
 
 .form-select {
@@ -247,9 +244,9 @@ select::-ms-expand {
     border-color: #FFF;
 }
 
-    .navbar-inverse li {
+    /*.navbar-inverse li {
         margin-top: 10px;
-    }
+    }*/
 
 .btn-login {
     border: 1px solid #00A69C;
@@ -505,6 +502,7 @@ form .col-md-4 {
 .account-login-container {
     min-height: 70vh;
     text-align: center;
+    padding-top: 40px;
 }
 
 .account-register-container {
@@ -517,6 +515,14 @@ form .col-md-4 {
     min-height: 70vh;
     padding-top: 40px;
     margin-bottom: 30px;
+    min-width: 992px;
+}
+
+.register-container {
+    min-height: 70vh;
+    padding-top: 40px;
+    margin-bottom: 30px;
+    padding-left: 30px;
 }
 
 .order-create-container {
@@ -524,6 +530,7 @@ form .col-md-4 {
     padding-top: 40px;
     margin-bottom: 30px;
     padding-left: 30px;
+    min-width: 995px;
 }
 
 .cart-product-column {
@@ -532,6 +539,14 @@ form .col-md-4 {
     vertical-align: middle!important;
 }
 
+.order-create-container .cart-product-column {
+    max-width: 130px;
+}
+
+.cart-product-column-name {
+    width: 220px;
+}
+
 .cart-subtotal-label {
     font-size: 12px;
     color: #404040;
@@ -576,16 +591,21 @@ form .col-md-4 {
    color: white;
    font-size: 8px;
    width: 40px;
-   margin-top: 10px;
    height: 40px;
    background-color:transparent;
    border:none;
+   margin-top: 25px;
+   margin-left:15px;
 }
 
     .cart-refresh-button:hover {
         background-color:transparent;
     }
 
+.cart-totals {
+    border-bottom:none!important;
+}
+
 .input-validation-error {
     border: 1px solid #fb0d0d;
 }
@@ -603,6 +623,10 @@ form .col-md-4 {
     margin-top: 30px;
 }
 
+.form-horizontal .form-group {
+    margin-right: 0px!important;
+}
+
 .form-control:focus {
     border-color: #83d01b;
 }
@@ -725,7 +749,8 @@ form .col-md-4 {
     background-color: #FFFFFF;
     min-width: 160px;
     box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
-    left: 100px;
+    /*left: 100px;*/
+    right: 0px;
 }
 
 .login-user-dropdown-content a {
@@ -741,6 +766,10 @@ form .col-md-4 {
     display: block;
 }
 
+.down-arrow:hover > .login-user-dropdown-content {
+    display: block;
+}
+
 .login-user-dropdown-content a:hover {
     color: #83d01b;
 }
@@ -772,7 +801,7 @@ form .col-md-4 {
 
 .next {
     position: absolute;
-    right: 0;
+    right: 15px;
     top: 0;
 }
 
@@ -796,6 +825,18 @@ form .col-md-4 {
     text-transform: uppercase;
 }
 
+.navbar-nav {
+    margin-top: 10px;
+    margin-bottom: 7.5px;
+    margin-right: -10px;
+    float: right;
+}
+
+@media screen and (max-width: 1195px) {
+    .cart-product-column-name {
+        display:none;
+    }
+}
 
 /* Hide/rearrange for smaller screens */
 @media screen and (max-width: 767px) {
@@ -808,17 +849,17 @@ form .col-md-4 {
         text-align: left;
         margin-top: -15px;
     }
-}
 
-@media screen and (max-width: 415px) {
-    .btn-brand-small-filter {
-        width: 40px;
-        padding:10px 10px 10px 10px;
-        font-size: 10px;
+    .cart-product-column-brand {
+        display:none;
     }
+}
 
-    .btn-brand-small-filter::before {
-        content: '->';
-        color: white;
+@media screen and (min-width: 992px) {
+    .form-input {
+        width: 360px;
+        max-width: 360px;
     }
 }
+
+

src/Web/WebMVC/wwwroot/images/arrow-right.svg

@@ -0,0 +1 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'><svg enable-background="new 0 0 32 32" height="32px" id="Слой_1" version="1.1" viewBox="0 0 32 32" width="32px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path clip-rule="evenodd" d="M21.698,15.286l-9.002-8.999  c-0.395-0.394-1.035-0.394-1.431,0c-0.395,0.394-0.395,1.034,0,1.428L19.553,16l-8.287,8.285c-0.395,0.394-0.395,1.034,0,1.429  c0.395,0.394,1.036,0.394,1.431,0l9.002-8.999C22.088,16.325,22.088,15.675,21.698,15.286z" fill="#FFFFFF" fill-rule="evenodd" id="Chevron_Right"/><g/><g/><g/><g/><g/><g/></svg>