This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push: new 012e200 fixes for drawer / topappbar in IE11 and make drawer header doesn't shrink when app height decrease 012e200 is described below commit 012e200616228852b49bcb5ba1d382edc12b13b7 Author: Carlos Rovira <carlosrov...@apache.org> AuthorDate: Thu Jul 12 17:48:30 2018 +0200 fixes for drawer / topappbar in IE11 and make drawer header doesn't shrink when app height decrease --- .../royale/JewelExample/src/main/resources/jewel-example-styles.css | 5 +++-- examples/royale/JewelExample/src/main/royale/MainContent.mxml | 2 +- frameworks/projects/Jewel/src/main/resources/defaults.css | 1 + frameworks/projects/Jewel/src/main/sass/components/_drawer.sass | 1 + frameworks/themes/JewelTheme/src/main/resources/defaults.css | 5 +---- .../themes/JewelTheme/src/main/sass/components-primary/_drawer.sass | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/royale/JewelExample/src/main/resources/jewel-example-styles.css b/examples/royale/JewelExample/src/main/resources/jewel-example-styles.css index c9d4bd3..0b9be57 100644 --- a/examples/royale/JewelExample/src/main/resources/jewel-example-styles.css +++ b/examples/royale/JewelExample/src/main/resources/jewel-example-styles.css @@ -51,9 +51,10 @@ margin-right: 24px; } -.jewel.drawerheader img +.jewel.drawerheader::before { - height: 140px; + /*padding-top: 9 / 16 * 100%;*/ + padding-top: 56.25%; /* 16:9 Aspect Ratio */ } .wrapper { diff --git a/examples/royale/JewelExample/src/main/royale/MainContent.mxml b/examples/royale/JewelExample/src/main/royale/MainContent.mxml index d0c1125..e13b887 100644 --- a/examples/royale/JewelExample/src/main/royale/MainContent.mxml +++ b/examples/royale/JewelExample/src/main/royale/MainContent.mxml @@ -54,7 +54,7 @@ limitations under the License. <j:Drawer id="drawer" auto="true"> <j:DrawerHeader> - <j:Image src="assets/apache-royale-jewel-logo-white.svg"/> + <j:Image src="assets/apache-royale-jewel-logo-white.svg" height="140"/> </j:DrawerHeader> <j:DrawerContent> <j:Navigation change="changeHandler(event)" className="navIconLinkItemRenderer"> diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css index 2fc207d..49144b6 100644 --- a/frameworks/projects/Jewel/src/main/resources/defaults.css +++ b/frameworks/projects/Jewel/src/main/resources/defaults.css @@ -294,6 +294,7 @@ j|ControlBar { display: flex; flex-direction: column; align-items: center; + flex-shrink: 0; } .jewel.drawerheader div { display: flex; diff --git a/frameworks/projects/Jewel/src/main/sass/components/_drawer.sass b/frameworks/projects/Jewel/src/main/sass/components/_drawer.sass index bca8b18..8c7c9b6 100644 --- a/frameworks/projects/Jewel/src/main/sass/components/_drawer.sass +++ b/frameworks/projects/Jewel/src/main/sass/components/_drawer.sass @@ -108,6 +108,7 @@ $drawer-float-max-width: 310px display: flex flex-direction: column align-items: center + flex-shrink: 0 div display: flex diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css index 36412fa..ed74f47 100644 --- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css +++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css @@ -274,7 +274,7 @@ j|Card { border-right: 1px solid #d9d9d9; } .jewel.drawer.fixed.open { - width: 240px; + width: auto; } .jewel.drawer.fixed.open .drawermain { transition: transform 300ms 0ms; @@ -286,9 +286,6 @@ j|Card { color: #FFFFFF; padding: 16px; } -.jewel.drawerheader::before { - padding-top: 56.25%; -} .jewel.drawerheader div { padding: 16px; } diff --git a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_drawer.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_drawer.sass index 0879a7f..897deb6 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_drawer.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_drawer.sass @@ -69,7 +69,7 @@ $drawer-fixed-width: 240px border-right: 1px solid $default-color &.open - width: $drawer-fixed-width + width: auto //$drawer-fixed-width .drawermain transition: $drawer-transition-open @@ -88,8 +88,8 @@ $drawer-fixed-width: 240px color: $font-theme-color padding: $drawer-header-padding - &::before - padding-top: 9 / 16 * 100% + // &::before + // padding-top: 9 / 16 * 100% div padding: $drawer-header-padding