hugo modifications to mosaico

hugo-events · Aug 29, 2016 · 8511746 · 8511746
1 parent 0a3c24f
commit 8511746
Show file tree

Hide file tree

Showing 19 changed files with 345 additions and 160 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ uploads/**
 !.tmp/README.md
 build
 dist
+.idea
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -40,7 +40,7 @@ module.exports = function(grunt) {
 
     less: {
       options: {
-        sourceMap: true,
+        sourceMap: false,
         sourceMapRootpath: '../',
         /* sourceMapFilename: 'build/mosaico.css.map' */
         sourceMapFileInline: true
@@ -237,4 +237,4 @@ module.exports = function(grunt) {
   grunt.registerTask('build', ['bowercopy', 'copy', 'jshint', 'js', 'css']);
   grunt.registerTask('default', ['build', 'server']);
   grunt.registerTask('test', ['jasmine_node']);
-};
+};
diff --git a/res/lang/mosaico-de.json b/res/lang/mosaico-de.json
@@ -2,6 +2,9 @@
     "Download": "Herunterladen",
     "Test": "Test senden",
     "Save": "Speichern",
+    "Next": "Nächster",
+    "Template name": "Schablone Name",
+    "Campaign name": "Kampagne Name",
     "Downloading...": "wird heruntergeladen ...",
     "Invalid email address": "ungültige Email-Adresse",
     "Test email sent...": "Email an die Tester wurde versendet.",
@@ -85,4 +88,4 @@
     "Failed to resize image": "Fehler beim anpassen der Bildgröße",
     "Unexpected upload error": "Unerwarteter Fehler beim Hochladen",
     "Unexpected error listing files": "Unerwarteter Fehler beim auflisten der Dateien"
-}
+}
diff --git a/res/lang/mosaico-en.json b/res/lang/mosaico-en.json
@@ -2,6 +2,9 @@
   "Download": "Download",
   "Test": "Test",
   "Save": "Save",
+  "Next": "Next",
+  "Template name": "Template name",
+  "Campaign name": "Campaign name",
   "Downloading...": "Downloading...",
   "Invalid email address": "Invalid email address",
   "Test email sent...": "Test email sent...",
@@ -85,4 +88,4 @@
   "Failed to resize image": "Failed to resize image",
   "Unexpected upload error": "Unexpected upload error",
   "Unexpected error listing files": "Unexpected error listing files"
-}
+}
diff --git a/res/lang/mosaico-nl.json b/res/lang/mosaico-nl.json
@@ -2,6 +2,9 @@
     "Download": "Downloaden",
     "Test": "Test versturen",
     "Save": "Bewaren",
+    "Next": "Volgende",
+    "Template name": "Template naam",
+    "Campaign name": "Campagne naam",
     "Downloading...": "bezig met downloaden...",
     "Invalid email address": "Ongeldig emailadres",
     "Test email sent...": "Email wordt verstuurd.",
@@ -85,4 +88,4 @@
     "Failed to resize image": "Kon de grootte van het plaatje niet aanpassen",
     "Unexpected upload error": "Onverwachte fout bij upload",
     "Unexpected error listing files": "Onverwachte fout bij tonen van de plaatjes"
-}
+}
diff --git a/spec/data/template-versafix-1.model.json b/spec/data/template-versafix-1.model.json
@@ -5,18 +5,19 @@
   "titleText": "TITLE",
   "preheaderBlock": {
     "type": "preheaderBlock",
+    "preheaderText": "Headertext",
     "customStyle": false,
     "id": "",
-    "backgroundColor": null,
-    "preheaderText": "",
+    "backgroundColor": "#eeece1",
+    "externalBackgroundColor": "#eeece1",
     "linkStyle": {
       "type": "linkStyle",
       "face": null,
       "color": null,
       "size": null,
       "decoration": null
     },
-    "preheaderLinkOption": "[unsubscribe_link]",
+    "preheaderLinkOption": "none",
     "longTextStyle": {
       "type": "longTextStyle",
       "face": null,
@@ -25,11 +26,12 @@
       "linksColor": null
     },
     "unsubscribeText": "Unsubscribe",
+    "nameText": "Name",
     "webversionText": "View in your browser"
   },
   "sponsor": {
     "type": "sponsor",
-    "visible": true,
+    "visible": false,
     "src": "img/sponsor.gif",
     "url": "",
     "alt": "sponsor"
@@ -45,15 +47,16 @@
       "linksColor": null
     },
     "id": "",
