You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2020/04/22 17:06:16 UTC

[royale-asjs] branch develop updated: jewel-theme: new list styles for focus

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 a3db8b2  jewel-theme: new list styles for focus
a3db8b2 is described below

commit a3db8b2188ad1ffd5e993c059309787c47fcacbb
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Wed Apr 22 19:06:11 2020 +0200

    jewel-theme: new list styles for focus
---
 frameworks/projects/Jewel/src/main/resources/defaults.css         | 2 +-
 frameworks/projects/Jewel/src/main/sass/_global.sass              | 2 +-
 frameworks/themes/JewelTheme/src/main/resources/defaults.css      | 3 +++
 .../src/main/sass/components-primary/_itemRenderer.sass           | 8 +++++++-
 .../themes/JewelTheme/src/main/sass/components-primary/_list.sass | 6 ++++++
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 74fa711..eeed4a3 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -28,7 +28,7 @@ html, body {
   border: 0;
 }
 
-input:focus, textarea:focus, select:focus, div:focus, label:focus, li:focus {
+input:focus, textarea:focus, select:focus, div:focus, label:focus, nav:focus, li:focus {
   outline: none;
 }
 
diff --git a/frameworks/projects/Jewel/src/main/sass/_global.sass b/frameworks/projects/Jewel/src/main/sass/_global.sass
index 32e17b3..0cbb230 100644
--- a/frameworks/projects/Jewel/src/main/sass/_global.sass
+++ b/frameworks/projects/Jewel/src/main/sass/_global.sass
@@ -32,7 +32,7 @@ html, body
 ::-moz-focus-inner, ::-moz-focus-outer
 	border: 0
 
-input:focus, textarea:focus, select:focus, div:focus, label:focus, li:focus
+input:focus, textarea:focus, select:focus, div:focus, label:focus, nav:focus, li:focus
 	outline: none
 
 select::-ms-expand
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index d18b18e..f617506 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -844,6 +844,9 @@ j|FormItem {
   box-shadow: inset 0 1px 0 white;
   border-radius: 3px;
 }
+.jewel.list:focus {
+  border: 1px solid #0f88d1;
+}
 .jewel.list[disabled] {
   pointer-events: none;
   color: silver;
diff --git a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_itemRenderer.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_itemRenderer.sass
index 86efc94..c313911 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_itemRenderer.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_itemRenderer.sass
@@ -24,7 +24,13 @@ $itemrenderer-padding: 8px
 .jewel.item
     padding: $itemrenderer-padding
     background: transparent
-    
+
+    // &:focus
+    //     @if $flat
+    //         border: 1px solid $primary-color
+    //     @else
+    //         border: 1px solid darken($primary-color, 15%)
+
     &.hovered
         color: $font-theme-color
     &.selected, &.selectable:active
diff --git a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_list.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_list.sass
index 4224144..b406d49 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_list.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_list.sass
@@ -33,6 +33,12 @@ $list-border-radius: 3px
         box-shadow: inset 0 1px 0 lighten($default-color, 20%)
     border-radius: $list-border-radius
 
+    &:focus
+        @if $flat
+            border: 1px solid $primary-color
+        @else
+            border: 1px solid darken($primary-color, 15%)
+
     &[disabled]
         pointer-events: none
         color: $disabled-font-color