diff --git a/src/components.core.scss b/src/components.core.scss index 41510489541..7425f296241 100644 --- a/src/components.core.scss +++ b/src/components.core.scss @@ -22,7 +22,6 @@ "components/loading/loading", "components/menu/menu", "components/modal/modal", - "components/popover/popover", "components/range/range", "components/refresher/refresher", "components/scroll/scroll", diff --git a/src/components/popover/popover.ios.scss b/src/components/popover/popover.ios.scss index 084857103d9..1f28e5a7cd3 100644 --- a/src/components/popover/popover.ios.scss +++ b/src/components/popover/popover.ios.scss @@ -1,9 +1,12 @@ @import "../../globals.core"; +@import "./popover"; // iOS Popover // -------------------------------------------------- $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-border-radius: 10px !default; @@ -16,7 +19,8 @@ $popover-ios-arrow-background: $popover-ios-background !default; .popover-content { width: $popover-ios-width; - + min-width: $popover-ios-min-width; + min-height: $popover-ios-min-height; max-height: $popover-ios-max-height; border-radius: $popover-ios-border-radius; diff --git a/src/components/popover/popover.md.scss b/src/components/popover/popover.md.scss index eaf99aa3920..022f02397d0 100644 --- a/src/components/popover/popover.md.scss +++ b/src/components/popover/popover.md.scss @@ -1,9 +1,12 @@ @import "../../globals.core"; +@import "./popover"; // Material Design Popover // -------------------------------------------------- $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-border-radius: 2px !default; @@ -17,8 +20,8 @@ $popover-md-item-background: $popover-md-background !default; .popover-content { width: $popover-md-width; - min-width: 0; - min-height: 0; + min-width: $popover-md-min-width; + min-height: $popover-md-min-height; max-height: $popover-md-max-height; border-radius: $popover-md-border-radius; diff --git a/src/components/popover/popover.scss b/src/components/popover/popover.scss index fb2e80612c5..f462d799d85 100644 --- a/src/components/popover/popover.scss +++ b/src/components/popover/popover.scss @@ -34,8 +34,6 @@ ion-popover { flex-direction: column; - min-height: 200px; - scroll-content { position: relative; } diff --git a/src/components/popover/popover.wp.scss b/src/components/popover/popover.wp.scss index 044232bf6c3..528cf9e6010 100644 --- a/src/components/popover/popover.wp.scss +++ b/src/components/popover/popover.wp.scss @@ -1,9 +1,12 @@ @import "../../globals.core"; +@import "./popover"; // Windows Popover // -------------------------------------------------- $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-border: 2px solid #ccc !default; @@ -16,8 +19,8 @@ $popover-wp-item-background: $popover-wp-background !default; .popover-content { width: $popover-wp-width; - min-width: 0; - min-height: 0; + min-width: $popover-wp-min-width; + min-height: $popover-wp-min-height; max-height: $popover-wp-max-height; border: $popover-wp-border; diff --git a/src/components/popover/test/basic/index.ts b/src/components/popover/test/basic/index.ts index 0c7f83c3505..057ba4e0f67 100644 --- a/src/components/popover/test/basic/index.ts +++ b/src/components/popover/test/basic/index.ts @@ -139,8 +139,6 @@ class PopoverRadioPage { Ionic - - ` })