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

fix(popover): remove min-height from ios, add sass variables

Browse Source 
sass variables added for min-width and min-height.

closes #7215
This commit is contained in:
Brandy Carney
2016-07-08 14:25:21 -04:00
parent d1234643ee
commit 55bc32dafe
6 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/components.core.scss
View File

@ -22,7 +22,6 @@
"components/loading/loading", "components/loading/loading",
"components/menu/menu", "components/menu/menu",
"components/modal/modal", "components/modal/modal",
"components/popover/popover",
"components/range/range", "components/range/range",
"components/refresher/refresher", "components/refresher/refresher",
"components/scroll/scroll", "components/scroll/scroll",

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

@ -1,9 +1,12 @@
@import "../../globals.core"; @import "../../globals.core";
@import "./popover";
// iOS Popover // iOS Popover
// -------------------------------------------------- // --------------------------------------------------
$popover-ios-width: 200px !default; $popover-ios-width: 200px !default;
$popover-ios-min-width: 0 !default;
$popover-ios-min-height: 0 !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;
@ -16,7 +19,8 @@ $popover-ios-arrow-background: $popover-ios-background !default;
.popover-content { .popover-content {
width: $popover-ios-width; width: $popover-ios-width;
min-width: $popover-ios-min-width;
min-height: $popover-ios-min-height;
max-height: $popover-ios-max-height; max-height: $popover-ios-max-height;
border-radius: $popover-ios-border-radius; border-radius: $popover-ios-border-radius;

7
src/components/popover/popover.md.scss
View File

@ -1,9 +1,12 @@
@import "../../globals.core"; @import "../../globals.core";
@import "./popover";
// Material Design Popover // Material Design Popover
// -------------------------------------------------- // --------------------------------------------------
$popover-md-width: 250px !default; $popover-md-width: 250px !default;
$popover-md-min-width: 0 !default;
$popover-md-min-height: 0 !default;
$popover-md-max-height: 90% !default; $popover-md-max-height: 90% !default;
$popover-md-border-radius: 2px !default; $popover-md-border-radius: 2px !default;
@ -17,8 +20,8 @@ $popover-md-item-background: $popover-md-background !default;
.popover-content { .popover-content {
width: $popover-md-width; width: $popover-md-width;
min-width: 0; min-width: $popover-md-min-width;
min-height: 0; min-height: $popover-md-min-height;
max-height: $popover-md-max-height; max-height: $popover-md-max-height;
border-radius: $popover-md-border-radius; border-radius: $popover-md-border-radius;

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

@ -34,8 +34,6 @@ ion-popover {
flex-direction: column; flex-direction: column;
min-height: 200px;
scroll-content { scroll-content {
position: relative; position: relative;
} }

7
src/components/popover/popover.wp.scss
View File

@ -1,9 +1,12 @@
@import "../../globals.core"; @import "../../globals.core";
@import "./popover";
// Windows Popover // Windows Popover
// -------------------------------------------------- // --------------------------------------------------
$popover-wp-width: 200px !default; $popover-wp-width: 200px !default;
$popover-wp-min-width: 0 !default;
$popover-wp-min-height: 0 !default;
$popover-wp-max-height: 90% !default; $popover-wp-max-height: 90% !default;
$popover-wp-border: 2px solid #ccc !default; $popover-wp-border: 2px solid #ccc !default;
@ -16,8 +19,8 @@ $popover-wp-item-background: $popover-wp-background !default;
.popover-content { .popover-content {
width: $popover-wp-width; width: $popover-wp-width;
min-width: 0; min-width: $popover-wp-min-width;
min-height: 0; min-height: $popover-wp-min-height;
max-height: $popover-wp-max-height; max-height: $popover-wp-max-height;
border: $popover-wp-border; border: $popover-wp-border;

2
src/components/popover/test/basic/index.ts
View File

@ -139,8 +139,6 @@ class PopoverRadioPage {
<ion-list-header>Ionic</ion-list-header> <ion-list-header>Ionic</ion-list-header>
<button ion-item (click)="close()">Learn Ionic</button> <button ion-item (click)="close()">Learn Ionic</button>
<button ion-item (click)="close()">Documentation</button> <button ion-item (click)="close()">Documentation</button>
<button ion-item (click)="close()">Showcase</button>
<button ion-item (click)="close()">GitHub Repo</button>
</ion-list> </ion-list>
` `
}) })