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 aaa111c jewel: generated css with latest changes
aaa111c is described below
commit aaa111c76f6160975f2490c212ec073cb6a6a5a4
Author: Carlos Rovira <[email protected]>
AuthorDate: Sun Feb 23 14:00:49 2020 +0100
jewel: generated css with latest changes
---
.../projects/Jewel/src/main/resources/defaults.css | 5 --
.../JewelTheme/src/main/resources/defaults.css | 79 +++++++++++++---------
2 files changed, 47 insertions(+), 37 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 0b73554..882e8b7 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -225,8 +225,6 @@ j|Alert {
}
.jewel.button {
- margin: 0;
- padding: 0.68em 1.12em;
cursor: pointer;
user-select: none;
display: inline-flex;
@@ -3972,8 +3970,6 @@ j|TitleBar {
}
.jewel.togglebutton {
- margin: 0;
- padding: 0.68em 1.12em;
cursor: pointer;
user-select: none;
display: inline-flex;
@@ -4113,7 +4109,6 @@ j|BarTitle {
display: flex;
position: relative;
width: 100%;
- height: 64px;
}
.jewel.barsection {
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 7c99820..13970bd 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -32,34 +32,6 @@ input, select, textarea, button {
font-family: inherit;
}
-h1 {
- font-size: 2.5em;
-}
-
-h2 {
- font-size: 2em;
-}
-
-h3 {
- font-size: 1.5em;
-}
-
-h4 {
- font-size: 1.25em;
-}
-
-h5 {
- font-size: 1em;
-}
-
-span {
- font-size: 1em;
-}
-
-div {
- font-size: 14px;
-}
-
hr {
background-color: #d9d9d9;
}
@@ -160,6 +132,8 @@ hr {
}
.jewel.button {
+ margin: 0;
+ padding: 0.679em 1.12em;
background: linear-gradient(#e6e6e6, #cccccc);
border: 1px solid #b3b3b3;
box-shadow: inset 0 1px 0 white;
@@ -192,15 +166,18 @@ hr {
.jewel.button[disabled] {
font-weight: 400;
}
+.jewel.button.icon {
+ padding: 0.429em 0.87em;
+}
.jewel.button.icon i {
margin-left: 0px;
margin-right: 0px;
}
-.jewel.button.iconLSpace i {
+.jewel.button.left-space i {
margin-left: 0px;
margin-right: 8px;
}
-.jewel.button.iconRSpace i {
+.jewel.button.right-space i {
margin-left: 8px;
margin-right: 0px;
}
@@ -1107,6 +1084,39 @@ a:active {
color: #063b5b;
}
+h1 {
+ font-size: 2em;
+ margin: 0.8rem 0rem;
+}
+
+h2 {
+ font-size: 2em;
+ margin: 0.58rem 0rem;
+}
+
+h3 {
+ font-size: 1.5em;
+ margin: 0.408rem 0rem;
+}
+
+h4 {
+ font-size: 1.25em;
+ margin: 0.35rem 0rem;
+}
+
+h5 {
+ font-size: 1em;
+ margin: 0.2rem 0rem;
+}
+
+span {
+ font-size: 1em;
+}
+
+div {
+ font-size: 14px;
+}
+
.jewel.textinput {
font-weight: 400;
color: #808080;
@@ -1168,6 +1178,8 @@ a:active {
}
.jewel.togglebutton {
+ margin: 0;
+ padding: 0.679em 1.12em;
background: linear-gradient(#e6e6e6, #cccccc);
border: 1px solid #b3b3b3;
box-shadow: inset 0 1px 0 white;
@@ -1205,15 +1217,18 @@ a:active {
.jewel.togglebutton[disabled] {
font-weight: 400;
}
+.jewel.togglebutton.icon {
+ padding: 0.429em 0.87em;
+}
.jewel.togglebutton.icon i {
margin-left: 0px;
margin-right: 0px;
}
-.jewel.togglebutton.iconLSpace i {
+.jewel.togglebutton.left-space i {
margin-left: 0px;
margin-right: 8px;
}
-.jewel.togglebutton.iconRSpace i {
+.jewel.togglebutton.right-space i {
margin-left: 8px;
margin-right: 0px;
}