Merge branch 'develop'

Author: jamiepollock

appveyor.yml

@@ -1,7 +1,7 @@
 os: Visual Studio 2015
 
 # Version format
-version: 0.1.0.{build}
+version: 0.1.1.{build}
 
 cache:
   - src\packages -> **\packages.config   # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified

docs/Usage.md

@@ -16,7 +16,7 @@ Here are sample usages of the currently supported property editors. You are not
  - **Supported values**:
    - **Vertical**: top, center & bottom
    - **Horizontal**: left, center & right
- - **Editor**: 3 × 3 grid
+ - **Editor**: 3×3 grid
 
 ```json
 ...
@@ -62,8 +62,8 @@ Here are sample usages of the currently supported property editors. You are not
 ```json
 ...
   {
-    "label": "Set background repetition",
-    "description": "Set background repetition",
+    "label": "Set background size",
+    "description": "Set background size",
     "key": "background-size",
     "view": "/App_Plugins/Our.Umbraco.GridSettings/editors/BackgroundSize/view.html"
   }
@@ -72,9 +72,9 @@ Here are sample usages of the currently supported property editors. You are not
 
 ### Color Picker
 
- - **Typical CSS Property**: background-color, color (anything which supports CSS colors)
- - **Supported values**: Developer provided prevalues (see below). The value or string must be a valid CSS color value.
- - **Editor**: Simple color picker
+ - **Typical CSS Property**: background-color, color (anything which expects a hexcode color)
+ - **Supported values**: Developer provided prevalues (see below). The value or string must be a valid hexcode color value. Non-hexcode color values are not supported.
+ - **Editor**: Simple color picker (reupurposing the Approved Color Picker editor)
 
 **Note**: Prior to v7.5.4 grid prevalues only supported a string array. From v7.5.4+ prevalues support a mixture of label/value objects and strings.
 

src/Our.Umbraco.GridSettings.Web/App_Plugins/Our.Umbraco.GridSettings/editors/ColorPicker/controller.js

@@ -1,15 +1,12 @@
 (function () {
     'use strict';
 
-    var controller = function ($scope, assetsService) {
-        assetsService.loadCss("/App_Plugins/Our.Umbraco.GridSettings/editors/ColorPicker/view.css");
-
+    var controller = function ($scope) {
         $scope.colors = [];
 
         for (var prevalueIndex = 0; prevalueIndex < $scope.model.prevalues.length; prevalueIndex++) {
             var prevalue = $scope.model.prevalues[prevalueIndex];
 
-
             if (typeof (prevalue) === 'string') {
                 $scope.colors.push({
                     'label': prevalue,

src/Our.Umbraco.GridSettings.Web/App_Plugins/Our.Umbraco.GridSettings/editors/ColorPicker/view.css

@@ -1,5 +1,9 @@
 <div ng-controller="Our.Umbraco.GridSettings.ColorPickerController">
-    <ul class="gridsettings--colorpicker unstyled">
-        <li ng-repeat="item in colors" style="background-color: {{item.value}}" ng-class="{'active': isValue(item.value)}" title="{{item.label}}" ng-click="setValue(item.value)"><!-- --></li>
+    <ul class="thumbnails color-picker">
+        <li ng-repeat="item in colors" ng-class="{active: isValue(item.value)}" title="{{item.label}}">
+            <a ng-click="setValue(item.value)" class="thumbnail" hex-bg-color="{{item.value}}">
+                <!-- -->
+            </a>
+        </li>
     </ul>
 </div>