diff --git a/src/Umbraco.Web.UI.Client/src/tuning/config/tuning.palettes.js b/src/Umbraco.Web.UI.Client/src/tuning/config/tuning.palettes.js
index 56789d102e..5d1148ea51 100644
--- a/src/Umbraco.Web.UI.Client/src/tuning/config/tuning.palettes.js
+++ b/src/Umbraco.Web.UI.Client/src/tuning/config/tuning.palettes.js
@@ -3,208 +3,30 @@
/* Tuning palette tab config */
/*********************************************************************************************************/
-var tuningPalette = [{
- name: "orange",
- mainColor: 'rgb(230, 126, 34)',
- colors: [
- { alias: "backgroundBodyColor", value: "rgb(239, 239, 239)" },
- { alias: "backgroundBodyGradientColor", value: "" },
- { alias: "backgroundMainColumnColor", value: "rgb(246, 246, 246)" },
- { alias: "backgroundMainColumnGradientColor", value: "" },
- { alias: "backgroundHeaderColor", value: "rgb(51, 51, 51)" },
- { alias: "backgroundHeaderGradientColor", value: "" },
- { alias: "backgroundFooterColor", value: "rgb(51, 51, 51)" },
- { alias: "backgroundFooterGradientColor", value: "" },
- { alias: "stylingHeaderTopBorderColor", value: "rgb(230, 126, 34)" },
- { alias: "stylingHeaderBottomBorderColor", value: "rgb(230, 126, 34)" },
- { alias: "stylingNavBackgroundColor", value: "" },
- { alias: "stylingNavBackgroundDdl", value: "rgba(97, 97, 97, 0.85)" },
- { alias: "stylingNavBackgroundActiveColor", value: "rgb(230, 126, 34)" },
- { alias: "stylingNavItemTopBorderActiveColor", value: "rgb(230, 126, 34)" },
- { alias: "stylingNavItemBottomBorderActiveColor", value: "rgb(230, 126, 34)" },
- { alias: "stySocialBackgroundColor", value: "rgba(255, 255, 255, 0.08)" },
- { alias: "stySocialBorderTopColor", value: "rgb(230, 126, 34)" },
- { alias: "stySocialBorderBottomColor", value: "rgb(230, 126, 34)" },
- { alias: "stylingBoxesBackgroundColor", value: "" },
- { alias: "stylingBoxesBorderColor", value: "" },
- { alias: "stylingThumbnailsBackgroundColor", value: "" },
- { alias: "stylingThumbnailsBorderColor", value: "" },
- { alias: "FontBodyColor", value: "" },
- { alias: "FontNavFontColor", value: "rgba(255, 255, 255, 0.84)" },
- { alias: "FontNavFontActiveColor", value: "rgb(255, 255, 255)" },
- { alias: "FontSocialFontColor", value: "rgba(255, 255, 255, 0.6)" },
- { alias: "FontSocialFontColorHover", value: "rgb(255, 255, 255)" },
- { alias: "FontH1Color", value: "rgb(230, 126, 34)" },
- { alias: "FontH2Color", value: "rgb(230, 126, 34)" },
- { alias: "FontH3Color", value: "rgb(230, 126, 34)" },
- { alias: "FontH4Color", value: "" },
- { alias: "FontH5Color", value: "" },
- { alias: "FontH6Color", value: "" },
- { alias: "FontMediumColor", value: "" },
- { alias: "FontHighlightedColor", value: "" },
- { alias: "FontHighlightedBackgroundColor", value: "rgb(230, 126, 34)" },
- { alias: "FontBigColor", value: "rgb(230, 126, 34)" },
- { alias: "FontButtonColor", value: "rgba(255, 255, 255, 0.92)" },
- { alias: "FontButtonBackgroundColor", value: "rgb(230, 126, 34)" },
- { alias: "FontButtonColorHover", value: "rgba(255, 255, 255, 0.55)" },
- { alias: "FontButtonBackgroundColorHover", value: "rgba(230, 126, 34, 0.74)" },
- { alias: "FontColor2Color", value: "rgb(230, 126, 34)" },
- { alias: "FontColor3Color", value: "rgba(253, 251, 251, 0.91)" },
- { alias: "FontColor4Color", value: "rgb(170, 170, 170)" },
- { alias: "FontLinkColor", value: "rgb(230, 126, 34)" },
- { alias: "FontLinkColorHover", value: "rgba(230, 126, 34, 0.84)" }
- ]
-}, {
- name: "red",
- mainColor: 'rgb(158, 22, 23)',
- colors: [
- { alias: "backgroundBodyColor", value: "rgb(239, 239, 239)" },
- { alias: "backgroundBodyGradientColor", value: "" },
- { alias: "backgroundMainColumnColor", value: "rgb(246, 246, 246)" },
- { alias: "backgroundMainColumnGradientColor", value: "" },
- { alias: "backgroundHeaderColor", value: "rgb(51, 51, 51)" },
- { alias: "backgroundHeaderGradientColor", value: "" },
- { alias: "backgroundFooterColor", value: "rgb(51, 51, 51)" },
- { alias: "backgroundFooterGradientColor", value: "" },
- { alias: "stylingHeaderTopBorderColor", value: "rgb(158, 22, 23)" },
- { alias: "stylingHeaderBottomBorderColor", value: "rgb(158, 22, 23)" },
- { alias: "stylingNavBackgroundColor", value: "" },
- { alias: "stylingNavBackgroundDdl", value: "rgba(97, 97, 97, 0.85)" },
- { alias: "stylingNavBackgroundActiveColor", value: "rgb(158, 22, 23)" },
- { alias: "stylingNavItemTopBorderActiveColor", value: "rgb(158, 22, 23)" },
- { alias: "stylingNavItemBottomBorderActiveColor", value: "rgb(158, 22, 23)" },
- { alias: "stySocialBackgroundColor", value: "rgba(255, 255, 255, 0.08)" },
- { alias: "stySocialBorderTopColor", value: "rgb(158, 22, 23)" },
- { alias: "stySocialBorderBottomColor", value: "rgb(158, 22, 23)" },
- { alias: "stylingBoxesBackgroundColor", value: "" },
- { alias: "stylingBoxesBorderColor", value: "" },
- { alias: "stylingThumbnailsBackgroundColor", value: "" },
- { alias: "stylingThumbnailsBorderColor", value: "" },
- { alias: "FontBodyColor", value: "" },
- { alias: "FontNavFontColor", value: "rgba(255, 255, 255, 0.84)" },
- { alias: "FontNavFontActiveColor", value: "rgb(255, 255, 255)" },
- { alias: "FontSocialFontColor", value: "rgba(255, 255, 255, 0.6)" },
- { alias: "FontSocialFontColorHover", value: "rgb(255, 255, 255)" },
- { alias: "FontH1Color", value: "rgb(158, 22, 23)" },
- { alias: "FontH2Color", value: "rgb(158, 22, 23)" },
- { alias: "FontH3Color", value: "rgb(158, 22, 23)" },
- { alias: "FontH4Color", value: "" },
- { alias: "FontH5Color", value: "" },
- { alias: "FontH6Color", value: "" },
- { alias: "FontMediumColor", value: "" },
- { alias: "FontHighlightedColor", value: "" },
- { alias: "FontHighlightedBackgroundColor", value: "rgb(158, 22, 23)" },
- { alias: "FontBigColor", value: "rgb(158, 22, 23)" },
- { alias: "FontButtonColor", value: "rgba(255, 255, 255, 0.92)" },
- { alias: "FontButtonBackgroundColor", value: "rgb(158, 22, 23)" },
- { alias: "FontButtonColorHover", value: "rgba(255, 255, 255, 0.55)" },
- { alias: "FontButtonBackgroundColorHover", value: "rgba(158, 22, 23, 0.74)" },
- { alias: "FontColor2Color", value: "rgb(158, 22, 23)" },
- { alias: "FontColor3Color", value: "rgba(253, 251, 251, 0.91)" },
- { alias: "FontColor4Color", value: "rgb(170, 170, 170)" },
- { alias: "FontLinkColor", value: "rgb(158, 22, 23)" },
- { alias: "FontLinkColorHover", value: "rgba(158, 22, 23, 0.84)" }
- ]
-}, {
- name: "green",
- mainColor: 'rgb(138, 198, 10)',
- colors: [
- { alias: "backgroundBodyColor", value: "rgb(239, 239, 239)" },
- { alias: "backgroundBodyGradientColor", value: "" },
- { alias: "backgroundMainColumnColor", value: "rgb(246, 246, 246)" },
- { alias: "backgroundMainColumnGradientColor", value: "" },
- { alias: "backgroundHeaderColor", value: "rgb(51, 51, 51)" },
- { alias: "backgroundHeaderGradientColor", value: "" },
- { alias: "backgroundFooterColor", value: "rgb(51, 51, 51)" },
- { alias: "backgroundFooterGradientColor", value: "" },
- { alias: "stylingHeaderTopBorderColor", value: "rgb(138, 198, 10)" },
- { alias: "stylingHeaderBottomBorderColor", value: "rgb(138, 198, 10)" },
- { alias: "stylingNavBackgroundColor", value: "" },
- { alias: "stylingNavBackgroundDdl", value: "rgba(97, 97, 97, 0.85)" },
- { alias: "stylingNavBackgroundActiveColor", value: "rgb(138, 198, 10)" },
- { alias: "stylingNavItemTopBorderActiveColor", value: "rgb(138, 198, 10)" },
- { alias: "stylingNavItemBottomBorderActiveColor", value: "rgb(138, 198, 10)" },
- { alias: "stySocialBackgroundColor", value: "rgba(255, 255, 255, 0.08)" },
- { alias: "stySocialBorderTopColor", value: "rgb(138, 198, 10)" },
- { alias: "stySocialBorderBottomColor", value: "rgb(138, 198, 10)" },
- { alias: "stylingBoxesBackgroundColor", value: "" },
- { alias: "stylingBoxesBorderColor", value: "" },
- { alias: "stylingThumbnailsBackgroundColor", value: "" },
- { alias: "stylingThumbnailsBorderColor", value: "" },
- { alias: "FontBodyColor", value: "" },
- { alias: "FontNavFontColor", value: "rgba(255, 255, 255, 0.84)" },
- { alias: "FontNavFontActiveColor", value: "rgb(255, 255, 255)" },
- { alias: "FontSocialFontColor", value: "rgba(255, 255, 255, 0.6)" },
- { alias: "FontSocialFontColorHover", value: "rgb(255, 255, 255)" },
- { alias: "FontH1Color", value: "rgb(138, 198, 10)" },
- { alias: "FontH2Color", value: "rgb(138, 198, 10)" },
- { alias: "FontH3Color", value: "rgb(138, 198, 10)" },
- { alias: "FontH4Color", value: "" },
- { alias: "FontH5Color", value: "" },
- { alias: "FontH6Color", value: "" },
- { alias: "FontMediumColor", value: "" },
- { alias: "FontHighlightedColor", value: "" },
- { alias: "FontHighlightedBackgroundColor", value: "rgb(138, 198, 10)" },
- { alias: "FontBigColor", value: "rgb(138, 198, 10)" },
- { alias: "FontButtonColor", value: "rgba(255, 255, 255, 0.92)" },
- { alias: "FontButtonBackgroundColor", value: "rgb(138, 198, 10)" },
- { alias: "FontButtonColorHover", value: "rgba(255, 255, 255, 0.55)" },
- { alias: "FontButtonBackgroundColorHover", value: "rgba(138, 198, 10, 0.74)" },
- { alias: "FontColor2Color", value: "rgb(138, 198, 10)" },
- { alias: "FontColor3Color", value: "rgba(253, 251, 251, 0.91)" },
- { alias: "FontColor4Color", value: "rgb(170, 170, 170)" },
- { alias: "FontLinkColor", value: "rgb(138, 198, 10)" },
- { alias: "FontLinkColorHover", value: "rgba(138, 198, 10, 0.84)" }
- ]
-}, {
- name: "blue",
- mainColor: 'rgb(24, 94, 101)',
- colors: [
- { alias: "backgroundBodyColor", value: "rgb(239, 239, 239)" },
- { alias: "backgroundBodyGradientColor", value: "" },
- { alias: "backgroundMainColumnColor", value: "rgb(246, 246, 246)" },
- { alias: "backgroundMainColumnGradientColor", value: "" },
- { alias: "backgroundHeaderColor", value: "rgb(51, 51, 51)" },
- { alias: "backgroundHeaderGradientColor", value: "" },
- { alias: "backgroundFooterColor", value: "rgb(51, 51, 51)" },
- { alias: "backgroundFooterGradientColor", value: "" },
- { alias: "stylingHeaderTopBorderColor", value: "rgb(24, 94, 101)" },
- { alias: "stylingHeaderBottomBorderColor", value: "rgb(24, 94, 101)" },
- { alias: "stylingNavBackgroundColor", value: "" },
- { alias: "stylingNavBackgroundDdl", value: "rgba(97, 97, 97, 0.85)" },
- { alias: "stylingNavBackgroundActiveColor", value: "rgb(24, 94, 101)" },
- { alias: "stylingNavItemTopBorderActiveColor", value: "rgb(24, 94, 101)" },
- { alias: "stylingNavItemBottomBorderActiveColor", value: "rgb(24, 94, 101)" },
- { alias: "stySocialBackgroundColor", value: "rgba(255, 255, 255, 0.08)" },
- { alias: "stySocialBorderTopColor", value: "rgb(24, 94, 101)" },
- { alias: "stySocialBorderBottomColor", value: "rgb(24, 94, 101)" },
- { alias: "stylingBoxesBackgroundColor", value: "" },
- { alias: "stylingBoxesBorderColor", value: "" },
- { alias: "stylingThumbnailsBackgroundColor", value: "" },
- { alias: "stylingThumbnailsBorderColor", value: "" },
- { alias: "FontBodyColor", value: "" },
- { alias: "FontNavFontColor", value: "rgba(255, 255, 255, 0.84)" },
- { alias: "FontNavFontActiveColor", value: "rgb(255, 255, 255)" },
- { alias: "FontSocialFontColor", value: "rgba(255, 255, 255, 0.6)" },
- { alias: "FontSocialFontColorHover", value: "rgb(255, 255, 255)" },
- { alias: "FontH1Color", value: "rgb(24, 94, 101)" },
- { alias: "FontH2Color", value: "rgb(24, 94, 101)" },
- { alias: "FontH3Color", value: "rgb(24, 94, 101)" },
- { alias: "FontH4Color", value: "" },
- { alias: "FontH5Color", value: "" },
- { alias: "FontH6Color", value: "" },
- { alias: "FontMediumColor", value: "" },
- { alias: "FontHighlightedColor", value: "" },
- { alias: "FontHighlightedBackgroundColor", value: "rgb(24, 94, 101)" },
- { alias: "FontBigColor", value: "rgb(24, 94, 101)" },
- { alias: "FontButtonColor", value: "rgba(255, 255, 255, 0.92)" },
- { alias: "FontButtonBackgroundColor", value: "rgb(24, 94, 101)" },
- { alias: "FontButtonColorHover", value: "rgba(255, 255, 255, 0.55)" },
- { alias: "FontButtonBackgroundColorHover", value: "rgba(24, 94, 101, 0.74)" },
- { alias: "FontColor2Color", value: "rgb(24, 94, 101)" },
- { alias: "FontColor3Color", value: "rgba(253, 251, 251, 0.91)" },
- { alias: "FontColor4Color", value: "rgb(170, 170, 170)" },
- { alias: "FontLinkColor", value: "rgb(24, 94, 101)" },
- { alias: "FontLinkColorHover", value: "rgba(24, 94, 101, 0.84)" }
- ]
-}];
\ No newline at end of file
+var tuningPalette = [
+ {
+ name: "Preset 1",
+ mainColor: 'rgb(24, 94, 101)',
+ gf: ["Open Sans:300"],
+ colors: { "backgroundBodyColor": "rgb(234, 234, 234)", "backgroundBodyGradientColor": "rgb(255, 255, 255)", "backgroundBodyImageOrPattern": "", "backgroundBodyPosition": "top center", "backgroundBodyCover": "true", "backgroundBodyRepeat": "repeat", "backgroundBodyAttachment": "fixed", "backgroundMainColumnColor": "rgb(255, 255, 255)", "backgroundMainColumnGradientColor": "", "backgroundMainColumnImageOrPattern": "", "backgroundMainColumnPosition": "", "backgroundMainColumnCover": "true", "backgroundMainColumnRepeat": "", "backgroundMainColumnAttachment": "fixed", "backgroundHeaderColor": "rgb(243, 243, 243)", "backgroundHeaderGradientColor": "rgb(255, 255, 255)", "backgroundHeaderImageOrPattern": "", "backgroundHeaderPosition": "", "backgroundHeaderCover": "false", "backgroundHeaderRepeat": "", "backgroundHeaderAttachment": "scroll", "backgroundFooterColor": "rgb(12, 12, 12)", "backgroundFooterGradientColor": "", "backgroundFooterImageOrPattern": "", "backgroundFooterPosition": "center", "backgroundFooterCover": "true", "backgroundFooterRepeat": "", "backgroundFooterAttachment": "fixed", "stylingMainColumnBoxed": "boxed", "stylingHeaderTopMargin": "21", "stylingMainColumnTopMargin": "0", "stylingFooterTopMargin": "0", "stylingFooterBottompMargin": "20", "stylingMainColumnRadius": "0", "stylingMainColumnShadow": "21", "stylingHeaderTopBorderSize": "0", "stylingHeaderBottomBorderSize": "0", "stylingHeaderTopBorderColor": "", "stylingHeaderBottomBorderColor": "", "stylingHeaderMinHeight": "0", "stylingHeaderLogoTopMargin": "-28", "stylingNavDisplay": "float-right", "stylingNavBackgroundColor": "", "stylingNavBackgroundDdl": "rgb(255, 255, 255)", "stylingNavBackgroundActiveColor": "rgb(0, 136, 204)", "stylingNavMarginTop": "-46", "stylingNavRadius": "8", "stylingNavRadiusOnlyTop": "false", "stylingNavItemTopBorderActiveSize": "0", "stylingNavItemBottomBorderActiveSize": "0", "stylingNavItemTopBorderActiveColor": "", "stylingNavItemBottomBorderActiveColor": "", "stySocialDisplay": "float-right", "stySocialBackgroundColor": "", "stySocialTopMargin": "5", "stySocialBorderTopSize": "0", "stySocialBorderBottomSize": "0", "stySocialBorderTopColor": "", "stySocialBorderBottomColor": "", "stylingBoxesBackgroundColor": "", "stylingBoxesMinHeight": "0", "stylingBoxesRadius": "0", "stylingBoxesBorderSize": "0", "stylingBoxesBorderColor": "rgb(170, 170, 170)", "stylingThumbnailsBackgroundColor": "", "stylingThumbnailsMinHeight": "316", "stylingThumbnailsRadius": "0", "stylingThumbnailsBorderSize": "1", "stylingThumbnailsBorderColor": "rgb(170, 170, 170)", "FontBodyColor": "rgb(18, 18, 20)", "FontBodySize": "14", "FontBodyLineHeight": "18", "FontBodyFamily": "Open Sans", "FontBodyFamily_weight": "300", "FontBodyFamily_style": "", "FontBodyFamily_type": "google", "FontNavFontColor": "rgb(0, 136, 204)", "FontNavFontActiveColor": "rgb(255, 255, 255)", "FontNavSize": "14", "FontNavLineHeight": "28", "FontNavFamily": "Open Sans", "FontNavFamily_weight": "300", "FontNavFamily_style": "", "FontNavFamily_type": "google", "FontSocialFontColor": "rgb(153, 153, 153)", "FontSocialFontColorHover": "rgb(0, 153, 230)", "FontSocialFontSize": "11", "FontSocialLineHeight": "25", "FontSocialFamily": "Open Sans", "FontSocialFamily_weight": "300", "FontSocialFamily_style": "", "FontSocialFamily_type": "google", "FontH1Color": "rgb(0, 153, 230)", "FontH1Size": "34", "FontH1LineHeight": "26", "FontH1TopMargin": "20", "FontH1BottomMargin": "20", "FontH1Family": "Open Sans", "FontH1Family_weight": "300", "FontH1Family_style": "", "FontH1Family_type": "google", "FontH2Color": "rgb(0, 153, 230)", "FontH2Size": "26", "FontH2LineHeight": "35", "FontH2TopMargin": "5", "FontH2BottomMargin": "10", "FontH2Family": "Open Sans", "FontH2Family_weight": "300", "FontH2Family_style": "", "FontH2Family_type": "google", "FontH3Color": "rgb(0, 153, 230)", "FontH3Size": "18", "FontH3LineHeight": "16", "FontH3TopMargin": "10", "FontH3BottomMargin": "10", "FontH3Family": "Open Sans", "FontH3Family_weight": "300", "FontH3Family_style": "", "FontH3Family_type": "google", "FontH4Color": "rgb(0, 153, 230)", "FontH4Size": "14", "FontH4LineHeight": "14", "FontH4TopMargin": "5", "FontH4BottomMargin": "10", "FontH4Family": "Open Sans", "FontH4Family_weight": "300", "FontH4Family_style": "", "FontH4Family_type": "google", "FontH5Color": "rgb(170, 170, 170)", "FontH5Size": "14", "FontH5LineHeight": "14", "FontH5TopMargin": "5", "FontH5BottomMargin": "10", "FontH5Family": "Open Sans", "FontH5Family_weight": "300", "FontH5Family_style": "", "FontH5Family_type": "google", "FontH6Color": "", "FontH6Size": "14", "FontH6LineHeight": "12", "FontH6TopMargin": "5", "FontH6BottomMargin": "10", "FontH6Family": "Open Sans", "FontH6Family_weight": "300", "FontH6Family_style": "", "FontH6Family_type": "google", "FontMediumColor": "", "FontMediumSize": "18", "FontMediumLineHeight": "24", "FontMediumTopMargin": "5", "FontMediumBottomMargin": "10", "FontMediumFamily": "Open Sans", "FontMediumFamily_weight": "300", "FontMediumFamily_style": "", "FontMediumFamily_type": "google", "FontHighlightedColor": "rgb(255, 255, 255)", "FontHighlightedBackgroundColor": "rgb(0, 153, 230)", "FontHighlightedFamily": "Open Sans", "FontHighlightedFamily_weight": "300", "FontHighlightedFamily_style": "", "FontHighlightedFamily_type": "google", "FontBigColor": "rgb(0, 153, 230)", "FontBigSize": "26", "FontBigLineHeight": "28", "FontBigTopMargin": "5", "FontBigBottomMargin": "15", "FontBigFamily": "Open Sans", "FontBigFamily_weight": "300", "FontBigFamily_style": "", "FontBigFamily_type": "google", "FontButtonColor": "rgba(255, 255, 255, 0.92)", "FontButtonBackgroundColor": "rgb(0, 153, 230)", "FontButtonColorHover": "rgba(255, 255, 255, 0.55)", "FontButtonBackgroundColorHover": "rgba(0, 153, 230, 0.69)", "FontButtonSize": "24", "FontButtonLineHeight": "24", "FontButtonPadding": "10", "FontButtonFamily": "Open Sans", "FontButtonFamily_weight": "300", "FontButtonFamily_style": "", "FontButtonFamily_type": "google", "FontColor2Color": "rgb(0, 153, 230)", "FontColor3Color": "rgba(253, 251, 251, 0.91)", "FontColor4Color": "rgb(170, 170, 170)", "FontLinkColor": "rgb(0, 153, 230)", "FontLinkColorHover": "rgba(0, 153, 230, 0.73)" }
+ },
+ {
+ name: "Preset 2",
+ mainColor: "rgb(24, 94, 101)",
+ gf: ["Lato:regular", "Lato:100", "Lato:300"],
+ colors: { "backgroundBodyColor": "rgb(250, 250, 250)", "backgroundBodyGradientColor": "", "backgroundBodyImageOrPattern": "", "backgroundBodyPosition": "top center", "backgroundBodyCover": "true", "backgroundBodyRepeat": "repeat", "backgroundBodyAttachment": "fixed", "backgroundMainColumnColor": "rgb(246, 246, 246)", "backgroundMainColumnGradientColor": "", "backgroundMainColumnImageOrPattern": "", "backgroundMainColumnPosition": "", "backgroundMainColumnCover": "true", "backgroundMainColumnRepeat": "", "backgroundMainColumnAttachment": "fixed", "backgroundHeaderColor": "rgb(51, 51, 51)", "backgroundHeaderGradientColor": "", "backgroundHeaderImageOrPattern": "", "backgroundHeaderPosition": "", "backgroundHeaderCover": "true", "backgroundHeaderRepeat": "", "backgroundHeaderAttachment": "fixed", "backgroundFooterColor": "rgb(51, 51, 51)", "backgroundFooterGradientColor": "", "backgroundFooterImageOrPattern": "", "backgroundFooterPosition": "center", "backgroundFooterCover": "true", "backgroundFooterRepeat": "", "backgroundFooterAttachment": "fixed", "stylingMainColumnBoxed": "wide", "stylingHeaderTopMargin": "21", "stylingMainColumnTopMargin": "0", "stylingFooterTopMargin": "0", "stylingFooterBottompMargin": "20", "stylingMainColumnRadius": "0", "stylingMainColumnShadow": "21", "stylingHeaderTopBorderSize": "5", "stylingHeaderBottomBorderSize": "0", "stylingHeaderTopBorderColor": "rgb(230, 126, 34)", "stylingHeaderBottomBorderColor": "rgb(230, 126, 34)", "stylingHeaderMinHeight": "0", "stylingHeaderLogoTopMargin": "14", "stylingNavDisplay": "block-right", "stylingNavBackgroundColor": "", "stylingNavBackgroundDdl": "rgba(97, 97, 97, 0.85)", "stylingNavBackgroundActiveColor": "rgb(230, 126, 34)", "stylingNavMarginTop": "-40", "stylingNavRadius": "5", "stylingNavRadiusOnlyTop": "true", "stylingNavItemTopBorderActiveSize": "0", "stylingNavItemBottomBorderActiveSize": "0", "stylingNavItemTopBorderActiveColor": "rgb(230, 126, 34)", "stylingNavItemBottomBorderActiveColor": "rgb(230, 126, 34)", "stySocialDisplay": "block-right", "stySocialBackgroundColor": "rgba(255, 255, 255, 0.08)", "stySocialTopMargin": "0", "stySocialBorderTopSize": "0", "stySocialBorderBottomSize": "0", "stySocialBorderTopColor": "rgb(230, 126, 34)", "stySocialBorderBottomColor": "rgb(230, 126, 34)", "stylingBoxesBackgroundColor": "", "stylingBoxesMinHeight": "0", "stylingBoxesRadius": "0", "stylingBoxesBorderSize": "0", "stylingBoxesBorderColor": "", "stylingThumbnailsBackgroundColor": "", "stylingThumbnailsMinHeight": "0", "stylingThumbnailsRadius": "0", "stylingThumbnailsBorderSize": "0", "stylingThumbnailsBorderColor": "", "FontBodyColor": "", "FontBodySize": "14", "FontBodyLineHeight": "18", "FontBodyFamily": "Lato", "FontBodyFamily_weight": "regular", "FontBodyFamily_style": "", "FontBodyFamily_type": "google", "FontNavFontColor": "rgba(255, 255, 255, 0.84)", "FontNavFontActiveColor": "rgb(255, 255, 255)", "FontNavSize": "14", "FontNavLineHeight": "39", "FontNavFamily": "Lato", "FontNavFamily_weight": "regular", "FontNavFamily_style": "", "FontNavFamily_type": "google", "FontSocialFontColor": "rgba(255, 255, 255, 0.6)", "FontSocialFontColorHover": "rgb(255, 255, 255)", "FontSocialFontSize": "12", "FontSocialLineHeight": "34", "FontSocialFamily": "Lato", "FontSocialFamily_weight": "100", "FontSocialFamily_style": "", "FontSocialFamily_type": "google", "FontH1Color": "rgb(230, 126, 34)", "FontH1Size": "48", "FontH1LineHeight": "26", "FontH1TopMargin": "20", "FontH1BottomMargin": "20", "FontH1Family": "Lato", "FontH1Family_weight": "300", "FontH1Family_style": "", "FontH1Family_type": "google", "FontH2Color": "rgb(230, 126, 34)", "FontH2Size": "26", "FontH2LineHeight": "18", "FontH2TopMargin": "5", "FontH2BottomMargin": "10", "FontH2Family": "Lato", "FontH2Family_weight": "300", "FontH2Family_style": "", "FontH2Family_type": "google", "FontH3Color": "rgb(230, 126, 34)", "FontH3Size": "18", "FontH3LineHeight": "16", "FontH3TopMargin": "10", "FontH3BottomMargin": "10", "FontH3Family": "Lato", "FontH3Family_weight": "regular", "FontH3Family_style": "", "FontH3Family_type": "google", "FontH4Color": "", "FontH4Size": "14", "FontH4LineHeight": "14", "FontH4TopMargin": "5", "FontH4BottomMargin": "10", "FontH4Family": "Lato", "FontH4Family_weight": "regular", "FontH4Family_style": "", "FontH4Family_type": "google", "FontH5Color": "", "FontH5Size": "12", "FontH5LineHeight": "12", "FontH5TopMargin": "5", "FontH5BottomMargin": "10", "FontH5Family": "Lato", "FontH5Family_weight": "regular", "FontH5Family_style": "", "FontH5Family_type": "google", "FontH6Color": "", "FontH6Size": "12", "FontH6LineHeight": "12", "FontH6TopMargin": "5", "FontH6BottomMargin": "10", "FontH6Family": "Lato", "FontH6Family_weight": "regular", "FontH6Family_style": "", "FontH6Family_type": "google", "FontMediumColor": "", "FontMediumSize": "18", "FontMediumLineHeight": "24", "FontMediumTopMargin": "5", "FontMediumBottomMargin": "10", "FontMediumFamily": "Lato", "FontMediumFamily_weight": "regular", "FontMediumFamily_style": "", "FontMediumFamily_type": "google", "FontHighlightedColor": "rgb(255, 255, 255)", "FontHighlightedBackgroundColor": "rgb(230, 126, 34)", "FontHighlightedFamily": "Lato", "FontHighlightedFamily_weight": "regular", "FontHighlightedFamily_style": "", "FontHighlightedFamily_type": "google", "FontBigColor": "rgb(230, 126, 34)", "FontBigSize": "26", "FontBigLineHeight": "28", "FontBigTopMargin": "5", "FontBigBottomMargin": "15", "FontBigFamily": "Lato", "FontBigFamily_weight": "regular", "FontBigFamily_style": "", "FontBigFamily_type": "google", "FontButtonColor": "rgba(255, 255, 255, 0.92)", "FontButtonBackgroundColor": "rgb(230, 126, 34)", "FontButtonColorHover": "rgba(255, 255, 255, 0.55)", "FontButtonBackgroundColorHover": "rgba(230, 126, 34, 0.74)", "FontButtonSize": "16", "FontButtonLineHeight": "24", "FontButtonPadding": "9", "FontButtonFamily": "Lato", "FontButtonFamily_weight": "regular", "FontButtonFamily_style": "", "FontButtonFamily_type": "google", "FontColor2Color": "rgb(230, 126, 34)", "FontColor3Color": "rgba(253, 251, 251, 0.91)", "FontColor4Color": "rgb(170, 170, 170)", "FontLinkColor": "rgb(230, 126, 34)", "FontLinkColorHover": "rgba(230, 126, 34, 0.84)" }
+ },
+ {
+ name: "Preset 3",
+ mainColor: "rgb(24, 94, 101)",
+ gf: ["Actor:regular"],
+ colors: { "backgroundBodyColor": "rgb(212, 212, 212)", "backgroundBodyGradientColor": "", "backgroundBodyImageOrPattern": "", "backgroundBodyPosition": "top center", "backgroundBodyCover": "true", "backgroundBodyRepeat": "repeat", "backgroundBodyAttachment": "fixed", "backgroundMainColumnColor": "rgb(244, 244, 244)", "backgroundMainColumnGradientColor": "", "backgroundMainColumnImageOrPattern": "", "backgroundMainColumnPosition": "", "backgroundMainColumnCover": "true", "backgroundMainColumnRepeat": "", "backgroundMainColumnAttachment": "fixed", "backgroundHeaderColor": "rgb(244, 244, 244)", "backgroundHeaderGradientColor": "", "backgroundHeaderImageOrPattern": "", "backgroundHeaderPosition": "", "backgroundHeaderCover": "true", "backgroundHeaderRepeat": "", "backgroundHeaderAttachment": "fixed", "backgroundFooterColor": "rgb(51, 51, 51)", "backgroundFooterGradientColor": "", "backgroundFooterImageOrPattern": "", "backgroundFooterPosition": "center", "backgroundFooterCover": "true", "backgroundFooterRepeat": "", "backgroundFooterAttachment": "fixed", "stylingMainColumnBoxed": "boxed", "stylingHeaderTopMargin": "21", "stylingMainColumnTopMargin": "0", "stylingFooterTopMargin": "0", "stylingFooterBottompMargin": "20", "stylingMainColumnRadius": "0", "stylingMainColumnShadow": "0", "stylingHeaderTopBorderSize": "5", "stylingHeaderBottomBorderSize": "1", "stylingHeaderTopBorderColor": "rgb(194, 33, 39)", "stylingHeaderBottomBorderColor": "rgb(194, 33, 39)", "stylingHeaderMinHeight": "0", "stylingHeaderLogoTopMargin": "14", "stylingNavDisplay": "block-left", "stylingNavBackgroundColor": "rgb(198, 198, 198)", "stylingNavBackgroundDdl": "rgb(198, 198, 198)", "stylingNavBackgroundActiveColor": "rgb(194, 33, 39)", "stylingNavMarginTop": "0", "stylingNavRadius": "0", "stylingNavRadiusOnlyTop": "false", "stylingNavItemTopBorderActiveSize": "0", "stylingNavItemBottomBorderActiveSize": "0", "stylingNavItemTopBorderActiveColor": "rgb(194, 33, 39)", "stylingNavItemBottomBorderActiveColor": "rgb(194, 33, 39)", "stySocialDisplay": "block-right", "stySocialBackgroundColor": "rgba(255, 255, 255, 0.08)", "stySocialTopMargin": "0", "stySocialBorderTopSize": "0", "stySocialBorderBottomSize": "0", "stySocialBorderTopColor": "rgb(194, 33, 39)", "stySocialBorderBottomColor": "rgb(194, 33, 39)", "stylingBoxesBackgroundColor": "", "stylingBoxesMinHeight": "0", "stylingBoxesRadius": "0", "stylingBoxesBorderSize": "0", "stylingBoxesBorderColor": "", "stylingThumbnailsBackgroundColor": "", "stylingThumbnailsMinHeight": "0", "stylingThumbnailsRadius": "0", "stylingThumbnailsBorderSize": "0", "stylingThumbnailsBorderColor": "", "FontBodyColor": "", "FontBodySize": "14", "FontBodyLineHeight": "14", "FontBodyFamily": "Actor", "FontBodyFamily_weight": "regular", "FontBodyFamily_style": "", "FontBodyFamily_type": "google", "FontNavFontColor": "rgb(58, 58, 58)", "FontNavFontActiveColor": "rgb(255, 255, 255)", "FontNavSize": "14", "FontNavLineHeight": "30", "FontNavFamily": "Actor", "FontNavFamily_weight": "regular", "FontNavFamily_style": "", "FontNavFamily_type": "google", "FontSocialFontColor": "rgb(198, 198, 198)", "FontSocialFontColorHover": "rgb(194, 33, 39)", "FontSocialFontSize": "12", "FontSocialLineHeight": "34", "FontSocialFamily": "Actor", "FontSocialFamily_weight": "regular", "FontSocialFamily_style": "", "FontSocialFamily_type": "google", "FontH1Color": "rgb(194, 33, 39)", "FontH1Size": "24", "FontH1LineHeight": "26", "FontH1TopMargin": "20", "FontH1BottomMargin": "20", "FontH1Family": "Actor", "FontH1Family_weight": "regular", "FontH1Family_style": "", "FontH1Family_type": "google", "FontH2Color": "rgb(127, 127, 127)", "FontH2Size": "20", "FontH2LineHeight": "18", "FontH2TopMargin": "5", "FontH2BottomMargin": "10", "FontH2Family": "Actor", "FontH2Family_weight": "regular", "FontH2Family_style": "", "FontH2Family_type": "google", "FontH3Color": "rgb(194, 33, 39)", "FontH3Size": "18", "FontH3LineHeight": "16", "FontH3TopMargin": "10", "FontH3BottomMargin": "10", "FontH3Family": "Actor", "FontH3Family_weight": "regular", "FontH3Family_style": "", "FontH3Family_type": "google", "FontH4Color": "", "FontH4Size": "14", "FontH4LineHeight": "14", "FontH4TopMargin": "5", "FontH4BottomMargin": "10", "FontH4Family": "Actor", "FontH4Family_weight": "regular", "FontH4Family_style": "", "FontH4Family_type": "google", "FontH5Color": "", "FontH5Size": "12", "FontH5LineHeight": "12", "FontH5TopMargin": "5", "FontH5BottomMargin": "10", "FontH5Family": "Actor", "FontH5Family_weight": "regular", "FontH5Family_style": "", "FontH5Family_type": "google", "FontH6Color": "", "FontH6Size": "12", "FontH6LineHeight": "12", "FontH6TopMargin": "5", "FontH6BottomMargin": "10", "FontH6Family": "Actor", "FontH6Family_weight": "regular", "FontH6Family_style": "", "FontH6Family_type": "google", "FontMediumColor": "", "FontMediumSize": "18", "FontMediumLineHeight": "24", "FontMediumTopMargin": "5", "FontMediumBottomMargin": "10", "FontMediumFamily": "Actor", "FontMediumFamily_weight": "regular", "FontMediumFamily_style": "", "FontMediumFamily_type": "google", "FontHighlightedColor": "", "FontHighlightedBackgroundColor": "rgb(194, 33, 39)", "FontHighlightedFamily": "Actor", "FontHighlightedFamily_weight": "regular", "FontHighlightedFamily_style": "", "FontHighlightedFamily_type": "google", "FontBigColor": "rgb(194, 33, 39)", "FontBigSize": "26", "FontBigLineHeight": "28", "FontBigTopMargin": "5", "FontBigBottomMargin": "15", "FontBigFamily": "Actor", "FontBigFamily_weight": "regular", "FontBigFamily_style": "", "FontBigFamily_type": "google", "FontButtonColor": "rgba(255, 255, 255, 0.92)", "FontButtonBackgroundColor": "rgb(194, 33, 39)", "FontButtonColorHover": "rgba(255, 255, 255, 0.55)", "FontButtonBackgroundColorHover": "rgba(194, 33, 39, 0.85)", "FontButtonSize": "14", "FontButtonLineHeight": "18", "FontButtonPadding": "10", "FontButtonFamily": "Actor", "FontButtonFamily_weight": "regular", "FontButtonFamily_style": "", "FontButtonFamily_type": "google", "FontColor2Color": "rgb(194, 33, 39)", "FontColor3Color": "rgba(253, 251, 251, 0.91)", "FontColor4Color": "rgb(170, 170, 170)", "FontLinkColor": "rgb(194, 33, 39)", "FontLinkColorHover": "rgba(194, 33, 39, 0.84)" }
+ },
+ {
+ name: "Preset 4",
+ mainColor: "",
+ gf: ["Ubuntu:300"],
+ colors: { "backgroundBodyColor": "rgb(227, 227, 227)", "backgroundBodyGradientColor": "rgba(227, 227, 227, 0.26)", "backgroundBodyImageOrPattern": "", "backgroundBodyPosition": "top center", "backgroundBodyCover": "true", "backgroundBodyRepeat": "repeat", "backgroundBodyAttachment": "fixed", "backgroundMainColumnColor": "rgb(255, 255, 255)", "backgroundMainColumnGradientColor": "", "backgroundMainColumnImageOrPattern": "", "backgroundMainColumnPosition": "", "backgroundMainColumnCover": "true", "backgroundMainColumnRepeat": "", "backgroundMainColumnAttachment": "fixed", "backgroundHeaderColor": "", "backgroundHeaderGradientColor": "", "backgroundHeaderImageOrPattern": "", "backgroundHeaderPosition": "", "backgroundHeaderCover": "false", "backgroundHeaderRepeat": "", "backgroundHeaderAttachment": "scroll", "backgroundFooterColor": "rgb(76, 76, 76)", "backgroundFooterGradientColor": "rgba(76, 76, 76, 0.93)", "backgroundFooterImageOrPattern": "", "backgroundFooterPosition": "center", "backgroundFooterCover": "false", "backgroundFooterRepeat": "", "backgroundFooterAttachment": "scroll", "stylingMainColumnBoxed": "boxed", "stylingHeaderTopMargin": "20", "stylingMainColumnTopMargin": "0", "stylingFooterTopMargin": "0", "stylingFooterBottompMargin": "20", "stylingMainColumnRadius": "0", "stylingMainColumnShadow": "0", "stylingHeaderTopBorderSize": "0", "stylingHeaderBottomBorderSize": "0", "stylingHeaderTopBorderColor": "", "stylingHeaderBottomBorderColor": "", "stylingHeaderMinHeight": "0", "stylingHeaderLogoTopMargin": "-43", "stylingNavDisplay": "block-left", "stylingNavBackgroundColor": "rgb(76, 76, 76)", "stylingNavBackgroundDdl": "rgb(255, 255, 255)", "stylingNavBackgroundActiveColor": "rgb(22, 159, 230)", "stylingNavMarginTop": "10", "stylingNavRadius": "0", "stylingNavRadiusOnlyTop": "false", "stylingNavItemTopBorderActiveSize": "0", "stylingNavItemBottomBorderActiveSize": "0", "stylingNavItemTopBorderActiveColor": "", "stylingNavItemBottomBorderActiveColor": "", "stySocialDisplay": "float-right", "stySocialBackgroundColor": "", "stySocialTopMargin": "5", "stySocialBorderTopSize": "0", "stySocialBorderBottomSize": "0", "stySocialBorderTopColor": "", "stySocialBorderBottomColor": "", "stylingBoxesBackgroundColor": "", "stylingBoxesMinHeight": "0", "stylingBoxesRadius": "0", "stylingBoxesBorderSize": "0", "stylingBoxesBorderColor": "rgb(170, 170, 170)", "stylingThumbnailsBackgroundColor": "", "stylingThumbnailsMinHeight": "316", "stylingThumbnailsRadius": "0", "stylingThumbnailsBorderSize": "1", "stylingThumbnailsBorderColor": "rgb(170, 170, 170)", "FontBodyColor": "rgb(18, 18, 20)", "FontBodySize": "12", "FontBodyLineHeight": "14", "FontBodyFamily": "Ubuntu", "FontBodyFamily_weight": "300", "FontBodyFamily_style": "", "FontBodyFamily_type": "google", "FontNavFontColor": "rgb(253, 253, 253)", "FontNavFontActiveColor": "rgb(255, 255, 255)", "FontNavSize": "14", "FontNavLineHeight": "40", "FontNavFamily": "Ubuntu", "FontNavFamily_weight": "300", "FontNavFamily_style": "", "FontNavFamily_type": "google", "FontSocialFontColor": "rgba(76, 76, 76, 0.72)", "FontSocialFontColorHover": "rgb(22, 159, 230)", "FontSocialFontSize": "11", "FontSocialLineHeight": "25", "FontSocialFamily": "Ubuntu", "FontSocialFamily_weight": "300", "FontSocialFamily_style": "", "FontSocialFamily_type": "google", "FontH1Color": "rgb(22, 159, 230)", "FontH1Size": "34", "FontH1LineHeight": "26", "FontH1TopMargin": "20", "FontH1BottomMargin": "20", "FontH1Family": "Ubuntu", "FontH1Family_weight": "300", "FontH1Family_style": "", "FontH1Family_type": "google", "FontH2Color": "rgb(22, 159, 230)", "FontH2Size": "26", "FontH2LineHeight": "35", "FontH2TopMargin": "5", "FontH2BottomMargin": "10", "FontH2Family": "Ubuntu", "FontH2Family_weight": "300", "FontH2Family_style": "", "FontH2Family_type": "google", "FontH3Color": "rgb(22, 159, 230)", "FontH3Size": "18", "FontH3LineHeight": "16", "FontH3TopMargin": "10", "FontH3BottomMargin": "10", "FontH3Family": "Ubuntu", "FontH3Family_weight": "300", "FontH3Family_style": "", "FontH3Family_type": "google", "FontH4Color": "rgb(22, 159, 230)", "FontH4Size": "14", "FontH4LineHeight": "14", "FontH4TopMargin": "5", "FontH4BottomMargin": "10", "FontH4Family": "Ubuntu", "FontH4Family_weight": "300", "FontH4Family_style": "", "FontH4Family_type": "google", "FontH5Color": "rgb(170, 170, 170)", "FontH5Size": "14", "FontH5LineHeight": "14", "FontH5TopMargin": "5", "FontH5BottomMargin": "10", "FontH5Family": "Ubuntu", "FontH5Family_weight": "300", "FontH5Family_style": "", "FontH5Family_type": "google", "FontH6Color": "", "FontH6Size": "14", "FontH6LineHeight": "12", "FontH6TopMargin": "5", "FontH6BottomMargin": "10", "FontH6Family": "Ubuntu", "FontH6Family_weight": "300", "FontH6Family_style": "", "FontH6Family_type": "google", "FontMediumColor": "", "FontMediumSize": "18", "FontMediumLineHeight": "24", "FontMediumTopMargin": "5", "FontMediumBottomMargin": "10", "FontMediumFamily": "Ubuntu", "FontMediumFamily_weight": "300", "FontMediumFamily_style": "", "FontMediumFamily_type": "google", "FontHighlightedColor": "rgb(255, 255, 255)", "FontHighlightedBackgroundColor": "rgb(22, 159, 230)", "FontHighlightedFamily": "Ubuntu", "FontHighlightedFamily_weight": "300", "FontHighlightedFamily_style": "", "FontHighlightedFamily_type": "google", "FontBigColor": "rgb(22, 159, 230)", "FontBigSize": "26", "FontBigLineHeight": "28", "FontBigTopMargin": "5", "FontBigBottomMargin": "15", "FontBigFamily": "Ubuntu", "FontBigFamily_weight": "300", "FontBigFamily_style": "", "FontBigFamily_type": "google", "FontButtonColor": "rgba(255, 255, 255, 0.92)", "FontButtonBackgroundColor": "rgb(22, 159, 230)", "FontButtonColorHover": "rgba(255, 255, 255, 0.55)", "FontButtonBackgroundColorHover": "rgba(22, 159, 230, 0.74)", "FontButtonSize": "24", "FontButtonLineHeight": "24", "FontButtonPadding": "10", "FontButtonFamily": "Ubuntu", "FontButtonFamily_weight": "300", "FontButtonFamily_style": "", "FontButtonFamily_type": "google", "FontColor2Color": "rgb(22, 159, 230)", "FontColor3Color": "rgba(253, 251, 251, 0.91)", "FontColor4Color": "rgb(170, 170, 170)", "FontLinkColor": "rgb(22, 159, 230)", "FontLinkColorHover": "rgba(22, 159, 230, 0.77)" }
+ }
+];
+
diff --git a/src/Umbraco.Web.UI.Client/src/tuning/index.html b/src/Umbraco.Web.UI.Client/src/tuning/index.html
index 574967c427..889fc0dfea 100644
--- a/src/Umbraco.Web.UI.Client/src/tuning/index.html
+++ b/src/Umbraco.Web.UI.Client/src/tuning/index.html
@@ -155,7 +155,7 @@
PALETTE COLORS
-
+
@@ -165,6 +165,8 @@
save
+ make it !
+
diff --git a/src/Umbraco.Web.UI.Client/src/tuning/tuning.controller.js b/src/Umbraco.Web.UI.Client/src/tuning/tuning.controller.js
index 73dd3b3e49..6f2f43eb1e 100644
--- a/src/Umbraco.Web.UI.Client/src/tuning/tuning.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/tuning/tuning.controller.js
@@ -59,6 +59,7 @@ angular.module("umbraco.tuning", ['ui.bootstrap', 'spectrumcolorpicker', 'ui.sli
if (field.fontStyle == "''") { field.fontStyle = ""; }
if (field.fontType == "''") { field.fontType = ""; }
}
+
}
catch (err) {
console.info("Style parameter not found " + field.alias);
@@ -149,19 +150,34 @@ angular.module("umbraco.tuning", ['ui.bootstrap', 'spectrumcolorpicker', 'ui.sli
}
// Refresh with selected tuning palette
- $scope.refreshtuningByPalette = function (colors) {
+ $scope.refreshtuningByPalette = function (palette) {
+
+ data = palette.colors;
+
+ if (palette.gf) {
+ $.each(palette.gf, function (indexFont, font) {
+ document.getElementById("resultFrame").contentWindow.getFont(font);
+ });
+ }
$.each($scope.tuningModel.categories, function (indexCategory, category) {
$.each(category.sections, function (indexSection, section) {
$.each(section.subSections, function (indexSubSection, subSection) {
$.each(subSection.fields, function (indexField, field) {
- if (field.type == "colorPicker") {
- $.each(colors, function (indexColor, color) {
- if (color.alias == field.alias) {
- field.value = color.value;
- }
- });
+
+ // value
+ field.value = eval("data." + field.alias.replace("@", ""));
+ if (field.value == "''") { field.value = ""; }
+
+ // special init for font family picker
+ if (field.type == "fontFamilyPicker") {
+ field.fontWeight = eval("data." + field.alias.replace("@", "") + "_weight");
+ field.fontStyle = eval("data." + field.alias.replace("@", "") + "_style");
+ field.fontType = eval("data." + field.alias.replace("@", "") + "_type");
+ if (field.fontWeight == "''") { field.fontWeight = ""; }
+ if (field.fontStyle == "''") { field.fontStyle = ""; }
+ if (field.fontType == "''") { field.fontType = ""; }
}
})
@@ -339,6 +355,53 @@ angular.module("umbraco.tuning", ['ui.bootstrap', 'spectrumcolorpicker', 'ui.sli
}
}
+ // Hidden botton to make preset from the current settings
+ $scope.makePreset = function () {
+
+ var parameters = [];
+ var parametersGF = [];
+ $.each($scope.tuningModel.categories, function (indexCategory, category) {
+ $.each(category.sections, function (indexSection, section) {
+ $.each(section.subSections, function (indexSubSection, subSection) {
+ $.each(subSection.fields, function (indexField, field) {
+
+ if (!subSection.schema || subSection.schema.indexOf("gridrow_") < 0) {
+
+ // value
+ var value = (field.value != 0 && (field.value == undefined || field.value == "")) ? "''" : field.value;
+ parameters.splice(parameters.length + 1, 0, "\"" + field.alias + "\":" + " \"" + value + "\"");
+
+ // special init for font family picker
+ if (field.type == "fontFamilyPicker") {
+
+ if (field.fontType == "google" && value != "''") {
+ var variant = field.fontWeight != "" || field.fontStyle != "" ? ":" + field.fontWeight + field.fontStyle : "";
+ if ($.inArray(value + variant, parametersGF) < 0) {
+ parametersGF.splice(parametersGF.length + 1, 0, value + variant);
+ }
+ }
+
+ var fontWeight = (field.fontWeight != 0 && (field.fontWeight == undefined || field.fontWeight == "")) ? "''" : field.fontWeight;
+ var fontStyle = (field.fontStyle != 0 && (field.fontStyle == undefined || field.fontStyle == "")) ? "''" : field.fontStyle;
+ var fontType = (field.fontType != 0 && (field.fontType == undefined || field.fontType == "")) ? "''" : field.fontType;
+
+ parameters.splice(parameters.length + 1, 0, "\"" + field.alias + "_weight" + "\":" + " \"" + fontWeight + "\"");
+ parameters.splice(parameters.length + 1, 0, "\"" + field.alias + "_style" + "\":" + " \"" + fontStyle + "\"");
+ parameters.splice(parameters.length + 1, 0, "\"" + field.alias + "_type" + "\":" + " \"" + fontType + "\"");
+
+ }
+
+ }
+
+ })
+ })
+ })
+ });
+
+ $("body").append("");
+
+ }
+
// Preload of the google font
$http.get('/Umbraco/Api/tuning/GetGoogleFont').success(function (data) {
$scope.googleFontFamilies = data;
@@ -563,8 +626,9 @@ angular.module("umbraco.tuning", ['ui.bootstrap', 'spectrumcolorpicker', 'ui.sli
$scope.showFontPreview = function (font) {
if (font != undefined && font.fontFamily != "" && font.fontType == "google") {
+
// Font needs to be independently loaded in the iframe for live preview to work.
- document.getElementById("resultFrame").contentWindow.getFont(font);
+ document.getElementById("resultFrame").contentWindow.getFont(font.fontFamily + ":" + font.variant);
WebFont.load({
google: {
diff --git a/src/Umbraco.Web.UI.Client/src/tuning/tuning.front.js b/src/Umbraco.Web.UI.Client/src/tuning/tuning.front.js
index 7dedfddfcc..039b464a71 100644
--- a/src/Umbraco.Web.UI.Client/src/tuning/tuning.front.js
+++ b/src/Umbraco.Web.UI.Client/src/tuning/tuning.front.js
@@ -1,5 +1,5 @@
/*********************************************************************************************************/
-/* Global function and variable for panel/page com */
+/* Global function and variable for panel/page com */
/*********************************************************************************************************/
var refrechLayout = function (parameters) {
@@ -10,6 +10,9 @@ var refrechLayout = function (parameters) {
return false;
});
+ // hide preview badget
+ $("#umbracoPreviewBadge").hide();
+
var string = "less.modifyVars({" + parameters.join(",") + "})";
eval(string);
}
@@ -34,16 +37,16 @@ var getFont = function (font) {
else {
WebFont.load({
google: {
- families: [font.fontFamily + ":" + font.variant]
+ families: [font]
},
loading: function () {
- console.log('loading font' + font.fontFamily + ' in iframe');
+ console.log('loading font' + font + ' in iframe');
},
active: function () {
- console.log('loaded font ' + font.fontFamily + ' in iframe');
+ console.log('loaded font ' + font + ' in iframe');
},
inactive: function () {
- console.log('error loading font ' + font.fontFamily + ' in iframe');
+ console.log('error loading font ' + font + ' in iframe');
}
});
}
@@ -121,71 +124,80 @@ var initIntelTuning = function (tuningModel) {
var outlinePosition = function (target) {
- var localname = target[0].localName;
- var height = $(target).height();
- var width = $(target).width();
- var position = $(target).offset();
+ if (target.length > 0) {
- console.info("element select " + localname);
+ var localname = target[0].localName;
+ var height = $(target).height();
+ var width = $(target).width();
+ var position = $(target).offset();
+ var posY = position.top - $(window).scrollTop();
+ var posX = position.left - $(window).scrollLeft();
- $("#outline-data").html(localname);
- $("#outline-data").css('position', 'fixed');
- $("#outline-data").css('top', position.top);
- $("#outline-data").css('left', position.left);
- $("#outline-data").css('display', 'block');
- $("#outline-data").css('position', 'fixed');
- $("#outline-data").css('background-color', 'rgb(164, 198, 253)');
- $("#outline-data").css('color', '#000000');
- $("#outline-data").css('padding', '0px 5px 0px 5px');
- $("#outline-data").css('font-size', '11px');
- $("#outline-data").css('transition', 'all .05s ease-in-out');
- $("#outline-data").css('-moz-transition', 'all .05s ease-in-out');
- $("#outline-data").css('-webkit-transition', 'all .05s ease-in-out');
+ console.info("element select " + localname);
- $("#outline-sup").css('display', "block");
- $("#outline-sup").css('height', "2px");
- $("#outline-sup").css('width', width + "px");
- $("#outline-sup").css('position', 'fixed');
- $("#outline-sup").css('top', position.top);
- $("#outline-sup").css('left', position.left);
- $("#outline-sup").css('background-color', '#a4c6fd');
- $("#outline-sup").css('transition', 'all .05s ease-in-out');
- $("#outline-sup").css('-moz-transition', 'all .05s ease-in-out');
- $("#outline-sup").css('-webkit-transition', 'all .05s ease-in-out');
+ $("#outline-data").html(localname);
+ $("#outline-data").css('position', 'fixed');
+ $("#outline-data").css('top', posY);
+ $("#outline-data").css('left', posX);
+ $("#outline-data").css('display', 'block');
+ $("#outline-data").css('position', 'fixed');
+ $("#outline-data").css('background-color', 'rgb(164, 198, 253)');
+ $("#outline-data").css('color', '#000000');
+ $("#outline-data").css('padding', '0px 5px 0px 5px');
+ $("#outline-data").css('font-size', '11px');
+ $("#outline-data").css('transition', 'all .05s ease-in-out');
+ $("#outline-data").css('-moz-transition', 'all .05s ease-in-out');
+ $("#outline-data").css('-webkit-transition', 'all .05s ease-in-out');
- $("#outline-inf").css('display', "block");
- $("#outline-inf").css('height', "2px");
- $("#outline-inf").css('width', Number(width + 2) + "px");
- $("#outline-inf").css('position', 'fixed');
- $("#outline-inf").css('top', position.top + height);
- $("#outline-inf").css('left', position.left);
- $("#outline-inf").css('background-color', '#a4c6fd');
- $("#outline-inf").css('transition', 'all .05s ease-in-out');
- $("#outline-inf").css('-moz-transition', 'all .05s ease-in-out');
- $("#outline-inf").css('-webkit-transition', 'all .05s ease-in-out');
+ $("#outline-sup").css('display', "block");
+ $("#outline-sup").css('height', "2px");
+ $("#outline-sup").css('width', width + "px");
+ $("#outline-sup").css('position', 'fixed');
+ $("#outline-sup").css('top', posY);
+ $("#outline-sup").css('left', posX);
+ $("#outline-sup").css('background-color', '#a4c6fd');
+ $("#outline-sup").css('transition', 'all .05s ease-in-out');
+ $("#outline-sup").css('-moz-transition', 'all .05s ease-in-out');
+ $("#outline-sup").css('-webkit-transition', 'all .05s ease-in-out');
- $("#outline-left").css('display', "block");
- $("#outline-left").css('height', height + "px");
- $("#outline-left").css('width', "2px");
- $("#outline-left").css('position', 'fixed');
- $("#outline-left").css('top', position.top);
- $("#outline-left").css('left', position.left);
- $("#outline-left").css('background-color', '#a4c6fd');
- $("#outline-left").css('transition', 'all .05s ease-in-out');
- $("#outline-left").css('-moz-transition', 'all .05s ease-in-out');
- $("#outline-left").css('-webkit-transition', 'all .05s ease-in-out');
+ $("#outline-inf").css('display', "block");
+ $("#outline-inf").css('height', "2px");
+ $("#outline-inf").css('width', Number(width + 2) + "px");
+ $("#outline-inf").css('position', 'fixed');
+ $("#outline-inf").css('top', posY + height);
+ $("#outline-inf").css('left', posX);
+ $("#outline-inf").css('background-color', '#a4c6fd');
+ $("#outline-inf").css('transition', 'all .05s ease-in-out');
+ $("#outline-inf").css('-moz-transition', 'all .05s ease-in-out');
+ $("#outline-inf").css('-webkit-transition', 'all .05s ease-in-out');
- $("#outline-right").css('display', "block");
- $("#outline-right").css('height', height + "px");
- $("#outline-right").css('width', "2px");
- $("#outline-right").css('position', 'fixed');
- $("#outline-right").css('top', position.top);
- $("#outline-right").css('left', position.left + width);
- $("#outline-right").css('background-color', '#a4c6fd');
- $("#outline-right").css('transition', 'all .05s ease-in-out');
- $("#outline-right").css('-moz-transition', 'all .05s ease-in-out');
- $("#outline-right").css('-webkit-transition', 'all .05s ease-in-out');
+ $("#outline-left").css('display', "block");
+ $("#outline-left").css('height', height + "px");
+ $("#outline-left").css('width', "2px");
+ $("#outline-left").css('position', 'fixed');
+ $("#outline-left").css('top', posY);
+ $("#outline-left").css('left', posX);
+ $("#outline-left").css('background-color', '#a4c6fd');
+ $("#outline-left").css('transition', 'all .05s ease-in-out');
+ $("#outline-left").css('-moz-transition', 'all .05s ease-in-out');
+ $("#outline-left").css('-webkit-transition', 'all .05s ease-in-out');
+ $("#outline-right").css('display', "block");
+ $("#outline-right").css('height', height + "px");
+ $("#outline-right").css('width', "2px");
+ $("#outline-right").css('position', 'fixed');
+ $("#outline-right").css('top', posY);
+ $("#outline-right").css('left', posX + width);
+ $("#outline-right").css('background-color', '#a4c6fd');
+ $("#outline-right").css('transition', 'all .05s ease-in-out');
+ $("#outline-right").css('-moz-transition', 'all .05s ease-in-out');
+ $("#outline-right").css('-webkit-transition', 'all .05s ease-in-out');
+
+ }
+ else {
+ outlineHide();
+ console.info("element not found select");
+ }
}
var outlineHide = function () {
diff --git a/src/Umbraco.Web.UI/Umbraco/preview/index.html b/src/Umbraco.Web.UI/Umbraco/preview/index.html
index 574967c427..889fc0dfea 100644
--- a/src/Umbraco.Web.UI/Umbraco/preview/index.html
+++ b/src/Umbraco.Web.UI/Umbraco/preview/index.html
@@ -155,7 +155,7 @@
PALETTE COLORS
-
+
@@ -165,6 +165,8 @@
save
+ make it !
+
diff --git a/src/Umbraco.Web.UI/config/ClientDependency.config b/src/Umbraco.Web.UI/config/ClientDependency.config
index 053893347e..69a7f4fe20 100644
--- a/src/Umbraco.Web.UI/config/ClientDependency.config
+++ b/src/Umbraco.Web.UI/config/ClientDependency.config
@@ -10,7 +10,7 @@ NOTES:
* Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
* A new version will invalidate both client and server cache and create new persisted files
-->
-
+