Skip to content

Commit

Permalink
Merge pull request #58 from Voog/design-editor
Browse files Browse the repository at this point in the history
Add design editor support
  • Loading branch information
tanelj authored Jun 15, 2016
2 parents 495e6c6 + 195489d commit a0a060d
Show file tree
Hide file tree
Showing 28 changed files with 2,019 additions and 214 deletions.
24 changes: 12 additions & 12 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -283,16 +283,16 @@ module.exports = function(grunt) {

grunt.registerTask('default', ['clean:reset', 'modernizr_builder', 'concat', 'copy:assets', 'copy:images', 'copy:javascripts', 'uglify', 'sass', 'postcss:main_styles', 'cssmin', 'imagemin', 'postcss:custom_styles', 'copy:custom_styles', 'clean:remove']);

grunt.event.on('watch', function(action, filepath, target) {
if (target == 'voog') {
if (action == 'added' || action == 'deleted') {
grunt.task.run(['exec:kitmanifest']);
}
if (grunt.file.exists('.voog')) {
if (action != 'deleted') {
grunt.task.run(['exec:kit:' + filepath]);
}
}
}
});
// grunt.event.on('watch', function(action, filepath, target) {
// if (target == 'voog') {
// if (action == 'added' || action == 'deleted') {
// grunt.task.run(['exec:kitmanifest']);
// }
// if (grunt.file.exists('.voog')) {
// if (action != 'deleted') {
// grunt.task.run(['exec:kit:' + filepath]);
// }
// }
// }
// });
};
84 changes: 0 additions & 84 deletions components/bg-picker-variables.tpl

This file was deleted.

11 changes: 11 additions & 0 deletions components/html-head.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,17 @@
{% if editmode %}<link rel="stylesheet" href="{{ site.static_asset_host }}/libs/edicy-tools/latest/edicy-tools.css">{% endif %}
<link rel="stylesheet" href="{{ site.static_asset_host }}/libs/edicy-search/latest/edicy-search.css">

{% comment %}Custom fonts{% endcomment %}
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Fira+Sans:400,400italic,700,700italic|Lato:400,400italic,700,700italic|Montserrat:400,700|Open+Sans:400,400italic,700,700italic|Roboto:400,400italic,700,700italic|Source+Sans+Pro:400,400italic,700,700italic|Ubuntu:400,400italic,700,700italic|Arvo|Crimson+Text:400,400italic,700,700italic|Lora:400,400italic,700,700italic|Noto+Serif|Playfair+Display:400,400italic,700italic,700|PT+Serif:400,400italic,700,700italic|Roboto+Slab:400,700|Anonymous+Pro:400,400italic,700,700italic|Cousine:400,400italic,700,700italic|Roboto+Mono:400,400italic,700,700italic|Ubuntu+Mono:400,400italic,700,700italic&subset=latin,greek,cyrillic-ext,latin-ext,cyrillic,greek-ext,vietnamese,hebrew">

{% customstyle %}
{% include "template-cs-main-styles" %}
{% include "template-cs-headings" %}
{% include "template-cs-content" %}

{% include "template-cs-style-rules" %}
{% endcustomstyle %}

{% comment %}MODERNIZR - HTML5 SUPPORT FOR OLDER BROWSERS, SVG SUPPORT DETECTION ETC{% endcomment %}
<script src="{{ javascripts_path }}/modernizr-custom.min.js"></script>

Expand Down
165 changes: 165 additions & 0 deletions components/template-cs-content.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
:root {
/* VoogStyle
"pathI18n": ["content", "text"],
"titleI18n": "line_height",
"editor": "rangePicker",
"min": 1,
"max": 5,
"step": 0.1,
"unit": "",
"scope": "global"
*/
--content-body-line-height: 1.3;
/* VoogStyle
"pathI18n": ["content", "text"],
"titleI18n": "size",
"editor": "rangePicker",
"min": 8,
"max": 100,
"unit": "px",
"featured": true,
"scope": "global"
*/
--content-body-font-size: 18px;
/* VoogStyle
"pathI18n": ["content", "text"],
"titleI18n": "color",
"editor": "colorPicker",
"featured": true,
"scope": "global"
*/
--content-body-color: #727272;
/* VoogStyle
"pathI18n": ["content", "link", "normal"],
"titleI18n": "font_size",
"type": "button",
"editor": "toggleIcon",
"states": {
"on": "600",
"off": "400"
},
"icon": "bold",
"scope": "global",
"boundVariables": [
"--content-link-hover-font-weight"
]
*/
--content-link-font-weight: 400;
/* VoogStyle
"pathI18n": ["content", "link", "hover"],
"titleI18n": "font_size",
"type": "button",
"editor": "toggleIcon",
"states": {
"on": "600",
"off": "400"
},
"icon": "bold",
"scope": "global"
*/
--content-link-hover-font-weight: 400;
/* VoogStyle
"pathI18n": ["content", "link", "normal"],
"titleI18n": "font_style",
"type": "button",
"editor": "toggleIcon",
"states": {
"on": "italic",
"off": "normal"
},
"icon": "italic",
"scope": "global",
"boundVariables": [
"--content-link-hover-font-style"
]
*/
--content-link-font-style: normal;
/* VoogStyle
"pathI18n": ["content", "link", "hover"],
"titleI18n": "font_style",
"type": "button",
"editor": "toggleIcon",
"states": {
"on": "italic",
"off": "normal"
},
"icon": "italic",
"scope": "global"
*/
--content-link-hover-font-style: normal;
/* VoogStyle
"pathI18n": ["content", "link", "normal"],
"titleI18n": "text_decoration",
"type": "button",
"editor": "toggleIcon",
"states": {
"on": "underline",
"off": "none"
},
"icon": "underline",
"scope": "global",
"boundVariables": [
"--content-link-hover-text-decoration"
]
*/
--content-link-text-decoration: none;
/* VoogStyle
"pathI18n": ["content", "link", "hover"],
"titleI18n": "text_decoration",
"type": "button",
"editor": "toggleIcon",
"states": {
"on": "underline",
"off": "none"
},
"icon": "underline",
"scope": "global"
*/
--content-link-hover-text-decoration: none;
/* VoogStyle
"pathI18n": ["content", "link", "normal"],
"titleI18n": "text_transform",
"type": "button",
"editor": "toggleIcon",
"states": {
"on": "uppercase",
"off": "none"
},
"icon": "uppercase",
"scope": "global",
"boundVariables": [
"--content-link-hover-text-transform"
]
*/
--content-link-text-transform: none;
/* VoogStyle
"pathI18n": ["content", "link", "hover"],
"titleI18n": "text_transform",
"type": "button",
"editor": "toggleIcon",
"states": {
"on": "uppercase",
"off": "none"
},
"icon": "uppercase",
"scope": "global"
*/
--content-link-hover-text-transform: none;
/* VoogStyle
"pathI18n": ["content", "link", "normal"],
"titleI18n": "color",
"type": "button",
"editor": "colorPicker",
"featured": true,
"scope": "global"
*/
--content-link-color: #0066bb;
/* VoogStyle
"pathI18n": ["content", "link", "hover"],
"titleI18n": "color",
"type": "button",
"editor": "colorPicker",
"scope": "global"
*/
--content-link-hover-color: rgba(0, 102, 187, 0.8);
}
Loading

0 comments on commit a0a060d

Please sign in to comment.