Merge pull request #306 from cloudscribe/dev

merge changes from dev
cloudscribe · Jul 22, 2018 · 07de07f · 07de07f
2 parents 9d41fd7 + 4ccfd97
commit 07de07f
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 8 deletions.
diff --git a/...pleContent.ContentTemplates.Bootstrap4/Views/Shared/ContentTemplates/BingMapRender.cshtml b/...pleContent.ContentTemplates.Bootstrap4/Views/Shared/ContentTemplates/BingMapRender.cshtml
@@ -34,4 +34,3 @@
 {
     <script type='text/javascript' src='https://www.bing.com/api/maps/mapcontrol?callback=loadMapScenario&key=@Model.ApiKey' async defer></script>
 }
-
diff --git a/...tent.ContentTemplates.Bootstrap4/Views/Shared/GalleryWithContentRenderCardsPartial.cshtml b/...tent.ContentTemplates.Bootstrap4/Views/Shared/GalleryWithContentRenderCardsPartial.cshtml
@@ -7,13 +7,16 @@
 <div class="row gallery-block cards-gallery simple-gallery">
     @for (int i = 0; i < Model.Items.Count; i++)
     {
-        <div class="col-md-6 col-lg-4">
+        <div class="col-md-6 col-lg-4  gallery-item">
             <div class="card border-0 transform-on-hover">
                 <a class="lightbox" href="@Model.Items[i].ResizedUrl">
                     <img src="@Model.Items[i].ResizedUrl" alt="@Model.Items[i].Description" class="card-img-top">
                 </a>
                 <div class="card-body">
-                    <h6><a href="#">@Model.Items[i].Title</a></h6>
+                    @if (!string.IsNullOrWhiteSpace(@Model.Items[i].Title))
+                    {
+                        <h6>@Model.Items[i].Title</h6>
+                    }
                     <p class="text-muted card-text">@Model.Items[i].Description</p>
                 </div>
             </div>

diff --git a/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap4/css/simple-gallery.css b/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap4/css/simple-gallery.css
@@ -151,4 +151,8 @@ opacity: 1;
         width: 690px;
     }
 }
+/* IE 11 fixes */
+body.IE .cards-gallery .lightbox {
+    flex: 0 0 auto;
+}
 
diff --git a/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap4/css/simple-gallery.min.css b/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap4/css/simple-gallery.min.css
diff --git a/src/sourceDev.WebApp/sitefiles/s1/themes/custom1/Shared/_Layout.cshtml b/src/sourceDev.WebApp/sitefiles/s1/themes/custom1/Shared/_Layout.cshtml
@@ -27,13 +27,16 @@ var ieBodyClass = isIE ? "IE" : "";
     @RenderSection("Meta", required: false)
     <environment names="Development">
         <link rel="stylesheet" href="~/css/style.css" cs-resolve-theme-resource="true" cs-tenant="@Tenant" />
-        
+
     </environment>
     <environment names="Staging,Production">
         <link rel="stylesheet" href="~/css/style.min.css" cs-resolve-theme-resource="true" cs-tenant="@Tenant" />
-
     </environment>
     @RenderSection("Styles", required: false)
+    @if (isIE)
+    {
+        <link rel="stylesheet" href="~/css/ie11.css" />
+    }
     <google-analytics profile-id="@Tenant.GoogleAnalyticsProfileId" user-id="@User.GetUserId()"></google-analytics>
     <base href="@Context.Request.Path" />
 </head>
@@ -58,7 +61,7 @@ var ieBodyClass = isIE ? "IE" : "";
     </header>
     <div id="wrapper" class="container-fluid cs-container flex-fill">
         @await Component.InvokeAsync("Navigation", new { viewName = "Bootstrap4Breadcrumbs", filterName = NamedNavigationFilters.Breadcrumbs, startingNodeKey = "" })
-        <div class="row">
+        <div class="row mainrow">
             <main id="content" role="main" class="col order-3">
                 @await Html.PartialAsync("AlertsPartial")
                 @RenderBody()

diff --git a/src/sourceDev.WebApp/wwwroot/css/ie11.css b/src/sourceDev.WebApp/wwwroot/css/ie11.css
@@ -0,0 +1,17 @@
+/*body  {
+    flex: 0 0 auto;
+}*/
+body {
+
+}
+
+header, footer {
+
+}
+
+.cards-gallery .lightbox {
+    flex: 0 0 auto;
+}
+#wrapper {
+
+}
diff --git a/src/sourceDev.WebApp/wwwroot/css/simple-gallery.css b/src/sourceDev.WebApp/wwwroot/css/simple-gallery.css
@@ -151,4 +151,8 @@ opacity: 1;
         width: 690px;
     }
 }
+/* IE 11 fixes */
+body.IE .cards-gallery .lightbox {
+    flex: 0 0 auto;
+}
 
diff --git a/src/sourceDev.WebApp/wwwroot/css/simple-gallery.min.css b/src/sourceDev.WebApp/wwwroot/css/simple-gallery.min.css