Skip to content

Commit

Permalink
style(popover): fix linter errors for sass and ts
Browse files Browse the repository at this point in the history
references #5420
  • Loading branch information
brandyscarney committed May 24, 2016
1 parent 2cd1b51 commit 1373108
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 14 deletions.
20 changes: 13 additions & 7 deletions src/components/popover/popover.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ $popover-ios-max-width: 270px !default;
$popover-ios-max-height: 90% !default;
$popover-ios-border-radius: 10px !default;
$popover-ios-text-color: #000 !default;

$popover-ios-background: #f3f3f3 !default;
$popover-ios-arrow-background: $popover-ios-background !default;


.popover-wrapper {
Expand All @@ -30,31 +32,35 @@ $popover-ios-background: #f3f3f3 !default;
.popover-arrow {
position: absolute;
display: block;

overflow: hidden;

width: 20px;
height: 10px;
overflow: hidden;

&:after {
&::after {
position: absolute;

z-index: $z-index-overlay-wrapper;

top: 3px;
left: 3px;

z-index: $z-index-overlay-wrapper;

width: 14px;
height: 14px;

background-color: $popover-ios-background;
border-radius: 3px;
content: '';
background-color: $popover-ios-arrow-background;
content: "";
transform: rotate(45deg);
}
}

.popover-bottom .popover-arrow {
top: auto;
bottom: -10px;
&:after {

&::after {
top: -6px;
}
}
8 changes: 4 additions & 4 deletions src/components/popover/popover.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ ion-popover {
z-index: $z-index-overlay-wrapper;
display: flex;

overflow: hidden;

flex-direction: column;

width: $popover-width;
height: $popover-height;

min-width: $popover-width;
max-height: $popover-height;

overflow: hidden;
height: $popover-height;
max-height: $popover-height;

opacity: 0;

Expand Down
4 changes: 2 additions & 2 deletions src/components/popover/popover.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {Animation} from '../../animations/animation';
import {Transition, TransitionOptions} from '../../transitions/transition';
import {Config} from '../../config/config';
import {NavParams} from '../nav/nav-params';
import {Platform} from '../../platform/platform'
import {Platform} from '../../platform/platform';
import {isPresent, isUndefined, isDefined} from '../../util/util';
import {ViewController} from '../nav/view-controller';

Expand Down Expand Up @@ -173,7 +173,7 @@ class PopoverTransition extends Transition {
let arrowCSS = {
top: targetTop + targetHeight,
left: targetLeft + (targetWidth / 2) - (arrowWidth / 2)
}
};

let popoverCSS = {
top: targetTop + targetHeight + (arrowHeight - 1),
Expand Down
2 changes: 1 addition & 1 deletion src/config/modes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ Config.setModeConfig('wp', {
pickerLeave: 'picker-slide-out',

popoverEnter: 'popover-wp-pop-in',
popoverLeave: 'popover-wp-pop-out',
popoverLeave: 'popover-wp-pop-out',

spinner: 'circles',

Expand Down

0 comments on commit 1373108

Please sign in to comment.