This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch feature/jewel-ui-set
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/feature/jewel-ui-set by this
push:
new d460f5b change dark to light
d460f5b is described below
commit d460f5b3446ce6933cab2f81db2894377c652b82
Author: Carlos Rovira <carlosrov...@apache.org>
AuthorDate: Tue Apr 3 17:37:00 2018 +0200
change dark to light
---
.../JewelBlueTheme/src/main/resources/defaults.css | 10 +-
.../JewelBlueTheme/src/main/sass/_variables.sass | 2 +-
.../JewelTheme/src/main/resources/defaults.css | 131 ++++++++++-----------
.../JewelTheme/src/main/sass/_variables.sass | 2 +-
4 files changed, 72 insertions(+), 73 deletions(-)
diff --git a/frameworks/themes/JewelBlueTheme/src/main/resources/defaults.css
b/frameworks/themes/JewelBlueTheme/src/main/resources/defaults.css
index 75082b6..d8aed77 100644
--- a/frameworks/themes/JewelBlueTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelBlueTheme/src/main/resources/defaults.css
@@ -43,8 +43,8 @@
box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0
rgba(255, 255, 255, 0.6);
}
.jewel.button.secondary[disabled] {
- border: 1px solid #0d0d0d;
- background: #404040;
+ border: 1px solid #d9d9d9;
+ background: #f3f3f3;
box-shadow: none;
cursor: unset;
}
@@ -83,9 +83,9 @@
box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0
rgba(255, 255, 255, 0.6);
}
.jewel.textbutton.secondary[disabled] {
- border: 1px solid #0d0d0d;
- background: #404040;
- color: #737373;
+ border: 1px solid #d9d9d9;
+ background: #f3f3f3;
+ color: silver;
box-shadow: none;
cursor: unset;
font-weight: normal;
diff --git a/frameworks/themes/JewelBlueTheme/src/main/sass/_variables.sass
b/frameworks/themes/JewelBlueTheme/src/main/sass/_variables.sass
index 046d83f..e87c616 100644
--- a/frameworks/themes/JewelBlueTheme/src/main/sass/_variables.sass
+++ b/frameworks/themes/JewelBlueTheme/src/main/sass/_variables.sass
@@ -41,7 +41,7 @@ $font-dark-color: #FFFFFF
//Theme Style (Flat or Gradient)
$flat: false
-$dark: true
+$dark: false
$transitions-enable: false
$transition-duration: .3s
$transition-timing: easein
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index a0f611e..1af48ad 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -21,9 +21,9 @@
}
j|Application {
- background: black;
+ background: white;
font-family: "Lato", sans-serif;
- color: #FFFFFF;
+ color: #808080;
}
h1 {
@@ -51,7 +51,7 @@ div {
}
.container {
- background: #1a1a1a;
+ background: #ebebeb;
border-radius: 10px;
padding: 20px;
}
@@ -71,12 +71,12 @@ div {
border: 0px solid;
border-radius: 3px;
box-shadow: 0px 20px 65px 0px rgba(0, 0, 0, 0.8);
- background-color: black;
+ background-color: white;
}
.jewel.alert .jewel.titlebar {
padding: 20px 20px 0px 20px;
height: 50px;
- color: #d9d9d9;
+ color: #5a5a5a;
}
.jewel.alert .jewel.titlebar .jewel.label {
font-size: 1.9em;
@@ -92,14 +92,14 @@ div {
}
.jewel.alert .Group .jewel.label {
white-space: normal;
- color: #FFFFFF;
+ color: #808080;
font-size: 1.1em;
font-weight: normal;
}
.jewel.alert .jewel.controlbar {
- border-top: 1px solid #333333;
- background: linear-gradient(#666666, #4c4c4c);
- box-shadow: inset 0 1px 0 #8c8c8c;
+ border-top: 1px solid #b3b3b3;
+ background: linear-gradient(#e6e6e6, #cccccc);
+ box-shadow: inset 0 1px 0 white;
border-top-left-radius: 0px;
border-top-right-radius: 0px;
border-bottom-left-radius: 3px;
@@ -142,28 +142,28 @@ j|Alert {
padding: 8px;
min-width: 34px;
min-height: 34px;
- border: 1px solid #333333;
- background: linear-gradient(#666666, #4c4c4c);
- box-shadow: inset 0 1px 0 #8c8c8c;
+ border: 1px solid #b3b3b3;
+ background: linear-gradient(#e6e6e6, #cccccc);
+ box-shadow: inset 0 1px 0 white;
border-radius: 3px;
}
.jewel.button:hover {
- border: 1px solid #262626;
- background: linear-gradient(#595959, #404040);
+ border: 1px solid #a6a6a6;
+ background: linear-gradient(#d9d9d9, silver);
}
.jewel.button:active {
- border: 1px solid #0d0d0d;
- background: linear-gradient(#404040, #262626);
+ border: 1px solid #8d8d8d;
+ background: linear-gradient(silver, #a6a6a6);
box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
}
.jewel.button:focus {
outline: none;
- border: 1px solid #333333;
- box-shadow: inset 0px 0px 0px 1px rgba(217, 217, 217, 0.5), inset 0 1px 0
rgba(229, 229, 229, 0.6);
+ border: 1px solid #b3b3b3;
+ box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0
rgba(255, 255, 255, 0.6);
}
.jewel.button[disabled] {
- border: 1px solid #0d0d0d;
- background: #404040;
+ border: 1px solid #d9d9d9;
+ background: #f3f3f3;
box-shadow: none;
cursor: unset;
}
@@ -195,8 +195,8 @@ j|Alert {
box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0
rgba(255, 255, 255, 0.6);
}
.jewel.button.primary[disabled] {
- border: 1px solid #0d0d0d;
- background: #404040;
+ border: 1px solid #d9d9d9;
+ background: #f3f3f3;
box-shadow: none;
cursor: unset;
}
@@ -228,8 +228,8 @@ j|Alert {
box-shadow: inset 0px 0px 0px 1px rgba(243, 251, 244, 0.5), inset 0 1px 0
rgba(255, 255, 255, 0.6);
}
.jewel.button.emphasized[disabled] {
- border: 1px solid #0d0d0d;
- background: #404040;
+ border: 1px solid #d9d9d9;
+ background: #f3f3f3;
box-shadow: none;
cursor: unset;
}
@@ -254,8 +254,8 @@ j|Alert {
width: 22px;
height: 22px;
line-height: 22px;
- background: linear-gradient(#7f7f7f, #737373);
- border: 1px solid #333333;
+ background: linear-gradient(white, #f3f3f3);
+ border: 1px solid #b3b3b3;
border-radius: 3px;
}
.jewel.checkbox input:checked, .jewel.checkbox input:checked:active {
@@ -271,16 +271,16 @@ j|Alert {
}
.jewel.checkbox input[disabled] {
cursor: unset;
- border: 1px solid #0d0d0d;
- background: #404040;
+ border: 1px solid #d9d9d9;
+ background: #f3f3f3;
}
.jewel.checkbox input[disabled] + span {
cursor: unset;
- color: #737373;
+ color: silver;
}
.jewel.checkbox input[disabled]:checked {
- border: 1px solid #0d0d0d;
- background: url("data:image/svg+xml;utf8,<svg viewBox='0 0 16 13'
version='1.1' xmlns='http://www.w3.org/2000/svg'><g transform='translate(-763,
-290)'><g transform='translate(760, 285)'><polygon fill='#191919' points='3 13
9 18 19 7 16 5 9 13 6 10'></polygon></g></g></svg>"), #404040;
+ border: 1px solid #d9d9d9;
+ background: url("data:image/svg+xml;utf8,<svg viewBox='0 0 16 13'
version='1.1' xmlns='http://www.w3.org/2000/svg'><g transform='translate(-763,
-290)'><g transform='translate(760, 285)'><polygon fill='#cccccc' points='3 13
9 18 19 7 16 5 9 13 6 10'></polygon></g></g></svg>"), #f3f3f3;
background-size: 90%;
background-position: center;
background-repeat: no-repeat;
@@ -321,8 +321,8 @@ j|Alert {
width: 22px;
height: 22px;
line-height: 22px;
- background: linear-gradient(#7f7f7f, #737373);
- border: 1px solid #333333;
+ background: linear-gradient(white, #f3f3f3);
+ border: 1px solid #b3b3b3;
border-radius: 50%;
}
.jewel.radiobutton input:checked, .jewel.radiobutton input:checked:active {
@@ -338,16 +338,16 @@ j|Alert {
}
.jewel.radiobutton input[disabled] {
cursor: unset;
- border: 1px solid #0d0d0d;
- background: #404040;
+ border: 1px solid #d9d9d9;
+ background: #f3f3f3;
}
.jewel.radiobutton input[disabled] + span {
cursor: unset;
- color: #737373;
+ color: silver;
}
.jewel.radiobutton input[disabled]:checked {
- border: 1px solid #0d0d0d;
- background: url("data:image/svg+xml;utf8,<svg viewBox='0 0 12 12'
version='1.1' xmlns='http://www.w3.org/2000/svg'><g transform='translate(-616,
-350)'><g transform='translate(611, 345)'><circle fill='#191919' cx='11'
cy='11' r='6'></circle></g></g></svg>"), #404040;
+ border: 1px solid #d9d9d9;
+ background: url("data:image/svg+xml;utf8,<svg viewBox='0 0 12 12'
version='1.1' xmlns='http://www.w3.org/2000/svg'><g transform='translate(-616,
-350)'><g transform='translate(611, 345)'><circle fill='#cccccc' cx='11'
cy='11' r='6'></circle></g></g></svg>"), #f3f3f3;
background-size: 60%;
background-position: center;
background-repeat: no-repeat;
@@ -404,36 +404,35 @@ j|Alert {
padding: 10px 16px;
min-width: 74px;
min-height: 34px;
- border: 1px solid #333333;
- background: linear-gradient(#666666, #4c4c4c);
- box-shadow: inset 0 1px 0 #8c8c8c;
+ border: 1px solid #b3b3b3;
+ background: linear-gradient(#e6e6e6, #cccccc);
+ box-shadow: inset 0 1px 0 white;
border-radius: 3px;
font-family: "Lato", sans-serif;
font-size: 14px;
font-weight: bold;
- color: #FFFFFF;
+ color: #808080;
text-transform: uppercase;
text-decoration: none;
- shadow: 0 1px 0 #d9d9d9;
}
.jewel.textbutton:hover {
- border: 1px solid #262626;
- background: linear-gradient(#595959, #404040);
+ border: 1px solid #a6a6a6;
+ background: linear-gradient(#d9d9d9, silver);
}
.jewel.textbutton:active {
- border: 1px solid #0d0d0d;
- background: linear-gradient(#404040, #262626);
+ border: 1px solid #8d8d8d;
+ background: linear-gradient(silver, #a6a6a6);
box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
}
.jewel.textbutton:focus {
outline: none;
- border: 1px solid #333333;
- box-shadow: inset 0px 0px 0px 1px rgba(217, 217, 217, 0.5), inset 0 1px 0
rgba(229, 229, 229, 0.6);
+ border: 1px solid #b3b3b3;
+ box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0
rgba(255, 255, 255, 0.6);
}
.jewel.textbutton[disabled] {
- border: 1px solid #0d0d0d;
- background: #404040;
- color: #737373;
+ border: 1px solid #d9d9d9;
+ background: #f3f3f3;
+ color: silver;
box-shadow: none;
cursor: unset;
font-weight: normal;
@@ -474,9 +473,9 @@ j|Alert {
box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0
rgba(255, 255, 255, 0.6);
}
.jewel.textbutton.primary[disabled] {
- border: 1px solid #0d0d0d;
- background: #404040;
- color: #737373;
+ border: 1px solid #d9d9d9;
+ background: #f3f3f3;
+ color: silver;
box-shadow: none;
cursor: unset;
font-weight: normal;
@@ -517,9 +516,9 @@ j|Alert {
box-shadow: inset 0px 0px 0px 1px rgba(243, 251, 244, 0.5), inset 0 1px 0
rgba(255, 255, 255, 0.6);
}
.jewel.textbutton.emphasized[disabled] {
- border: 1px solid #0d0d0d;
- background: #404040;
- color: #737373;
+ border: 1px solid #d9d9d9;
+ background: #f3f3f3;
+ color: silver;
box-shadow: none;
cursor: unset;
font-weight: normal;
@@ -546,9 +545,9 @@ j|Alert {
font-family: "Lato", sans-serif;
font-size: 14px;
font-weight: normal;
- color: #FFFFFF;
- background: linear-gradient(#7f7f7f, #737373);
- border: 1px solid #333333;
+ color: #808080;
+ background: linear-gradient(white, #f3f3f3);
+ border: 1px solid #b3b3b3;
border-radius: 3px;
transition-duration: 0.3s;
transition-timing-function: easein;
@@ -557,17 +556,17 @@ j|Alert {
border: 1px solid #0f88d1;
}
.jewel.textfield input::placeholder {
- color: white;
+ color: #a6a6a6;
}
.jewel.textfield input[disabled] {
cursor: unset;
- border: 1px solid #0d0d0d;
- background: #404040;
+ border: 1px solid #d9d9d9;
+ background: #f3f3f3;
box-shadow: none;
- color: #737373;
+ color: silver;
}
.jewel.textfield input[disabled]::placeholder {
- color: #737373;
+ color: silver;
}
/*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/JewelTheme/src/main/sass/_variables.sass
b/frameworks/themes/JewelTheme/src/main/sass/_variables.sass
index 046d83f..e87c616 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/_variables.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/_variables.sass
@@ -41,7 +41,7 @@ $font-dark-color: #FFFFFF
//Theme Style (Flat or Gradient)
$flat: false
-$dark: true
+$dark: false
$transitions-enable: false
$transition-duration: .3s
$transition-timing: easein
--
To stop receiving notification emails like this one, please contact
carlosrov...@apache.org.
