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 4896450 remove duplicated style in button
4896450 is described below
commit 48964509221f43b04325ca7bc2b817c979bda0aa
Author: Carlos Rovira <carlosrov...@apache.org>
AuthorDate: Thu Jun 14 01:26:16 2018 +0200
remove duplicated style in button
---
.../JewelExample/src/main/royale/MainContent.mxml | 2 +-
.../JewelTheme/src/main/resources/defaults.css | 27 ----------------------
.../main/sass/components-emphasized/_button.sass | 3 ---
3 files changed, 1 insertion(+), 31 deletions(-)
diff --git a/examples/royale/JewelExample/src/main/royale/MainContent.mxml
b/examples/royale/JewelExample/src/main/royale/MainContent.mxml
index 599eb42..2d71575 100644
--- a/examples/royale/JewelExample/src/main/royale/MainContent.mxml
+++ b/examples/royale/JewelExample/src/main/royale/MainContent.mxml
@@ -31,7 +31,6 @@ limitations under the License.
</j:beads>
<local:LabelPlayGround/>
<local:ButtonPlayGround/>
- <local:DropDownListPlayGround/>
</j:Group>
<j:Group>
@@ -57,6 +56,7 @@ limitations under the License.
</j:beads>
<local:AlertPlayGround/>
<local:HeadingsAndText/>
+ <local:DropDownListPlayGround/>
</j:Group>
</j:Group>
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 7659a38..8b7ccac 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -638,33 +638,6 @@ j|Card {
color: silver;
}
-.jewel.button {
- background: linear-gradient(#e6e6e6, #cccccc);
- border: 1px solid #b3b3b3;
- box-shadow: inset 0 1px 0 white;
- border-radius: 3px;
- color: #808080;
-}
-.jewel.button:hover, .jewel.button:hover:focus {
- background: linear-gradient(#d9d9d9, silver);
- border: 1px solid #a6a6a6;
-}
-.jewel.button:active, .jewel.button:active:focus {
- background: linear-gradient(silver, #a6a6a6);
- border: 1px solid #8d8d8d;
- box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5);
-}
-.jewel.button:focus {
- 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] {
- background: #f3f3f3;
- border: 1px solid #d9d9d9;
- box-shadow: none;
- color: silver;
-}
-
.jewel.button.emphasized {
background: linear-gradient(#98cc50, #7eb435);
border: 1px solid #638c29;
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 998359d..48e07aa 100644
---
a/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_button.sass
+++
b/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_button.sass
@@ -44,9 +44,6 @@ $button-border-radius: 3px
&[disabled]
+jewel-bg-border("disabled", $button-color)
color: $disabled-font-color
-
-.jewel.button
- +button-theme($default-color, $default-font-color)
.jewel.button.emphasized
+button-theme($emphasized-color, $font-theme-color)
--
To stop receiving notification emails like this one, please contact
carlosrov...@apache.org.
