Closes smartstore#628 Issues with new TitleTag for Topics

Michael-Herzog · Michael-Herzog · commit a00829223dc1 · 2015-02-20T17:12:27.000+01:00
diff --git a/src/Presentation/SmartStore.Web/Content/bootstrap/custom/custom.less b/src/Presentation/SmartStore.Web/Content/bootstrap/custom/custom.less
@@ -133,8 +133,8 @@ span.field-validation-error {
 // WELL TWEAKS
 // ------------
 .well {
-	background-color: #fafafa;
 	border: 1px solid #e5e5e5;
+    border-color: rgba(0,0,0, 0.1);
 	border-radius: 3px;
 	.box-shadow(inset 0 0 10px rgba(0,0,0, 0.05));
 }
diff --git a/src/Presentation/SmartStore.Web/Controllers/TopicController.cs b/src/Presentation/SmartStore.Web/Controllers/TopicController.cs
@@ -59,7 +59,7 @@ protected TopicModel PrepareTopicModel(string systemName)
                 MetaKeywords = topic.GetLocalized(x => x.MetaKeywords),
                 MetaDescription = topic.GetLocalized(x => x.MetaDescription),
                 MetaTitle = topic.GetLocalized(x => x.MetaTitle),
-                TitleTag = topic.TitleTag,
+                TitleTag = topic.TitleTag ?? "h3",
             };
             return model;
         }
diff --git a/src/Presentation/SmartStore.Web/Infrastructure/DefaultWidgetSelector.cs b/src/Presentation/SmartStore.Web/Infrastructure/DefaultWidgetSelector.cs
@@ -143,7 +143,7 @@ public virtual IEnumerable<WidgetRouteInfo> GetWidgets(string widgetZone, object
 										ShowTitle = widget.ShowTitle,
 										IsBordered = widget.Bordered,
 										Title = String.IsNullOrEmpty(widget.Title) ? "div" : widget.Title,
-                                        TitleTag = widget.TitleTag,
+                                        TitleTag = widget.TitleTag ?? "h3",
 										Html = widget.Body
 									} }
 								}
diff --git a/src/Presentation/SmartStore.Web/Themes/Alpha/Content/product.less b/src/Presentation/SmartStore.Web/Themes/Alpha/Content/product.less
@@ -156,7 +156,8 @@
 	margin: 0 0 0 5px;
 }
 .product-details-page .price-details {
-    text-shadow: 0 -1px 0 #fff;
+    padding: 8px !important;
+	margin: 0;
     .base-price {
         text-align: center;
         font-size: .85em;
@@ -186,11 +187,6 @@
 .product-details-page #details-cnt .short-description {
 	color: #aaa;
 }
-.product-details-page .price-details {
-	background: #f8fafc;
-	padding: 8px !important;
-	margin: 0;
-}
 .product-details-page #details-cnt .price-details + div {
 	border-top: none;
 }
diff --git a/src/Presentation/SmartStore.Web/Themes/Alpha/theme.config b/src/Presentation/SmartStore.Web/Themes/Alpha/theme.config
@@ -96,7 +96,7 @@
     <Var name="ContainerBorder" type="Color">#d6e0e6</Var>
 
     <!-- Misc -->
-    <Var name="WellBackground" type="Color">#f5f5f5</Var>
+    <Var name="WellBackground" type="Color">#fafafa</Var>
     <Var name="ItemBoxBoxShadowColor" type="Color">#f89406</Var>
     <Var name="SimpleBoxHeaderColor" type="Color">#ddd</Var>
     <Var name="ProductFilterBackgroundColor" type="Color">#f4f8f9</Var>

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ protected TopicModel PrepareTopicModel(string systemName)`
`59`	`59`	`MetaKeywords = topic.GetLocalized(x => x.MetaKeywords),`
`60`	`60`	`MetaDescription = topic.GetLocalized(x => x.MetaDescription),`
`61`	`61`	`MetaTitle = topic.GetLocalized(x => x.MetaTitle),`
`62`		`- TitleTag = topic.TitleTag,`
	`62`	`+ TitleTag = topic.TitleTag ?? "h3",`
`63`	`63`	`};`
`64`	`64`	`return model;`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ public virtual IEnumerable<WidgetRouteInfo> GetWidgets(string widgetZone, object`
`143`	`143`	`ShowTitle = widget.ShowTitle,`
`144`	`144`	`IsBordered = widget.Bordered,`
`145`	`145`	`Title = String.IsNullOrEmpty(widget.Title) ? "div" : widget.Title,`
`146`		`- TitleTag = widget.TitleTag,`
	`146`	`+ TitleTag = widget.TitleTag ?? "h3",`
`147`	`147`	`Html = widget.Body`
`148`	`148`	`} }`
`149`	`149`	`}`