-    "backgroundColor": null,
+    "backgroundColor": "#eeece1",
+    "externalBackgroundColor": "#eeece1",
     "linkStyle": {
       "type": "linkStyle",
       "face": null,
       "color": null,
       "size": null,
       "decoration": null
     },
-    "longText": "<p>Email sent to <a href=\"mailto:[mail]\">[mail]</a></p>",
+    "longText": "<p>Email sent to <a href=\"mailto:[Email]\">[Email]</a></p>",
     "disiscrivitiText": "Unsubscribe"
   },
   "mainBlocks": {
@@ -64,7 +67,8 @@
     "type": "theme",
     "frameTheme": {
       "type": "frameTheme",
-      "backgroundColor": "#3f3f3f",
+      "backgroundColor": "#eeece1",
+      "externalBackgroundColor": "#eeece1",
       "longTextStyle": {
         "type": "longTextStyle",
         "face": "Arial, Helvetica, sans-serif",
@@ -75,7 +79,7 @@
       "linkStyle": {
         "type": "linkStyle",
         "face": "Arial, Helvetica, sans-serif",
-        "color": "#ffffff",
+        "color": "#3f3f3f",
         "size": "13",
         "decoration": "underline"
       }
@@ -89,7 +93,8 @@
         "size": "13",
         "linksColor": "#3f3f3f"
       },
-      "externalBackgroundColor": "#bfbfbf",
+      "externalBackgroundColor": "#eeece1",
+      "backgroundSocialBlockColor": "#ddd9c3",
       "externalTextStyle": {
         "type": "textStyle",
         "face": "Arial, Helvetica, sans-serif",
@@ -108,7 +113,7 @@
         "face": "Arial, Helvetica, sans-serif",
         "color": "#3f3f3f",
         "size": "13",
-        "buttonColor": "#bfbfbf",
+        "buttonColor": "#92cddc",
         "radius": "4"
       },
       "bigTitleStyle": {
@@ -129,7 +134,7 @@
         "face": "Arial, Helvetica, sans-serif",
         "color": "#3f3f3f",
         "size": "22",
-        "buttonColor": "#bfbfbf",
+        "buttonColor": "#92cddc",
         "radius": "4"
       }
     }

diff --git a/src/css/app_standalone_material.less b/src/css/app_standalone_material.less
@@ -1,16 +1,16 @@
 @import 'app_standalone.less';
 
-@accent-color: #900000; // #A01020; // #ff9800;
+@accent-color: #4bacc6; // #A01020; // #ff9800;
 @background-color: #eeeeee;
 // @link-color: #ff9800;
 // @link-color: #ff5722; // #ea1c0d;
-@link-color: #ff5722; // #ea1c0d;
+@link-color: #8FB06C; // #ea1c0d;
 
 @font-family: "Noto Sans", "Helvetica Neue", Helvetica, Arial, "Nimbus Sans L", "Liberation Sans", Arimo, sans-serif;
 @standard-border-radius: 2px;
 @info-border-radius: @standard-border-radius;
 @button-border-radius: @standard-border-radius;
-@large-balloon-border-radius: 2px; 
+@large-balloon-border-radius: 2px;
 
 @object-background-color: #DDDDDD;
 // @mosaico-object-shadow: 1px 1px 2px lighten(@shadow-color, 30%);
@@ -22,6 +22,12 @@
 
 #main-preview #preview-toolbar {
   padding: 1px 5px;
+  text-align: left !important;
+  background-color: @accent-color;
+  .ui-icon{
+    overflow: visible !important;
+  }
+
 }
 
 #toolbar {
@@ -33,7 +39,7 @@
 
 @ui-tabs-panel-padding: 0;
 
