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: more slider changes
Date Thu, 12 Apr 2018 14:11:06 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 fb57412  more slider changes
fb57412 is described below

commit fb5741260bf17e076c9b0c075b5e93deb96105ce
Author: Carlos Rovira <carlosrovira@apache.org>
AuthorDate: Thu Apr 12 16:10:59 2018 +0200

    more slider changes
---
 .../themes/JewelTheme/src/main/resources/defaults.css    |  8 +++++---
 .../src/main/sass/components-primary/_slider.sass        | 16 ++++++----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 496d598..9c83a93 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -365,7 +365,7 @@ j|Alert {
   margin: 0 20px;
   padding: 0;
   width: calc(100% - 40px);
-  height: 5px;
+  height: 6px;
   background: transparent;
   user-select: none;
   color: #3CADF1;
@@ -388,6 +388,7 @@ j|Alert {
   height: 18px;
   background: linear-gradient(#4ab3f2, #2ea7f0);
   border: 1px solid #0f88d1;
+  box-shadow: inset 0 1px 0 #9bd5f8;
   border-radius: 50%;
 }
 .jewel.slider input:active::-webkit-slider-thumb, .jewel.slider input:active::-moz-range-thumb
{
@@ -419,13 +420,13 @@ j|Alert {
   position: absolute;
   display: flex;
   overflow: hidden;
-  transform: translate(0, -2.5px);
+  transform: translate(0, -3px);
   margin: 0 29px;
   padding: 0;
   top: 50%;
   left: 0;
   width: calc(100% - 58px);
-  height: 5px;
+  height: 6px;
   background: transparent;
   border: 0;
 }
@@ -436,6 +437,7 @@ j|Alert {
   padding: 0;
   background: linear-gradient(#4ab3f2, #2ea7f0);
   border: 1px solid #0f88d1;
+  box-shadow: inset 0 1px 0 #9bd5f8;
   border-radius: 3px;
 }
 
diff --git a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_slider.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_slider.sass
index cc15d54..d37abc8 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_slider.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_slider.sass
@@ -23,7 +23,7 @@
 $slider-margin: 20px
 $slider-padding: 0
 $slider-min-width: calc(100% - #{2 * $slider-margin})
-$slider-track-min-height: 5px
+$slider-track-min-height: 6px
 $slider-track-border-radius: 3px
 $slider-thumb-size: 18px
 $slider-border-radius: 50%
@@ -71,12 +71,13 @@ $slider-container-height: #{$slider-thumb-size + round($slider-thumb-size/2)}
                 border: 0
             @else
                 background: linear-gradient(lighten($primary-color, 3%), darken($primary-color,
3%))
-                border: 1px solid darken($primary-color, 15%)
-                //background: url("data:image/svg+xml;utf8,<?xml version='1.0' encoding='UTF-8'?><svg
version='1.1' viewBox='0 0 18 17' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'><defs><linearGradient
id='b' x1='50%' x2='50%' y2='100%'><stop stop-color='#54B7F4' offset='0'/><stop
stop-color='#26A3EF' offset='1'/></linearGradient><circle id='a' cx='9.5' cy='8.5'
r='8.5'/></defs><g fill='none' fill-rule='evenodd'><g transform='translate(-664
-229)'><g tra [...]
+                // background: url("data:image/svg+xml;utf8,<svg viewBox='0 0 18 18' version='1.1'
xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'><defs><radialGradient
cx='6.43382353%' cy='50%' fx='6.43382353%' fy='50%' r='85.5152803%' id='radialGradient-1'><stop
stop-color='#54B7F4' offset='0%'></stop><stop stop-color='#26A3EF' offset='100%'></stop></radialGradient><circle
id='path-2' cx='9' cy='9' r='9'></circle></defs><g stroke='none' stroke-width='1'
fi [...]
                 // background-repeat: no-repeat
                 // background-size: 100%
                 // background-position: center
                 // background-attachment: fixed
+                border: 1px solid darken($primary-color, 15%)
+                box-shadow: inset 0 1px 0 lighten($primary-color, 20%)
             border-radius: $slider-border-radius
             
         //&:focus:not(:active)::-webkit-slider-thumb, &:focus:not(:active)::-moz-range-thumb
@@ -112,7 +113,7 @@ $slider-container-height: #{$slider-thumb-size + round($slider-thumb-size/2)}
     display: flex
     
     overflow: hidden
-    transform: translate(0, -2.5px)
+    transform: translate(0, -#{ round($slider-track-min-height/2) })
     
     margin: 0 #{ $slider-margin + round($slider-thumb-size/2) }
     padding: 0
@@ -132,15 +133,13 @@ $slider-container-height: #{$slider-thumb-size + round($slider-thumb-size/2)}
     
     padding: 0
     
-    //background: $primary-color
-    //border: 0
-
     @if $flat
         background: $primary-color
         border: 0
     @else
         background: linear-gradient(lighten($primary-color, 3%), darken($primary-color, 3%))
         border: 1px solid darken($primary-color, 15%)
+        box-shadow: inset 0 1px 0 lighten($primary-color, 20%)
     border-radius: $slider-track-border-radius
 
 .slider-track
@@ -149,9 +148,6 @@ $slider-container-height: #{$slider-thumb-size + round($slider-thumb-size/2)}
     
     padding: 0
     
-    //background: $default-color
-    //border: 0
-
     @if $flat
         background: $default-color
         border: 0

-- 
To stop receiving notification emails like this one, please contact
carlosrovira@apache.org.

Mime
View raw message