royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From carlosrov...@apache.org
Subject [royale-asjs] branch develop updated: fix topappbar fixed on/off on IE11 and set shadows on icons like in title
Date Thu, 28 Jun 2018 14:24:13 GMT
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 01593d0  fix topappbar fixed on/off on IE11 and set shadows on icons like in title
01593d0 is described below

commit 01593d00340d705f223bd70973a4fdcbef098c5f
Author: Carlos Rovira <carlosrovira@apache.org>
AuthorDate: Thu Jun 28 16:23:48 2018 +0200

    fix topappbar fixed on/off on IE11 and set shadows on icons like in title
---
 frameworks/projects/Jewel/src/main/resources/defaults.css             | 3 +--
 frameworks/projects/Jewel/src/main/sass/components/_topappbar.sass    | 3 +--
 frameworks/themes/JewelTheme/src/main/resources/defaults.css          | 1 +
 .../JewelTheme/src/main/sass/components-primary/_topappbar.sass       | 4 ++++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index b3ab5ce..83d5ed3 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -2561,13 +2561,12 @@ j|TitleBar {
 
 .jewel.topappbar {
   display: flex;
-  position: relative;
   flex-direction: column;
   justify-content: space-between;
   width: 100%;
   z-index: 4;
 }
-.jewel.topappbar + * {
+.jewel.topappbar + div {
   padding-top: 64px;
 }
 .jewel.topappbar.fixed {
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_topappbar.sass b/frameworks/projects/Jewel/src/main/sass/components/_topappbar.sass
index 4b653da..6d44757 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_topappbar.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_topappbar.sass
@@ -25,14 +25,13 @@ $top-app-bar-button-size: 48px
 
 .jewel.topappbar
     display: flex
-    position: relative
     flex-direction: column
     justify-content: space-between
     width: 100%
     z-index: 4
 
     // this adjust the container declared after TopAppBar and with only one row (most common
case)
-    + *
+    + div
         padding-top: $top-app-bar-row-height
 
     &.fixed
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 07a9afd..911d4c1 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -489,6 +489,7 @@ j|Card {
   padding: 12px;
   fill: #FFFFFF;
   color: inherit;
+  text-shadow: 0 -1px 0 rgba(10, 90, 138, 0.7);
 }
 .jewel.topappbarsection button:hover, .jewel.topappbarsection button:hover:focus, .jewel.topappbarsection
button:active, .jewel.topappbarsection button:active:focus, .jewel.topappbarsection button:focus
{
   background: transparent;
diff --git a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_topappbar.sass
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_topappbar.sass
index 4ecf26d..b508c39 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_topappbar.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_topappbar.sass
@@ -60,6 +60,10 @@ $top-app-bar-button-padding: 12px
         fill: $font-theme-color
         color: inherit
         
+        @if not $flat //and $text-color == $font-theme-color
+            text:
+                shadow: 0 -1px 0 rgba(darken($primary-color, 30%), .7)
+                
         &:hover, &:hover:focus, &:active, &:active:focus, &:focus
             background: transparent
             box-shadow: none


Mime
View raw message