From cc3c8c374166c7396254e47b1c2a49977a40217d Mon Sep 17 00:00:00 2001
From: WillAnd <will.anderson@thought.co.uk>
Date: Mon, 15 Jun 2015 18:59:58 +0100
Subject: [PATCH] Fix display issues

---
 .../Admin/Content/Styles/ecommerce-admin.css  |  2 +-
 .../AddSpecification.cshtml                   | 54 +++++++++----------
 .../Admin/Views/ProductVariant/Details.cshtml |  2 +-
 .../Areas/Admin/Views/Webpage/Brand.cshtml    |  4 +-
 .../Areas/Admin/Views/Webpage/Category.cshtml |  4 +-
 5 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/MrCMS.Web/Apps/Ecommerce/Areas/Admin/Content/Styles/ecommerce-admin.css b/MrCMS.Web/Apps/Ecommerce/Areas/Admin/Content/Styles/ecommerce-admin.css
index b2b026149..be05d1bec 100644
--- a/MrCMS.Web/Apps/Ecommerce/Areas/Admin/Content/Styles/ecommerce-admin.css
+++ b/MrCMS.Web/Apps/Ecommerce/Areas/Admin/Content/Styles/ecommerce-admin.css
@@ -11,7 +11,7 @@ span.peter-river { background-color: #3498db; color: #ffffff !important; text-sh
 
 tr.error { color: initial; }
 
-.select2-container .select2-choice { height: 55px; }
+.select2-container .select2-choice { height: 55px !important; }
 
 /*Reports*/
 legend { border: none !important; margin: 0 0 10px 0 !important; }
diff --git a/MrCMS.Web/Apps/Ecommerce/Areas/Admin/Views/EcommerceSearchablePage/AddSpecification.cshtml b/MrCMS.Web/Apps/Ecommerce/Areas/Admin/Views/EcommerceSearchablePage/AddSpecification.cshtml
index 74a95f386..58791727d 100644
--- a/MrCMS.Web/Apps/Ecommerce/Areas/Admin/Views/EcommerceSearchablePage/AddSpecification.cshtml
+++ b/MrCMS.Web/Apps/Ecommerce/Areas/Admin/Views/EcommerceSearchablePage/AddSpecification.cshtml
@@ -14,43 +14,39 @@
     </legend>
 
     @Html.Hidden("categoryId", category != null ? category.Id : 0)
-    <br />
-    <br />
-    <div class="modal-body-container">
-        <div id="specifications">
-            @if (Model.Any())
+    <div id="specifications">
+        @if (Model.Any())
             {
-                <table class="table table-striped table-condensed">
-                    <thead>
-                        <tr>
-                            <th>
-                                Name
-                            </th>
-                            <th>
-                            </th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach (var specification in Model)
+            <table class="table table-striped table-condensed">
+                <thead>
+                    <tr>
+                        <th>
+                            Name
+                        </th>
+                        <th>
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach (var specification in Model)
                         {
-                            <tr>
-                                <td>@specification.Name</td>
-                                <td>
-                                    <button class="btn btn-success add-specification" data-specification-id="@specification.Id">Add</button>
+                        <tr>
+                            <td>@specification.Name</td>
+                            <td>
+                                <button class="btn btn-success add-specification" data-specification-id="@specification.Id">Add</button>
 
-                                </td>
-                            </tr>
+                            </td>
+                        </tr>
                         }
-                    </tbody>
-                </table>
+                </tbody>
+            </table>
             }
             else
             {
-                <p>
-                    All available specifications are hidden
-                </p>
+            <p>
+                All available specifications are hidden
+            </p>
             }
-        </div>
     </div>
 </fieldset>
 @{ Html.IncludeScript("~/Apps/Ecommerce/Areas/Admin/Content/Scripts/custom/async-paging.js"); }
diff --git a/MrCMS.Web/Apps/Ecommerce/Areas/Admin/Views/ProductVariant/Details.cshtml b/MrCMS.Web/Apps/Ecommerce/Areas/Admin/Views/ProductVariant/Details.cshtml
index 9742b2c9c..557a809c8 100644
--- a/MrCMS.Web/Apps/Ecommerce/Areas/Admin/Views/ProductVariant/Details.cshtml
+++ b/MrCMS.Web/Apps/Ecommerce/Areas/Admin/Views/ProductVariant/Details.cshtml
@@ -5,7 +5,7 @@
     var productVariantTypeOptions = ViewData["product-variant-type-options"] as List<SelectListItem> ?? new List<SelectListItem>();
     var eTagOptions = ViewData["e-tag-options"] as List<SelectListItem> ?? new List<SelectListItem>();
 }
-<div id="details" class="tab-pane active">
+<div id="details" class="tab-pane active" style="padding-left: 5px; padding-right: 5px;">
     @Html.HiddenFor(variant => variant.Product.Id)
     <div class="row">
         <div class="col-xs-6">
diff --git a/MrCMS.Web/Apps/Ecommerce/Areas/Admin/Views/Webpage/Brand.cshtml b/MrCMS.Web/Apps/Ecommerce/Areas/Admin/Views/Webpage/Brand.cshtml
index 727a76358..85e048471 100644
--- a/MrCMS.Web/Apps/Ecommerce/Areas/Admin/Views/Webpage/Brand.cshtml
+++ b/MrCMS.Web/Apps/Ecommerce/Areas/Admin/Views/Webpage/Brand.cshtml
@@ -1,13 +1,13 @@
 @model MrCMS.Web.Apps.Ecommerce.Pages.Brand
 
 <div class="row">
-    <div class="col-sm-4">
+    <div class="col-sm-6">
         <div class="form-group">
             @Html.LabelFor(brand => brand.FeatureImage)<br />
             @Html.TextBoxFor(brand => brand.FeatureImage, new { data_type = "media-selector" })
         </div>
     </div>
-    <div class="col-sm-8">
+    <div class="col-sm-6">
         <div class="form-group">
             @Html.LabelFor(brand => brand.BrandAbstract)
             @Html.TextAreaFor(brand => brand.BrandAbstract, 4, 100, new { @class = "form-control" })
diff --git a/MrCMS.Web/Apps/Ecommerce/Areas/Admin/Views/Webpage/Category.cshtml b/MrCMS.Web/Apps/Ecommerce/Areas/Admin/Views/Webpage/Category.cshtml
index e4c8d0e0b..b2ebfe049 100644
--- a/MrCMS.Web/Apps/Ecommerce/Areas/Admin/Views/Webpage/Category.cshtml
+++ b/MrCMS.Web/Apps/Ecommerce/Areas/Admin/Views/Webpage/Category.cshtml
@@ -2,7 +2,7 @@
 @using MrCMS.Helpers
 @model MrCMS.Web.Apps.Ecommerce.Pages.Category
 <div class="row">
-    <div class="col-lg-3">
+    <div class="col-lg-6">
         <div class="form-group">
             @Html.LabelFor(webpage => webpage.FeatureImage)<br />
             @Html.TextBoxFor(webpage => webpage.FeatureImage, new { @class = "media-selector" })
@@ -11,7 +11,7 @@
             @Html.InlineCheckboxFor(x => x.ShowSubCategories)
         </div>
     </div>
-    <div class="col-lg-9">
+    <div class="col-lg-6">
         <div class="form-group">
             @Html.LabelFor(category => category.CategoryAbstract)
             @Html.TextAreaFor(category => category.CategoryAbstract, new { rows = 4, @class = "form-control" })