Skip to content

Commit

Permalink
Fix display issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Will-Bill committed Jun 15, 2015
1 parent 134311a commit cc3c8c3
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 35 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"); }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
Original file line number Diff line number Diff line change
@@ -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" })
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" })
Expand All @@ -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" })
Expand Down

0 comments on commit cc3c8c3

Please sign in to comment.