Skip to content
This repository has been archived by the owner on Dec 8, 2022. It is now read-only.

Commit

Permalink
More test fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Blackbaud-StacyCarlos
Blackbaud-StacyCarlos committed Apr 24, 2018
1 parent 680e59f commit 25df94a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 181 deletions.
2 changes: 1 addition & 1 deletion skyux-spa-visual-tests/src/app/colorpicker/colorpicker.visual-spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe('Colorpicker', () => {
return SkyVisualTest
.setupTest('colorpicker')
.then(() => {
element(by.css('button')).click();
element(by.css('button.sky-btn')).click();
SkyVisualTest.moveCursorOffScreen();
return SkyVisualTest.compareScreenshot({
screenshotName: 'colorpicker-opened',
Expand Down
187 changes: 8 additions & 179 deletions src/modules/colorpicker/colorpicker.component.html
View file
Original file line number Diff line number Diff line change
@@ -1,182 +1,11 @@
<div
class="sky-colorpicker-input-group"
[ngClass]="{ 'sky-colorpicker-hidden': !isVisible }">
<!-- <sky-dropdown
[messageStream]="dropdownController">
<sky-dropdown-menu>
<div class="sky-colorpicker-container">
<div
class="sky-colorpicker"
#colorPicker>
<div
[skyColorpickerSlider]
[style.background-color]="hueSliderColor"
[xAxis]="1"
[yAxis]="1"
(newColorContrast)="saturationAndLightness=$event"
class="saturation-lightness"
[color]="slider.saturation - slider.value">
<div
[style.left.px]="slider.saturation"
[style.top.px]="slider.value"
class="cursor">
</div>
</div>
<div class="box">
<div class="left">
<div class="selected-color-background">
</div>
<div
[style.background-color]="selectedColor?.rgbaText"
class="selected-color">
</div>
</div>
<div class="right">
<div
[skyColorpickerSlider]
[xAxis]="1"
(newColorContrast)="hue=$event"
class="hue"
#hueSlider>
<div
[style.left.px]="slider.hue"
class="cursor">
</div>
</div>
<div
[skyColorpickerSlider]
[style.background-color]="alphaSliderColor"
[xAxis]="1"
(newColorContrast)="alphaAxis=$event"
class="alpha"
#alphaSlider>
<div
[style.left.px]="slider.alpha"
class="cursor">
</div>
</div>
</div>
</div>
<div class="rgba-text">
<div class="box">
<label
[for]="skyColorpickerHexId"
[attr.aria-label]="'colorpicker_hex_aria' | skyResources">
{{ 'colorpicker_hex' | skyResources }}
</label>
<label
[for]="skyColorpickerRedId"
[attr.aria-label]="'colorpicker_red_aria' | skyResources">
{{ 'colorpicker_red' | skyResources }}
</label>
<label
[for]="skyColorpickerGreenId"
[attr.aria-label]="'colorpicker_green_aria' | skyResources">
{{ 'colorpicker_green' | skyResources }}
</label>
<label
[for]="skyColorpickerBlueId"
[attr.aria-label]="'colorpicker_blue_aria' | skyResources">
{{ 'colorpicker_blue' | skyResources }}
</label>
<label
[for]="skyColorpickerAlphaId"
[attr.aria-label]="'colorpicker_alpha_aria' | skyResources">
{{ 'colorpicker_alpha' | skyResources }}
</label>
</div>
<div class="box">
<input
[id]="skyColorpickerHexId"
[skyColorpickerText]
(newColorContrast)="hex=$event"
[value]="hexText"
pattern="^#?([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$">
<input
[id]="skyColorpickerRedId"
[skyColorpickerText]
type="number"
pattern="[0-9]*"
min="0"
max="255"
[maxRange]="255"
(newColorContrast)="red=$event"
[value]="rgbaText?.red">
<input
[id]="skyColorpickerGreenId"
[skyColorpickerText]
type="number"
pattern="[0-9]*"
min="0"
max="255"
[maxRange]="255"
(newColorContrast)="green=$event"
[value]="rgbaText?.green">
<input
[id]="skyColorpickerBlueId"
[skyColorpickerText]
type="number"
pattern="[0-9]*"
min="0"
max="255"
[maxRange]="255"
(newColorContrast)="blue=$event"
[value]="rgbaText?.blue">
<input
[id]="skyColorpickerAlphaId"
[skyColorpickerText]
type="number"
pattern="[0-9]+([\.,][0-9]{1,2})?"
min="0"
max="1"
step="0.1"
[maxRange]="1"
(newColorContrast)="alphaColor=$event"
[value]="rgbaText?.alpha">
</div>
</div>
<div
*ngIf="presetColors && presetColors.length"
class="sky-colorpicker-preset-color-area">
<button
*ngFor="let color of presetColors | slice:0:12; let i = index;"
class="sky-preset-color"
type="button"
[attr.aria-label]="('colorpicker_preset_color' | skyResources) + ' ' + color"[style.backgroundColor]="color"
(click)="setColorFromString(color)">
</button>
</div>
</div>
<div class="sky-colorpicker-container sky-colorpicker-footer">
<section class="sky-colorpicker-column">
<button
class="sky-btn sky-btn-primary sky-btn-colorpicker-apply"
type="button"
[attr.aria-label]="'colorpicker_apply' | skyResources"
(click)="applyColor()">
{{ 'colorpicker_apply' | skyResources }}
</button>
<button
class="sky-btn sky-btn-link sky-btn-colorpicker-close"
type="button"
[attr.aria-label]="'colorpicker_close' | skyResources"
(click)="closePicker()"
#closeColorPicker>
{{ 'colorpicker_close' | skyResources }}
</button>
</section>
</div>
</div>
</sky-dropdown-menu>
</sky-dropdown> -->
<ng-content></ng-content>
<button
type="button"
class="sky-btn sky-dropdown-button"
[skyPopover]="popover"
[skyPopoverTrigger]="click"
[skyPopoverAlignment]="alignment"
skyPopoverPlacement="below"
#triggerButton>
Expand Down Expand Up @@ -353,12 +182,12 @@
</div>
</div>
</sky-popover>
<div *ngIf="showResetButton">
<button
class="sky-colorpicker-reset-button"
type="button"
[attr.aria-label]="'colorpicker_reset' | skyResources"
(click)="resetPickerColor()">
</button>
</div>
<div *ngIf="showResetButton">
<button
class="sky-colorpicker-reset-button"
type="button"
[attr.aria-label]="'colorpicker_reset' | skyResources"
(click)="resetPickerColor()">
</button>
</div>
</div>
2 changes: 1 addition & 1 deletion src/modules/popover/popover-adapter.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ export class SkyPopoverAdapterService {
position.left = callerRect.right - pixelTolerance;
}

if (position.left + popoverRect.width - pixelTolerance < callerRect.left ) {
if (position.left + popoverRect.width - pixelTolerance < callerRect.left) {
position.left = callerRect.left - popoverRect.width + pixelTolerance;
}
}
Expand Down

0 comments on commit 25df94a

Please sign in to comment.