-// @button-hover-background-color: 
+// @button-hover-background-color:
 
 .button-style() {
   text-transform: uppercase;
@@ -64,7 +70,38 @@
       color: mix(@mosaico-ui-background-color, @button-text-color);
     }
   }
-} 
+}
+
+
+.groupButton {
+  .ui-button {
+    padding-top: 7px !important;
+    padding-bottom: 7px !important;
+    line-height: 22px;
+    display: inline !important;
+
+
+    background-color: transparent !important;
+    &:hover, &.pressed {
+      background-color: lighten(@mosaico-ui-background-color, 10%) !important;
+      border-bottom: 3px solid #72bed2 !important;
+    }
+    &.selected, &.ui-state-active {
+      border-bottom: 2px solid @button-text-color;
+      border-top: 0;
+    }
+    &.ui-button-disabled, &.ui-button-disabled .ui-icon, &.ui-button-disabled .ui-button-text {
+      color: mix(@mosaico-ui-background-color, @button-text-color);
+    }
+  }
+  .ui-button.ui-state-active {
+     text-decoration: none;
+     background-color: @mosaico-ui-background-color !important;
+  }
+  .ui-button.ui-button-icon-only .ui-icon {
+    margin-right: 6px;
+  }
+}
 
 #main-toolbox #tooltabs.ui-tabs > .ui-tabs-nav {
   box-shadow: 0 0 10px @shadow-color;
@@ -76,7 +113,8 @@
 
 #main-toolbox #tooltabs.ui-tabs {
   .ui-tabs-nav {
-    font-size: 1em;
+    font-size: 0.9em;
+    background-color: @sidebar-background-color;
     li {
       margin: 1px 1px 0 0;
       line-height: @topbar-height - 4px;
@@ -97,19 +135,19 @@
     background-color: transparent;
   }
   li > a when (@buttonstyle) {
-    background-color: transparent; 
+    background-color: transparent;
     &:hover {
       background-color: lighten(@mosaico-ui-background-color, 10%);
       border-bottom: 3px solid lighten(@mosaico-ui-background-color, 10%);
-    } 
+    }
   }
 
   li@{activeclass} a {
     & when(@buttonstyle) {
       background-color: transparent;
       color: @button-text-color;
       border-bottom: 3px solid @button-text-color;
-    } 
+    }
   }
 }
 
@@ -207,9 +245,9 @@
 
 .mo .ui-button.ui-spinner-button {
   background-color: transparent;
-  // color: lighten(@text-color, 30%); 
+  // color: lighten(@text-color, 30%);
   .ui-button-text .ui-icon {
-    color: lighten(@text-color, 30%); 
+    color: lighten(@text-color, 30%);
   }
 }
 
@@ -273,11 +311,11 @@
 
 & when(true) {
   .mo .objEdit.level1 {
-      background-color: white;
-      box-shadow: 1px 1px 3px #888;
-      border-top: 0;
-      padding: 6px;
-      padding-top: .5em;
+    background-color: white;
+    box-shadow: 1px 1px 3px #888;
+    border-top: 0;
+    padding: 6px;
+    padding-top: .5em;
   }
 
   .mo #toolstyles, .mo #tooltheme {
@@ -291,18 +329,18 @@
   }
 
   .mo .objPreview {
-      border-width: 0;
-      box-shadow: inset 1px 1px 4px rgba(0,0,0,.3);
-      top: 4px;
-      left: 4px;
+    border-width: 0;
+    box-shadow: inset 1px 1px 4px rgba(0,0,0,.3);
+    top: 4px;
+    left: 4px;
   }
 
   .mo #toolstyles .objLabel.level1, .mo #tooltheme .objLabel.level1 {
     padding-left: 60px;
   }
 
-  .mo .propInput input[type=text], 
-  .mo .propInput input[type=number], 
+  .mo .propInput input[type=text],
+  .mo .propInput input[type=number],
   .mo .propInput input[type=url],
   .mo .propInput select,
   .mo .propInput .data-select select,
@@ -345,4 +383,4 @@
   .ui-icon {
     color: @button-text-color;
   }
-} 
+}