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 77faa62 clean and fix latest refactor of css files
77faa62 is described below
commit 77faa62dcd30660da8099a2b67327ec3b77a51fd
Author: Carlos Rovira <[email protected]>
AuthorDate: Thu Apr 5 20:28:40 2018 +0200
clean and fix latest refactor of css files
---
examples/royale/JewelExample/pom.xml | 4 +-
.../src/main/resources/defaults.css | 33 ----
.../JewelTheme/src/main/resources/defaults.css | 194 +++++++++++++++++++++
.../light-noflat-emphasized-blue/defaults.css | 33 ----
.../main/sass/components-emphasized/_button.sass | 6 -
.../sass/components-emphasized/_textbutton.sass | 3 -
.../src/main/sass/components-primary/_button.sass | 4 -
.../main/sass/components-primary/_textbutton.sass | 2 -
.../themes/JewelTheme/src/main/sass/defaults.sass | 22 +++
9 files changed, 218 insertions(+), 83 deletions(-)
diff --git a/examples/royale/JewelExample/pom.xml
b/examples/royale/JewelExample/pom.xml
index b95830c..41b9b54 100644
--- a/examples/royale/JewelExample/pom.xml
+++ b/examples/royale/JewelExample/pom.xml
@@ -105,14 +105,14 @@
<type>swc</type>
<classifier>js</classifier>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>JewelTheme</artifactId>
<version>0.9.3-SNAPSHOT</version>
<type>swc</type>
<scope>theme</scope>
<classifier>swf</classifier>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>Jewel-Light-NoFlat-Primary-Blue-Theme</artifactId>
diff --git
a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Blue-Theme/src/main/resources/defaults.css
b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Blue-Theme/src/main/resources/defaults.css
index a52a8d1..61ad4df 100644
---
a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Blue-Theme/src/main/resources/defaults.css
+++
b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Blue-Theme/src/main/resources/defaults.css
@@ -56,39 +56,6 @@ div {
padding: 20px;
}
-.jewel.button {
- cursor: pointer;
- display: inline-block;
- margin: 0;
- padding: 8px;
- min-width: 34px;
- min-height: 34px;
- border: 1px solid #b3b3b3;
- background: linear-gradient(#e6e6e6, #cccccc);
- box-shadow: inset 0 1px 0 white;
- border-radius: 3px;
-}
-.jewel.button:hover, .jewel.button:hover:focus {
- border: 1px solid #a6a6a6;
- background: linear-gradient(#d9d9d9, silver);
-}
-.jewel.button:active, .jewel.button:active:focus {
- 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 #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] {
- cursor: unset;
- border: 1px solid #d9d9d9;
- background: #f3f3f3;
- box-shadow: none;
-}
-
.jewel.button.emphasized {
cursor: pointer;
display: inline-block;
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 7056948..d8e9229 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -507,4 +507,198 @@ j|Alert {
color: silver;
}
+.jewel.button.secondary {
+ cursor: pointer;
+ display: inline-block;
+ margin: 0;
+ padding: 8px;
+ min-width: 34px;
+ min-height: 34px;
+ border: 1px solid #be390e;
+ background: linear-gradient(#f16c42, #ed4812);
+ box-shadow: inset 0 1px 0 #f6a389;
+ border-radius: 3px;
+}
+.jewel.button.secondary:hover, .jewel.button.secondary:hover:focus {
+ border: 1px solid #a6320d;
+ background: linear-gradient(#EF5A2A, #d64010);
+}
+.jewel.button.secondary:active, .jewel.button.secondary:active:focus {
+ border: 1px solid #772409;
+ background: linear-gradient(#d64010, #a6320d);
+ box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+}
+.jewel.button.secondary:focus {
+ outline: none;
+ border: 1px solid #be390e;
+ 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] {
+ cursor: unset;
+ border: 1px solid #d9d9d9;
+ background: #f3f3f3;
+ box-shadow: none;
+}
+
+.jewel.textbutton.secondary {
+ cursor: pointer;
+ display: inline-block;
+ margin: 0;
+ padding: 10px 16px;
+ min-width: 74px;
+ min-height: 34px;
+ border: 1px solid #be390e;
+ background: linear-gradient(#f16c42, #ed4812);
+ box-shadow: inset 0 1px 0 #f6a389;
+ border-radius: 3px;
+ font-family: "Lato", sans-serif;
+ font-size: 14px;
+ font-weight: bold;
+ color: #FFFFFF;
+ text-transform: uppercase;
+ text-decoration: none;
+ text-shadow: 0 -1px 0 rgba(119, 36, 9, 0.7);
+}
+.jewel.textbutton.secondary:hover, .jewel.textbutton.secondary:hover:focus {
+ border: 1px solid #a6320d;
+ background: linear-gradient(#EF5A2A, #d64010);
+}
+.jewel.textbutton.secondary:active, .jewel.textbutton.secondary:active:focus {
+ border: 1px solid #772409;
+ background: linear-gradient(#d64010, #a6320d);
+ box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+}
+.jewel.textbutton.secondary:focus {
+ outline: none;
+ border: 1px solid #be390e;
+ 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] {
+ cursor: unset;
+ border: 1px solid #d9d9d9;
+ background: #f3f3f3;
+ box-shadow: none;
+ color: silver;
+ font-weight: normal;
+ text-shadow: unset;
+}
+
+.jewel.button.emphasized {
+ cursor: pointer;
+ display: inline-block;
+ margin: 0;
+ padding: 8px;
+ min-width: 34px;
+ min-height: 34px;
+ border: 1px solid #638c29;
+ background: linear-gradient(#98cc50, #7eb435);
+ box-shadow: inset 0 1px 0 #bbdd8b;
+ border-radius: 3px;
+}
+.jewel.button.emphasized:hover, .jewel.button.emphasized:hover:focus {
+ border: 1px solid #557923;
+ background: linear-gradient(#8CC63C, #71a02f);
+}
+.jewel.button.emphasized:active, .jewel.button.emphasized:active:focus {
+ border: 1px solid #395118;
+ background: linear-gradient(#71a02f, #557923);
+ box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+}
+.jewel.button.emphasized:focus {
+ outline: none;
+ border: 1px solid #638c29;
+ 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.emphasized[disabled] {
+ cursor: unset;
+ border: 1px solid #d9d9d9;
+ background: #f3f3f3;
+ box-shadow: none;
+}
+
+.jewel.textbutton {
+ cursor: pointer;
+ display: inline-block;
+ margin: 0;
+ padding: 10px 16px;
+ min-width: 74px;
+ min-height: 34px;
+ 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: #808080;
+ text-transform: uppercase;
+ text-decoration: none;
+}
+.jewel.textbutton:hover, .jewel.textbutton:hover:focus {
+ border: 1px solid #a6a6a6;
+ background: linear-gradient(#d9d9d9, silver);
+}
+.jewel.textbutton:active, .jewel.textbutton:active:focus {
+ 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 #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] {
+ cursor: unset;
+ border: 1px solid #d9d9d9;
+ background: #f3f3f3;
+ box-shadow: none;
+ color: silver;
+ font-weight: normal;
+ text-shadow: unset;
+}
+
+.jewel.textbutton.emphasized {
+ cursor: pointer;
+ display: inline-block;
+ margin: 0;
+ padding: 10px 16px;
+ min-width: 74px;
+ min-height: 34px;
+ border: 1px solid #638c29;
+ background: linear-gradient(#98cc50, #7eb435);
+ box-shadow: inset 0 1px 0 #bbdd8b;
+ border-radius: 3px;
+ font-family: "Lato", sans-serif;
+ font-size: 14px;
+ font-weight: bold;
+ color: #FFFFFF;
+ text-transform: uppercase;
+ text-decoration: none;
+ text-shadow: 0 -1px 0 rgba(57, 81, 24, 0.7);
+}
+.jewel.textbutton.emphasized:hover, .jewel.textbutton.emphasized:hover:focus {
+ border: 1px solid #557923;
+ background: linear-gradient(#8CC63C, #71a02f);
+}
+.jewel.textbutton.emphasized:active, .jewel.textbutton.emphasized:active:focus
{
+ border: 1px solid #395118;
+ background: linear-gradient(#71a02f, #557923);
+ box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
+}
+.jewel.textbutton.emphasized:focus {
+ outline: none;
+ border: 1px solid #638c29;
+ 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.emphasized[disabled] {
+ cursor: unset;
+ border: 1px solid #d9d9d9;
+ background: #f3f3f3;
+ box-shadow: none;
+ color: silver;
+ font-weight: normal;
+ text-shadow: unset;
+}
+
/*# sourceMappingURL=defaults.css.map */
diff --git
a/frameworks/themes/JewelTheme/src/main/resources/themes/light-noflat-emphasized-blue/defaults.css
b/frameworks/themes/JewelTheme/src/main/resources/themes/light-noflat-emphasized-blue/defaults.css
index a52a8d1..61ad4df 100644
---
a/frameworks/themes/JewelTheme/src/main/resources/themes/light-noflat-emphasized-blue/defaults.css
+++
b/frameworks/themes/JewelTheme/src/main/resources/themes/light-noflat-emphasized-blue/defaults.css
@@ -56,39 +56,6 @@ div {
padding: 20px;
}
-.jewel.button {
- cursor: pointer;
- display: inline-block;
- margin: 0;
- padding: 8px;
- min-width: 34px;
- min-height: 34px;
- border: 1px solid #b3b3b3;
- background: linear-gradient(#e6e6e6, #cccccc);
- box-shadow: inset 0 1px 0 white;
- border-radius: 3px;
-}
-.jewel.button:hover, .jewel.button:hover:focus {
- border: 1px solid #a6a6a6;
- background: linear-gradient(#d9d9d9, silver);
-}
-.jewel.button:active, .jewel.button:active:focus {
- 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 #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] {
- cursor: unset;
- border: 1px solid #d9d9d9;
- background: #f3f3f3;
- box-shadow: none;
-}
-
.jewel.button.emphasized {
cursor: pointer;
display: inline-block;
diff --git
a/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_button.sass
b/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_button.sass
index 4115427..47672f3 100644
---
a/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_button.sass
+++
b/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_button.sass
@@ -58,12 +58,6 @@ $button-border-radius: 3px
cursor: unset
+jewel-bg-border("disabled", $button-color)
-.jewel.button
- +button-theme($default-color)
-
-//.jewel.button.primary
-// +button-theme($primary-color)
-
.jewel.button.emphasized
+button-theme($emphasized-color)
diff --git
a/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_textbutton.sass
b/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_textbutton.sass
index 7097287..67c2703 100644
---
a/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_textbutton.sass
+++
b/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_textbutton.sass
@@ -78,8 +78,5 @@ $textbutton-border-radius: 3px
.jewel.textbutton
+textbutton-theme($default-color, $default-font-color)
-//.jewel.textbutton.primary
-// +textbutton-theme($primary-color, $font-theme-color)
-
.jewel.textbutton.emphasized
+textbutton-theme($emphasized-color, $font-theme-color)
diff --git
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_button.sass
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_button.sass
index 2289b79..34ccab3 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_button.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_button.sass
@@ -64,10 +64,6 @@ $button-border-radius: 3px
.jewel.button.primary
+button-theme($primary-color)
-//.jewel.button.emphasized
-// +button-theme($emphasized-color)
-
-
//SVGs
//border:1px; /*without this svg shows scaled and bigger*/
//border-image-source: url(assets/jewel-button.svg) ;
diff --git
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_textbutton.sass
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_textbutton.sass
index 9664995..7beb855 100644
---
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_textbutton.sass
+++
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_textbutton.sass
@@ -81,5 +81,3 @@ $textbutton-border-radius: 3px
.jewel.textbutton.primary
+textbutton-theme($primary-color, $font-theme-color)
-//.jewel.textbutton.emphasized
-// +textbutton-theme($emphasized-color, $font-theme-color)
diff --git a/frameworks/themes/JewelTheme/src/main/sass/defaults.sass
b/frameworks/themes/JewelTheme/src/main/sass/defaults.sass
index 08dd006..e340cb9 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/defaults.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/defaults.sass
@@ -36,3 +36,25 @@
@import "components-primary/textbutton"
@import "components-primary/textfield"
@import "components-primary/titlebar"
+
+@import "components-secondary/alert"
+@import "components-secondary/button"
+@import "components-secondary/checkbox"
+@import "components-secondary/controlbar"
+@import "components-secondary/label"
+@import "components-secondary/radiobutton"
+@import "components-secondary/slider"
+@import "components-secondary/textbutton"
+@import "components-secondary/textfield"
+@import "components-secondary/titlebar"
+
+@import "components-emphasized/alert"
+@import "components-emphasized/button"
+@import "components-emphasized/checkbox"
+@import "components-emphasized/controlbar"
+@import "components-emphasized/label"
+@import "components-emphasized/radiobutton"
+@import "components-emphasized/slider"
+@import "components-emphasized/textbutton"
+@import "components-emphasized/textfield"
+@import "components-emphasized/titlebar"
--
To stop receiving notification emails like this one, please contact
[email protected].
