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 a1165d3 latest changes in compiled css
a1165d3 is described below
commit a1165d32d2dcfd258a486c0b39d827a6bdf47ff0
Author: Carlos Rovira <[email protected]>
AuthorDate: Mon Apr 2 01:01:18 2018 +0200
latest changes in compiled css
---
.../projects/Jewel/src/main/resources/defaults.css | 4 +-
.../JewelBlueTheme/src/main/resources/defaults.css | 124 ---------------------
.../JewelTheme/src/main/resources/defaults.css | 18 ++-
.../themes/JewelTheme/src/main/sass/_global.sass | 6 +-
4 files changed, 12 insertions(+), 140 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 059f477..cf4bf36 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -101,7 +101,7 @@ j|Alert {
@media -royale-swf {
j|CheckBox {
IBeadModel:
ClassReference("org.apache.royale.html.beads.models.ToggleButtonModel");
- IBeadView: ClassReference("org.apache.royale.html.beads.CheckBoxView");
+ IBeadView:
ClassReference("org.apache.royale.jewel.beads.views.CheckBoxView");
}
}
.jewel.controlbar {
@@ -133,7 +133,7 @@ j|Label {
@media -royale-swf {
j|RadioButton {
IBeadModel:
ClassReference("org.apache.royale.html.beads.models.ValueToggleButtonModel");
- IBeadView: ClassReference("org.apache.royale.jewel.beads.RadioButtonView");
+ IBeadView:
ClassReference("org.apache.royale.jewel.beads.views.RadioButtonView");
}
}
.jewel.slider {
diff --git a/frameworks/themes/JewelBlueTheme/src/main/resources/defaults.css
b/frameworks/themes/JewelBlueTheme/src/main/resources/defaults.css
index e864397..3121d33 100644
--- a/frameworks/themes/JewelBlueTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelBlueTheme/src/main/resources/defaults.css
@@ -49,135 +49,11 @@
cursor: unset;
}
-.jewel.checkbox {
- display: inline-block;
- margin: 0;
- padding: 0;
- position: relative;
- vertical-align: middle;
- width: 100%;
- height: 22px;
-}
-.jewel.checkbox input {
- -webkit-appearance: none;
- -moz-appearance: none;
- -o-appearance: none;
- appearance: none;
- cursor: pointer;
- display: inline-block;
- margin: 0;
- padding: 0;
- width: 22px;
- height: 22px;
- line-height: 22px;
- background: linear-gradient(white, #f3f3f3);
- border: 1px solid #b3b3b3;
- border-radius: 3px;
-}
-.jewel.checkbox input:checked, .jewel.checkbox input:checked:active {
- 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='#3CADF1' points='3 13
9 18 19 7 16 5 9 13 6 10'></polygon></g></g></svg>"), #b3dffa;
- background-repeat: no-repeat;
- background-size: 90%;
- background-position: center;
- background-attachment: fixed;
-}
-.jewel.checkbox input:focus {
- outline: none;
- border: 1px solid #0f88d1;
-}
-.jewel.checkbox input[disabled] {
- cursor: unset;
- border: 1px solid #c6c6c6;
- background: #F9F9F9;
-}
-.jewel.checkbox input[disabled] + span {
- cursor: unset;
- color: #c6c6c6;
-}
-.jewel.checkbox input[disabled]:checked {
- border: 1px solid #c6c6c6;
- 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='lightgray' points='3
13 9 18 19 7 16 5 9 13 6 10'></polygon></g></g></svg>"), #F9F9F9;
- background-size: 90%;
- background-position: center;
- background-repeat: no-repeat;
- background-attachment: fixed;
-}
-.jewel.checkbox span {
- cursor: pointer;
- position: absolute;
- margin: 0;
- padding-left: 6px;
- font-size: 16px;
- line-height: 22px;
-}
-
.jewel.label {
font-family: "Lato", sans-serif;
font-size: 14px;
}
-.jewel.radiobutton {
- display: inline-block;
- margin: 0;
- padding: 0;
- position: relative;
- vertical-align: middle;
- width: 100%;
- height: 22px;
-}
-.jewel.radiobutton input {
- -webkit-appearance: none;
- -moz-appearance: none;
- -o-appearance: none;
- appearance: none;
- cursor: pointer;
- display: inline-block;
- margin: 0;
- padding: 0;
- width: 22px;
- height: 22px;
- line-height: 22px;
- background: linear-gradient(white, #f3f3f3);
- border: 1px solid #b3b3b3;
- border-radius: 50%;
-}
-.jewel.radiobutton input:checked, .jewel.radiobutton input:checked:active {
- 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='#3CADF1' cx='11'
cy='11' r='6'></circle></g></g></svg>"), #b3dffa;
- background-repeat: no-repeat;
- background-size: 60%;
- background-position: center;
- background-attachment: fixed;
-}
-.jewel.radiobutton input:focus {
- outline: none;
- border: 1px solid #0f88d1;
-}
-.jewel.radiobutton input[disabled] {
- cursor: unset;
- border: 1px solid #c6c6c6;
- background: #F9F9F9;
-}
-.jewel.radiobutton input[disabled] + span {
- cursor: unset;
- color: #c6c6c6;
-}
-.jewel.radiobutton input[disabled]:checked {
- border: 1px solid #c6c6c6;
- 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='lightgray' cx='11'
cy='11' r='6'></circle></g></g></svg>"), #F9F9F9;
- background-size: 60%;
- background-position: center;
- background-repeat: no-repeat;
- background-attachment: fixed;
-}
-.jewel.radiobutton span {
- cursor: pointer;
- position: absolute;
- margin: 0;
- padding-left: 6px;
- font-size: 16px;
- line-height: 22px;
-}
-
.jewel.slider input {
-webkit-appearance: none;
width: 100%;
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 9c540bf..28d3e5c 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -17,8 +17,6 @@
@namespace j "library://ns.apache.org/royale/jewel";
@namespace "http://www.w3.org/1999/xhtml";;
.royale *, .royale *:before, .royale *:after {
- -moz-box-sizing: border-box;
- -webkit-box-sizing: border-box;
box-sizing: border-box;
}
@@ -28,15 +26,15 @@ j|Application {
}
h1 {
- font-size: 22px;
+ font-size: 2em;
}
h2 {
- font-size: 19px;
+ font-size: 1.5em;
}
h3 {
- font-size: 17px;
+ font-size: 1.17em;
}
h4 {
@@ -49,8 +47,6 @@ span {
div {
font-size: 14px;
- white-space: normal;
- word-wrap: break-word;
}
.jewel.alert {
@@ -236,7 +232,6 @@ j|Alert {
margin: 0;
padding: 0;
position: relative;
- vertical-align: middle;
width: 100%;
height: 22px;
}
@@ -286,7 +281,8 @@ j|Alert {
}
.jewel.checkbox span {
cursor: pointer;
- position: absolute;
+ position: relative;
+ vertical-align: top;
margin: 0;
padding-left: 6px;
font-size: 16px;
@@ -303,7 +299,6 @@ j|Alert {
margin: 0;
padding: 0;
position: relative;
- vertical-align: middle;
width: 100%;
height: 22px;
}
@@ -353,7 +348,8 @@ j|Alert {
}
.jewel.radiobutton span {
cursor: pointer;
- position: absolute;
+ position: relative;
+ vertical-align: top;
margin: 0;
padding-left: 6px;
font-size: 16px;
diff --git a/frameworks/themes/JewelTheme/src/main/sass/_global.sass
b/frameworks/themes/JewelTheme/src/main/sass/_global.sass
index f0ea008..9e5681e 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/_global.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/_global.sass
@@ -30,13 +30,13 @@ j|Application
color: $default-font-color
h1
- font-size: 22px
+ font-size: 2em
h2
- font-size: 19px
+ font-size: 1.5em
h3
- font-size: 17px
+ font-size: 1.17em
h4
font-size: 15px
--
To stop receiving notification emails like this one, please contact
[email protected].
