From 89dc9d9b0f8c31bf6be8ae087658b674655b03d3 Mon Sep 17 00:00:00 2001 From: Dan Gray Date: Fri, 14 Nov 2014 10:17:52 +0000 Subject: [PATCH 1/6] Update to work with editor Update bower.json and add properties.schema --- bower.json | 2 ++ properties.schema | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 properties.schema diff --git a/bower.json b/bower.json index 1fe49ef9..5eef6313 100644 --- a/bower.json +++ b/bower.json @@ -5,6 +5,8 @@ "authors": [ "Daryl Hedley " ], + "displayName": "Vanilla", + "theme": "vanilla", "description": "A core bundled theme", "main": "js/vanilla.js", "keywords": [ diff --git a/properties.schema b/properties.schema new file mode 100644 index 00000000..8d942827 --- /dev/null +++ b/properties.schema @@ -0,0 +1,26 @@ +{ + "type":"object", + "$schema": "http://json-schema.org/draft-04/schema", + "id": "http://jsonschema.net", + "$ref": "http://localhost/plugins/content/theme/model.schema", + "properties":{ + "_screenSize": { + "type":"object", + "required":true, + "properties":{ + "large": { + "type":"string", + "required":true + }, + "medium": { + "type":"string", + "required":true + }, + "small": { + "type":"string", + "required":true + } + } + } + } +} From 68cff2659dcc1c97fd0757c11c2818afe4d9d203 Mon Sep 17 00:00:00 2001 From: Dan Gray Date: Thu, 27 Nov 2014 11:37:25 +0000 Subject: [PATCH 2/6] Update Karma version --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index c490c79f..c88815b1 100644 --- a/package.json +++ b/package.json @@ -16,8 +16,8 @@ "url": "https://github.com/adaptlearning/adapt-contrib-vanilla/issues" }, "devDependencies": { - "karma": "~0.10", - "karma-mocha": "*", - "karma-expect": "*" + "karma": "0.10", + "karma-mocha": "0.1.0", + "karma-expect": "1.1.0" } } From 95185a15f6671c6443e2db5faaeb331d8cb4c4d0 Mon Sep 17 00:00:00 2001 From: Daryl Hedley Date: Tue, 20 Jan 2015 14:51:01 +0000 Subject: [PATCH 3/6] Version bump fixes #61 --- bower.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index 5eef6313..4d77f062 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "adapt-contrib-vanilla", - "version": "0.0.0", + "version": "1.1.1", "homepage": "https://github.com/darylhedley/adapt-contrib-vanilla", "authors": [ "Daryl Hedley " diff --git a/package.json b/package.json index c88815b1..4b7e837d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "adapt-contrib-vanilla", - "version": "0.0.1", + "version": "1.1.1", "description": "A contributed vanilla theme", "main": "", "scripts": { From 8d64cc0fbe5f19708cc6d9125d57ef1feddef588 Mon Sep 17 00:00:00 2001 From: Lukasz Grela Date: Wed, 28 Jan 2015 08:49:27 +0000 Subject: [PATCH 4/6] Update variables.less --- less/variables.less | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/less/variables.less b/less/variables.less index 399f30f0..114d4a7f 100644 --- a/less/variables.less +++ b/less/variables.less @@ -216,6 +216,12 @@ @article-body-padding:@article-body-padding-top @article-body-padding-sides @article-body-padding-bottom; +@block-inner-padding-top:0px; +@block-inner-padding-sides:50px; +@block-inner-padding-bottom:40px; + +@block-inner-padding:@block-inner-padding-top @block-inner-padding-sides @block-inner-padding-bottom; + @block-body-padding-top:0px; @block-body-padding-sides:0px; @block-body-padding-bottom:0px; From 412c0af03153a07b674973b0c66dbb7980132276 Mon Sep 17 00:00:00 2001 From: Lukasz Grela Date: Wed, 28 Jan 2015 08:55:08 +0000 Subject: [PATCH 5/6] Update block.less Externalised `.block-inner` padding --- less/block.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/less/block.less b/less/block.less index a1227b04..16e1ea3a 100644 --- a/less/block.less +++ b/less/block.less @@ -4,7 +4,7 @@ .block { .responsive-layout; .block-inner { - padding:0px 20px 40px; + padding:@block-inner-padding; } .block-title { text-align:left; @@ -17,4 +17,4 @@ .block-body-inner { padding:@block-body-padding; } -} \ No newline at end of file +} From de32585abbe9c14516c90b953957d165eaf6ccbd Mon Sep 17 00:00:00 2001 From: Oliver Foster Date: Mon, 3 Aug 2015 18:11:16 +0100 Subject: [PATCH 6/6] version bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4b7e837d..e5420f03 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "adapt-contrib-vanilla", - "version": "1.1.1", + "version": "1.1.2", "description": "A contributed vanilla theme", "main": "", "scripts": {