Skip to content

Commit db4ad7f

Browse files
committed
Removing extra elements to fix styling in IE
1 parent 6b43c5a commit db4ad7f

File tree

2 files changed

+2
-16
lines changed

2 files changed

+2
-16
lines changed

lib/scripts/template.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@ angular.module('color.picker').run(['$templateCache', function($templateCache) {
22
$templateCache.put('template/color-picker/directive.html',
33
'<div class="color-picker-wrapper" ng-class="{\'color-picker-swatch-only\': config.swatchOnly}">\n' +
44
' <div ng-class="{\'input-group\': config.swatchBootstrap}">\n' +
5-
' <span ng-if="config.swatchPos === \'left\'" class="color-picker-swatch" ng-click="focus()" ng-show="config.swatch" ng-class="{\'color-picker-swatch-left\': config.swatchPos !== \'right\', \'color-picker-swatch-right\': config.swatchPos === \'right\', \'input-group-addon\': config.swatchBootstrap}">\n' +
6-
' <span class="color-picker-swatch-color" ng-attr-style="background-color: {{swatchColor}};"></span>\n' +
7-
' </span>\n' +
5+
' <span ng-if="config.swatchPos === \'left\'" ng-attr-style="background-color: {{swatchColor}};" class="color-picker-swatch" ng-click="focus()" ng-show="config.swatch" ng-class="{\'color-picker-swatch-left\': config.swatchPos !== \'right\', \'color-picker-swatch-right\': config.swatchPos === \'right\', \'input-group-addon\': config.swatchBootstrap}"></span>\n' +
86
' <input class="color-picker-input form-control" type="text" ng-model="ngModel" size="7" ng-focus="show()" ng-class="{\'color-picker-input-swatch\': config.swatch && !config.swatchOnly && config.swatchPos === \'left\'}">\n' +
9-
' <span ng-if="config.swatchPos === \'right\'" class="color-picker-swatch" ng-click="focus()" ng-show="config.swatch" ng-class="{\'color-picker-swatch-left\': config.swatchPos !== \'right\', \'color-picker-swatch-right\': config.swatchPos === \'right\', \'input-group-addon\': config.swatchBootstrap}">\n' +
10-
' <span class="color-picker-swatch-color" ng-attr-style="background-color: {{swatchColor}};"></span>\n' +
11-
' </span>\n' +
7+
' <span ng-if="config.swatchPos === \'right\'" ng-attr-style="background-color: {{swatchColor}};" class="color-picker-swatch" ng-click="focus()" ng-show="config.swatch" ng-class="{\'color-picker-swatch-left\': config.swatchPos !== \'right\', \'color-picker-swatch-right\': config.swatchPos === \'right\', \'input-group-addon\': config.swatchBootstrap}"></span>\n' +
128
' </div>\n' +
139
' <div class="color-picker-panel" ng-show="visible" ng-class="{\n' +
1410
' \'color-picker-panel-top color-picker-panel-right\': config.pos === \'top right\',\n' +

lib/styles/angularjs-color-picker.less

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,8 @@
4040

4141
&.input-group-addon {
4242
display: table-cell;
43-
position: relative;
4443
width: 28px;
4544
}
46-
47-
.color-picker-swatch-color {
48-
position: absolute;
49-
top: 0;
50-
left: 0;
51-
right: 0;
52-
bottom: 0;
53-
border-radius: inherit;
54-
}
5545
}
5646

5747
.color-picker-panel {

0 commit comments

Comments
 (0)