Skip to content

Commit

Permalink
Bumping to v3.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
ruhley committed Jul 30, 2017
1 parent 144d25f commit d279ed2
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 37 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,16 @@
# Changelog

## v3.4.1

#### Breaking Changes
* None

#### New Features
* None

#### Bug Fixes
* Bug #159 - Fixing slider positioning in grid

## v3.4.0

#### Breaking Changes
Expand Down
2 changes: 1 addition & 1 deletion bower.json
@@ -1,7 +1,7 @@
{
"name": "angular-color-picker",
"description": "Color Picker Directive For AngularJS",
"version": "3.4.0",
"version": "3.4.1",
"homepage": "https://github.com/ruhley/angular-color-picker",
"repository": {
"type": "git",
Expand Down
4 changes: 2 additions & 2 deletions dist/angularjs-color-picker.css
@@ -1,10 +1,10 @@
/*!
* angularjs-color-picker v3.4.0
* angularjs-color-picker v3.4.1
* https://github.com/ruhley/angular-color-picker/
*
* Copyright 2017 ruhley
*
* 2017-07-28 15:13:53
* 2017-07-31 08:38:21
*
*/
.color-picker-wrapper {
Expand Down
32 changes: 8 additions & 24 deletions dist/angularjs-color-picker.js
@@ -1,10 +1,10 @@
/*!
* angularjs-color-picker v3.4.0
* angularjs-color-picker v3.4.1
* https://github.com/ruhley/angular-color-picker/
*
* Copyright 2017 ruhley
*
* 2017-07-28 15:13:49
* 2017-07-31 08:38:19
*
*/

Expand Down Expand Up @@ -695,17 +695,9 @@ var AngularColorPickerController = function () {
if (!this.options.round) {
el = angular.element(this.$element[0].querySelector('.color-picker-grid .color-picker-picker'));

if (this.options.horizontal) {
el.css({
'left': 0,
'top': this.pickerDimensions.height * this.saturationPos / 100 + 'px'
});
} else {
el.css({
'left': this.pickerDimensions.width * this.saturationPos / 100 + 'px',
'top': 0
});
}
el.css({
'left': this.pickerDimensions.height * this.saturationPos / 100 + 'px'
});
}

el = angular.element(this.$element[0].querySelector('.color-picker-saturation .color-picker-slider'));
Expand All @@ -730,17 +722,9 @@ var AngularColorPickerController = function () {
if (!this.options.round) {
el = angular.element(this.$element[0].querySelector('.color-picker-grid .color-picker-picker'));

if (this.options.horizontal) {
el.css({
'left': this.pickerDimensions.width * this.lightnessPos / 100 + 'px',
'top': 0
});
} else {
el.css({
'left': 0,
'top': this.pickerDimensions.height * this.lightnessPos / 100 + 'px'
});
}
el.css({
'top': this.pickerDimensions.width * this.lightnessPos / 100 + 'px'
});
}

el = angular.element(this.$element[0].querySelector('.color-picker-lightness .color-picker-slider'));
Expand Down
4 changes: 2 additions & 2 deletions dist/angularjs-color-picker.min.css

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/angularjs-color-picker.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/themes/angularjs-color-picker-bootstrap.css
@@ -1,10 +1,10 @@
/*!
* angularjs-color-picker v3.4.0
* angularjs-color-picker v3.4.1
* https://github.com/ruhley/angular-color-picker/
*
* Copyright 2017 ruhley
*
* 2017-07-28 15:13:53
* 2017-07-31 08:38:21
*
*/
.color-picker-wrapper .color-picker-input-wrapper {
Expand Down
4 changes: 2 additions & 2 deletions dist/themes/angularjs-color-picker-bootstrap.min.css
@@ -1,9 +1,9 @@
/*!
* angularjs-color-picker v3.4.0
* angularjs-color-picker v3.4.1
* https://github.com/ruhley/angular-color-picker/
*
* Copyright 2017 ruhley
*
* 2017-07-28 15:13:53
* 2017-07-31 08:38:21
*
*/.color-picker-wrapper .color-picker-input-wrapper{width:100%}.color-picker-wrapper .color-picker-swatch:not(.input-group-addon){height:28px}.color-picker-wrapper.color-picker-swatch-only .input-group .input-group-addon{border-radius:4px}
2 changes: 1 addition & 1 deletion package.json
@@ -1,7 +1,7 @@
{
"name": "angularjs-color-picker",
"description": "Color Picker Directive For AngularJS",
"version": "3.4.0",
"version": "3.4.1",
"license": "MIT",
"main": "dist/angularjs-color-picker.min.js",
"dependencies": {
Expand Down

0 comments on commit d279ed2

Please sign in to comment.