From 90e5440518e8f62375382873e70eb1d4bc4ef4ca Mon Sep 17 00:00:00 2001
From: antoine <antoine@lecoati.com>
Date: Wed, 28 May 2014 15:33:36 +0200
Subject: [PATCH] bootstrap3 ; issue + hx style issue

---
 .../src/tuning/tuning.defaultStyle.less              |  1 +
 src/Umbraco.Web.UI/Umbraco/js/tuning.config.js       |  8 +++++++-
 src/Umbraco.Web.UI/Umbraco/js/tuning.front.js        | 12 ++++++------
 .../Views/Partials/Grid/bootstrap3.cshtml            |  6 +++---
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/tuning/tuning.defaultStyle.less b/src/Umbraco.Web.UI.Client/src/tuning/tuning.defaultStyle.less
index 6b6565ce5f..b34efa3a37 100644
--- a/src/Umbraco.Web.UI.Client/src/tuning/tuning.defaultStyle.less
+++ b/src/Umbraco.Web.UI.Client/src/tuning/tuning.defaultStyle.less
@@ -208,6 +208,7 @@
 
 h1, h2, h3, h4, h5, h6 {
     text-rendering: optimizelegibility;
+    margin:2px;
 }
 
 h1 {
diff --git a/src/Umbraco.Web.UI/Umbraco/js/tuning.config.js b/src/Umbraco.Web.UI/Umbraco/js/tuning.config.js
index 5b2acc6558..06bc76ddd2 100644
--- a/src/Umbraco.Web.UI/Umbraco/js/tuning.config.js
+++ b/src/Umbraco.Web.UI/Umbraco/js/tuning.config.js
@@ -240,6 +240,7 @@ var tuningConfig = {
             name: "General",
             subSections: [{
                 name: "Main",
+                schema: ".content",
                 fields: [{
                     name: "Layout",
                     alias: "stylingMainColumnBoxed",
@@ -304,6 +305,7 @@ var tuningConfig = {
             },
             {
                 name: "Header",
+                schema: "header",
                 fields: [{
                     name: "Top Border Size",
                     alias: "stylingHeaderTopBorderSize",
@@ -453,6 +455,7 @@ var tuningConfig = {
             },
             {
                 name: "Social Links",
+                schema: ".social-row",
                 fields: [{
                     name: "Display",
                     alias: "stySocialDisplay",
@@ -557,6 +560,7 @@ var tuningConfig = {
             },
             {
                 name: "Thumbnails",
+                schema: ".thumbnail",
                 fields: [{
                     name: "Background Color",
                     alias: "stylingThumbnailsBackgroundColor",
@@ -647,6 +651,7 @@ var tuningConfig = {
             },
             {
                 name: "Navigation",
+                schema: ".nav",
                 fields: [{
                     name: "Font Color",
                     alias: "FontNavFontColor",
@@ -694,6 +699,7 @@ var tuningConfig = {
             },
             {
                 name: "Social Link",
+                schema: "social-row",
                 fields: [{
                     name: "Font Color",
                     alias: "FontSocialFontColor",
@@ -1332,7 +1338,7 @@ var tuningConfig = {
             },
             {
                 name: "Link",
-                name: "a",
+                schema: "p a",
                 fields: [{
                     name: "Color",
                     alias: "FontLinkColor",
diff --git a/src/Umbraco.Web.UI/Umbraco/js/tuning.front.js b/src/Umbraco.Web.UI/Umbraco/js/tuning.front.js
index 9b3de57149..1038ed0304 100644
--- a/src/Umbraco.Web.UI/Umbraco/js/tuning.front.js
+++ b/src/Umbraco.Web.UI/Umbraco/js/tuning.front.js
@@ -6,7 +6,9 @@ var refrechLayout = function (parameters) {
 
     // Disable links
     $('a').addClass("myDisable");
-    $('a').bind("click.myDisable", function () { return false; });
+    $('a').bind("click.myDisable", function () {
+            return false;
+    });
 
     var string = "less.modifyVars({" + parameters.join(",") + "})";
     eval(string);
@@ -76,7 +78,7 @@ var initIntelTuning = function (tuningModel) {
     if (tuningModel) {
 
         // Add tuning-over attr for each schema from config
-        $.each(tuningModel.categories, function (key, category) {
+        $.each(tuningModel.categories, function (key, category) { 
             $.each(category.sections, function (key, section) {
                 $.each(section.subSections, function (key, subSection) {
                     if (subSection.schema) {
@@ -100,15 +102,13 @@ var initIntelTuning = function (tuningModel) {
 
             if (target.attr('tuning-over') != undefined || target.attr('tuning-over') != '') {
                 target.unbind();
-
-
                 target.css('outline', '2px solid #a4c6fd');
-
-
                 target.click(function (e) {
                     e.stopPropagation();
+                    e.preventDefault();
                     console.info(target.attr('tuning-over'));
                     parent.refrechIntelTuning(target.attr('tuning-over'));
+                    return false;
                 });
             }
         });
diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/bootstrap3.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/bootstrap3.cshtml
index bc6740f05d..22a5dc10cd 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/bootstrap3.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/bootstrap3.cshtml
@@ -12,7 +12,7 @@
                 <div class="col-md-@column.grid column usky-grid-column">
                     @foreach (var row in column.rows)
                     {
-                        <div class="@row.cssClass @(row.fullScreen == "True" ? "usky-grid-full-size" : "")">
+                        <div class="@row.cssClass">
                             <div>
                                 <div class="row clearfix usky-grid-row">
 
@@ -31,7 +31,7 @@
                                                         {
                                                             case "rte":
                                                                  <text>
-                                                                    @Html.Raw(TemplateUtilities.ParseInternalLinks(control.value.ToString()));
+                                                                    @Html.Raw(TemplateUtilities.ParseInternalLinks(control.value.ToString()))
                                                                  </text>    
                                                             break;
                                                             case "macro":
@@ -79,7 +79,7 @@
                                                                 break;
                                                             case "embed":
                                                                      <text>
-                                                                        @Html.Raw(control.value);
+                                                                        @Html.Raw(control.value)
                                                                      </text>
                                                                 break;
                                                             default: