Skip to content

Commit d279ed2

Browse files
committed
Bumping to v3.4.1
1 parent 144d25f commit d279ed2

9 files changed

+32
-37
lines changed

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# Changelog
22

3+
## v3.4.1
4+
5+
#### Breaking Changes
6+
* None
7+
8+
#### New Features
9+
* None
10+
11+
#### Bug Fixes
12+
* Bug #159 - Fixing slider positioning in grid
13+
314
## v3.4.0
415

516
#### Breaking Changes

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "angular-color-picker",
33
"description": "Color Picker Directive For AngularJS",
4-
"version": "3.4.0",
4+
"version": "3.4.1",
55
"homepage": "https://github.com/ruhley/angular-color-picker",
66
"repository": {
77
"type": "git",

dist/angularjs-color-picker.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*!
2-
* angularjs-color-picker v3.4.0
2+
* angularjs-color-picker v3.4.1
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2017 ruhley
66
*
7-
* 2017-07-28 15:13:53
7+
* 2017-07-31 08:38:21
88
*
99
*/
1010
.color-picker-wrapper {

dist/angularjs-color-picker.js

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*!
2-
* angularjs-color-picker v3.4.0
2+
* angularjs-color-picker v3.4.1
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2017 ruhley
66
*
7-
* 2017-07-28 15:13:49
7+
* 2017-07-31 08:38:19
88
*
99
*/
1010

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

698-
if (this.options.horizontal) {
699-
el.css({
700-
'left': 0,
701-
'top': this.pickerDimensions.height * this.saturationPos / 100 + 'px'
702-
});
703-
} else {
704-
el.css({
705-
'left': this.pickerDimensions.width * this.saturationPos / 100 + 'px',
706-
'top': 0
707-
});
708-
}
698+
el.css({
699+
'left': this.pickerDimensions.height * this.saturationPos / 100 + 'px'
700+
});
709701
}
710702

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

733-
if (this.options.horizontal) {
734-
el.css({
735-
'left': this.pickerDimensions.width * this.lightnessPos / 100 + 'px',
736-
'top': 0
737-
});
738-
} else {
739-
el.css({
740-
'left': 0,
741-
'top': this.pickerDimensions.height * this.lightnessPos / 100 + 'px'
742-
});
743-
}
725+
el.css({
726+
'top': this.pickerDimensions.width * this.lightnessPos / 100 + 'px'
727+
});
744728
}
745729

746730
el = angular.element(this.$element[0].querySelector('.color-picker-lightness .color-picker-slider'));

dist/angularjs-color-picker.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angularjs-color-picker.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/themes/angularjs-color-picker-bootstrap.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*!
2-
* angularjs-color-picker v3.4.0
2+
* angularjs-color-picker v3.4.1
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2017 ruhley
66
*
7-
* 2017-07-28 15:13:53
7+
* 2017-07-31 08:38:21
88
*
99
*/
1010
.color-picker-wrapper .color-picker-input-wrapper {
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*!
2-
* angularjs-color-picker v3.4.0
2+
* angularjs-color-picker v3.4.1
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2017 ruhley
66
*
7-
* 2017-07-28 15:13:53
7+
* 2017-07-31 08:38:21
88
*
99
*/.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}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "angularjs-color-picker",
33
"description": "Color Picker Directive For AngularJS",
4-
"version": "3.4.0",
4+
"version": "3.4.1",
55
"license": "MIT",
66
"main": "dist/angularjs-color-picker.min.js",
77
"dependencies": {

0 commit comments

Comments
 (0)