javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-22 13:32:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

style(popover): fix linter errors for sass and ts

Browse Source 
references #5420
This commit is contained in:
Brandy Carney
2016-05-24 11:11:40 -04:00
parent 2cd1b51628
commit 1373108f51
4 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/components/popover/popover.ios.scss
View File

@ -9,7 +9,9 @@ $popover-ios-max-width: 270px !default;
$popover-ios-max-height: 90% !default; $popover-ios-max-height: 90% !default;
$popover-ios-border-radius: 10px !default; $popover-ios-border-radius: 10px !default;
$popover-ios-text-color: #000 !default; $popover-ios-text-color: #000 !default;
$popover-ios-background: #f3f3f3 !default; $popover-ios-background: #f3f3f3 !default;
$popover-ios-arrow-background: $popover-ios-background !default;
.popover-wrapper { .popover-wrapper {
@ -30,23 +32,26 @@ $popover-ios-background: #f3f3f3 !default;
.popover-arrow { .popover-arrow {
position: absolute; position: absolute;
display: block; display: block;
width: 20px;
height: 10px;
overflow: hidden; overflow: hidden;
&:after { width: 20px;
position: absolute; height: 10px;
z-index: $z-index-overlay-wrapper; &::after {
position: absolute;
top: 3px; top: 3px;
left: 3px; left: 3px;
z-index: $z-index-overlay-wrapper;
width: 14px; width: 14px;
height: 14px; height: 14px;
background-color: $popover-ios-background;
border-radius: 3px; border-radius: 3px;
content: ''; background-color: $popover-ios-arrow-background;
content: "";
transform: rotate(45deg); transform: rotate(45deg);
} }
} }
@ -54,7 +59,8 @@ $popover-ios-background: #f3f3f3 !default;
.popover-bottom .popover-arrow { .popover-bottom .popover-arrow {
top: auto; top: auto;
bottom: -10px; bottom: -10px;
&:after {
&::after {
top: -6px; top: -6px;
} }
} }

8
src/components/popover/popover.scss
View File

@ -27,15 +27,15 @@ ion-popover {
z-index: $z-index-overlay-wrapper; z-index: $z-index-overlay-wrapper;
display: flex; display: flex;
overflow: hidden;
flex-direction: column; flex-direction: column;
width: $popover-width; width: $popover-width;
height: $popover-height;
min-width: $popover-width; min-width: $popover-width;
max-height: $popover-height;
overflow: hidden; height: $popover-height;
max-height: $popover-height;
opacity: 0; opacity: 0;

4
src/components/popover/popover.ts
View File

@ -5,7 +5,7 @@ import {Animation} from '../../animations/animation';
import {Transition, TransitionOptions} from '../../transitions/transition'; import {Transition, TransitionOptions} from '../../transitions/transition';
import {Config} from '../../config/config'; import {Config} from '../../config/config';
import {NavParams} from '../nav/nav-params'; import {NavParams} from '../nav/nav-params';
import {Platform} from '../../platform/platform' import {Platform} from '../../platform/platform';
import {isPresent, isUndefined, isDefined} from '../../util/util'; import {isPresent, isUndefined, isDefined} from '../../util/util';
import {ViewController} from '../nav/view-controller'; import {ViewController} from '../nav/view-controller';
@ -173,7 +173,7 @@ class PopoverTransition extends Transition {
let arrowCSS = { let arrowCSS = {
top: targetTop + targetHeight, top: targetTop + targetHeight,
left: targetLeft + (targetWidth / 2) - (arrowWidth / 2) left: targetLeft + (targetWidth / 2) - (arrowWidth / 2)
} };
let popoverCSS = { let popoverCSS = {
top: targetTop + targetHeight + (arrowHeight - 1), top: targetTop + targetHeight + (arrowHeight - 1),