This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch feature/jewel-datefield-year-month
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to
refs/heads/feature/jewel-datefield-year-month by this push:
new 98a71bc jewel datechooser: update jewel styles
98a71bc is described below
commit 98a71bc93bc4cd264a870319e9511b16e7bec2b9
Author: Carlos Rovira <[email protected]>
AuthorDate: Fri Mar 22 00:06:53 2019 +0100
jewel datechooser: update jewel styles
---
.../projects/Jewel/src/main/resources/defaults.css | 10 ++--------
.../Jewel/src/main/sass/components/_datechooser.sass | 14 +++++++-------
.../themes/JewelTheme/src/main/resources/defaults.css | 18 +++++++++---------
.../src/main/sass/components-primary/_datechooser.sass | 16 ++++++++--------
4 files changed, 26 insertions(+), 32 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 19daa79..d4e3176 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -447,7 +447,7 @@ j|ComboBoxPopUp {
.jewel.datechooser .jewel.table .jewel.tableheadercell {
padding: 12px 0px;
}
-.jewel.datechooser .jewel.table .jewel.tableheadercell.buttonsRow
.prevMonthButton::before, .jewel.datechooser .jewel.table
.jewel.tableheadercell.buttonsRow .nextMonthButton::before {
+.jewel.datechooser .jewel.table .jewel.tableheadercell.buttonsRow
.previousButton::before, .jewel.datechooser .jewel.table
.jewel.tableheadercell.buttonsRow .nextButton::before {
margin: 0;
padding: 0;
line-height: 22px;
@@ -458,7 +458,7 @@ j|ComboBoxPopUp {
width: 22px;
height: 22px;
}
-.jewel.datechooser .jewel.table .jewel.tableheadercell.buttonsRow
.prevMonthButton::after, .jewel.datechooser .jewel.table
.jewel.tableheadercell.buttonsRow .nextMonthButton::after {
+.jewel.datechooser .jewel.table .jewel.tableheadercell.buttonsRow
.previousButton::after, .jewel.datechooser .jewel.table
.jewel.tableheadercell.buttonsRow .nextButton::after {
content: " ";
position: absolute;
width: 22px;
@@ -470,12 +470,6 @@ j|ComboBoxPopUp {
padding: 4px;
}
.jewel.datechooser .jewel.table .jewel.tableitem {
- width: 38px;
- height: 38px;
-}
-.jewel.datechooser .jewel.table .jewel.tableitem .jewel.tableitem {
- padding: 2px;
- width: 38px;
height: 38px;
}
diff --git
a/frameworks/projects/Jewel/src/main/sass/components/_datechooser.sass
b/frameworks/projects/Jewel/src/main/sass/components/_datechooser.sass
index fcc0c11..6b4b423 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_datechooser.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_datechooser.sass
@@ -34,7 +34,7 @@ $datechooser-tableitem-size: 38px
.jewel.tableheadercell.buttonsRow
- .prevMonthButton::before, .nextMonthButton::before
+ .previousButton::before, .nextButton::before
margin: 0
padding: 0
@@ -48,7 +48,7 @@ $datechooser-tableitem-size: 38px
width: $datechooser-button-size
height: $datechooser-button-size
- .prevMonthButton::after, .nextMonthButton::after
+ .previousButton::after, .nextButton::after
content: ' '
position: absolute
@@ -63,12 +63,12 @@ $datechooser-tableitem-size: 38px
// td
.jewel.tableitem
- width: $datechooser-tableitem-size
+ // width: $datechooser-tableitem-size
height: $datechooser-tableitem-size
- .jewel.tableitem
- padding: 2px
- width: $datechooser-tableitem-size
- height: $datechooser-tableitem-size
+ // .jewel.tableitem
+ // padding: 2px
+ // width: $datechooser-tableitem-size
+ // height: $datechooser-tableitem-size
.calendar
&.item
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 4530244..4c9d413 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -316,23 +316,23 @@ j|Card {
.jewel.datechooser .jewel.table .jewel.tableheadercell.buttonsRow {
border-bottom: 1px solid #d9d9d9;
}
-.jewel.datechooser .jewel.table .jewel.tableheadercell.buttonsRow
.prevMonthButton, .jewel.datechooser .jewel.table
.jewel.tableheadercell.buttonsRow .nextMonthButton {
+.jewel.datechooser .jewel.table .jewel.tableheadercell.buttonsRow
.previousButton, .jewel.datechooser .jewel.table
.jewel.tableheadercell.buttonsRow .nextButton {
border-radius: 50%;
color: transparent;
}
-.jewel.datechooser .jewel.table .jewel.tableheadercell.buttonsRow
.prevMonthButton:hover, .jewel.datechooser .jewel.table
.jewel.tableheadercell.buttonsRow .nextMonthButton:hover {
+.jewel.datechooser .jewel.table .jewel.tableheadercell.buttonsRow
.previousButton:hover, .jewel.datechooser .jewel.table
.jewel.tableheadercell.buttonsRow .nextButton:hover {
background: #f3f3f3;
}
-.jewel.datechooser .jewel.table .jewel.tableheadercell.buttonsRow
.prevMonthButton:active, .jewel.datechooser .jewel.table
.jewel.tableheadercell.buttonsRow .nextMonthButton:active {
+.jewel.datechooser .jewel.table .jewel.tableheadercell.buttonsRow
.previousButton:active, .jewel.datechooser .jewel.table
.jewel.tableheadercell.buttonsRow .nextButton:active {
background: #e6e6e6;
}
-.jewel.datechooser .jewel.table .jewel.tableheadercell.buttonsRow
.prevMonthButton::after, .jewel.datechooser .jewel.table
.jewel.tableheadercell.buttonsRow .nextMonthButton::after {
+.jewel.datechooser .jewel.table .jewel.tableheadercell.buttonsRow
.previousButton::after, .jewel.datechooser .jewel.table
.jewel.tableheadercell.buttonsRow .nextButton::after {
background-size: 40%;
}
-.jewel.datechooser .jewel.table .jewel.tableheadercell.buttonsRow
.prevMonthButton::after {
+.jewel.datechooser .jewel.table .jewel.tableheadercell.buttonsRow
.previousButton::after {
background: url("data:image/svg+xml,%3Csvg viewBox='0 0 8 12' version='1.1'
xmlns='http://www.w3.org/2000/svg'%3E%3Cg stroke='none' stroke-width='1'
fill='none' fill-rule='evenodd'%3E%3Cg transform='translate(-7.000000,
-5.000000)'%3E%3Crect x='0' y='0' width='22' height='22'%3E%3C/rect%3E%3Cpath
d='M14.9911518,6.4116803 C14.9876664,5.88503401 14.7746504,5.53560917
14.5762939,5.35284424 C14.3779375,5.17007931 14.0808684,5.04951371
13.4608967,5.00170898 L7.01066011,11.0034834 L13.482210 [...]
}
-.jewel.datechooser .jewel.table .jewel.tableheadercell.buttonsRow
.nextMonthButton::after {
+.jewel.datechooser .jewel.table .jewel.tableheadercell.buttonsRow
.nextButton::after {
background: url("data:image/svg+xml,%3Csvg viewBox='0 0 8 12' version='1.1'
xmlns='http://www.w3.org/2000/svg'%3E%3Cg stroke='none' stroke-width='1'
fill='none' fill-rule='evenodd'%3E%3Cg transform='translate(-7.000000,
-5.000000)'%3E%3Crect x='0' y='0' width='22' height='22'%3E%3C/rect%3E%3Cpath
d='M14.9911518,6.4116803 C14.9876664,5.88503401 14.7746504,5.53560917
14.5762939,5.35284424 C14.3779375,5.17007931 14.0808684,5.04951371
13.4608967,5.00170898 L7.01066011,11.0034834 L13.482210 [...]
}
.jewel.datechooser .jewel.table .jewel.tablecell {
@@ -359,13 +359,13 @@ j|Card {
color: silver;
text-shadow: unset;
}
-.jewel.datechooser[disabled] .jewel.table .jewel.tableheadercell.buttonsRow
.prevMonthButton::after, .jewel.datechooser[disabled] .jewel.table
.jewel.tableheadercell.buttonsRow .nextMonthButton::after {
+.jewel.datechooser[disabled] .jewel.table .jewel.tableheadercell.buttonsRow
.previousButton::after, .jewel.datechooser[disabled] .jewel.table
.jewel.tableheadercell.buttonsRow .nextButton::after {
background-size: 40%;
}
-.jewel.datechooser[disabled] .jewel.table .jewel.tableheadercell.buttonsRow
.prevMonthButton::after {
+.jewel.datechooser[disabled] .jewel.table .jewel.tableheadercell.buttonsRow
.previousButton::after {
background: url("data:image/svg+xml,%3Csvg viewBox='0 0 8 12' version='1.1'
xmlns='http://www.w3.org/2000/svg'%3E%3Cg stroke='none' stroke-width='1'
fill='none' fill-rule='evenodd'%3E%3Cg transform='translate(-7.000000,
-5.000000)'%3E%3Crect x='0' y='0' width='22' height='22'%3E%3C/rect%3E%3Cpath
d='M14.9911518,6.4116803 C14.9876664,5.88503401 14.7746504,5.53560917
14.5762939,5.35284424 C14.3779375,5.17007931 14.0808684,5.04951371
13.4608967,5.00170898 L7.01066011,11.0034834 L13.482210 [...]
}
-.jewel.datechooser[disabled] .jewel.table .jewel.tableheadercell.buttonsRow
.nextMonthButton::after {
+.jewel.datechooser[disabled] .jewel.table .jewel.tableheadercell.buttonsRow
.nextButton::after {
background: url("data:image/svg+xml,%3Csvg viewBox='0 0 8 12' version='1.1'
xmlns='http://www.w3.org/2000/svg'%3E%3Cg stroke='none' stroke-width='1'
fill='none' fill-rule='evenodd'%3E%3Cg transform='translate(-7.000000,
-5.000000)'%3E%3Crect x='0' y='0' width='22' height='22'%3E%3C/rect%3E%3Cpath
d='M14.9911518,6.4116803 C14.9876664,5.88503401 14.7746504,5.53560917
14.5762939,5.35284424 C14.3779375,5.17007931 14.0808684,5.04951371
13.4608967,5.00170898 L7.01066011,11.0034834 L13.482210 [...]
}
.jewel.datechooser[disabled] .jewel.tableitem.selected,
.jewel.datechooser[disabled] .jewel.tableitem.selectable:active {
diff --git
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datechooser.sass
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datechooser.sass
index e0965a4..a53efa3 100644
---
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datechooser.sass
+++
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datechooser.sass
@@ -49,7 +49,7 @@ $datechooser-buttons-border-radius: 50%
&.buttonsRow
border-bottom: 1px solid $default-color
- .prevMonthButton, .nextMonthButton
+ .previousButton, .nextButton
border-radius: $datechooser-buttons-border-radius
color: transparent
&:hover
@@ -57,14 +57,14 @@ $datechooser-buttons-border-radius: 50%
&:active
background: lighten($default-color, 5%)
- .prevMonthButton::before, .nextMonthButton::before
+ .previousButton::before, .nextButton::before
- .prevMonthButton::after, .nextMonthButton::after
+ .previousButton::after, .nextButton::after
background-size: 40%
- .prevMonthButton::after
+ .previousButton::after
background: encodeSVG("<svg viewBox='0 0 8 12'
version='1.1' xmlns='http://www.w3.org/2000/svg'><g stroke='none'
stroke-width='1' fill='none' fill-rule='evenodd'><g
transform='translate(-7.000000, -5.000000)'><rect x='0' y='0' width='22'
height='22'></rect><path d='M14.9911518,6.4116803 C14.9876664,5.88503401
14.7746504,5.53560917 14.5762939,5.35284424 C14.3779375,5.17007931
14.0808684,5.04951371 13.4608967,5.00170898 L7.01066011,11.0034834
L13.4822102,17.0014648 C14. [...]
- .nextMonthButton::after
+ .nextButton::after
background: encodeSVG("<svg viewBox='0 0 8 12'
version='1.1' xmlns='http://www.w3.org/2000/svg'><g stroke='none'
stroke-width='1' fill='none' fill-rule='evenodd'><g
transform='translate(-7.000000, -5.000000)'><rect x='0' y='0' width='22'
height='22'></rect><path d='M14.9911518,6.4116803 C14.9876664,5.88503401
14.7746504,5.53560917 14.5762939,5.35284424 C14.3779375,5.17007931
14.0808684,5.04951371 13.4608967,5.00170898 L7.01066011,11.0034834
L13.4822102,17.0014648 C14. [...]
.jewel.tablecell
@@ -99,11 +99,11 @@ $datechooser-buttons-border-radius: 50%
shadow: unset
&.buttonsRow
- .prevMonthButton::after, .nextMonthButton::after
+ .previousButton::after, .nextButton::after
background-size: 40%
- .prevMonthButton::after
+ .previousButton::after
background: encodeSVG("<svg viewBox='0 0 8 12'
version='1.1' xmlns='http://www.w3.org/2000/svg'><g stroke='none'
stroke-width='1' fill='none' fill-rule='evenodd'><g
transform='translate(-7.000000, -5.000000)'><rect x='0' y='0' width='22'
height='22'></rect><path d='M14.9911518,6.4116803 C14.9876664,5.88503401
14.7746504,5.53560917 14.5762939,5.35284424 C14.3779375,5.17007931
14.0808684,5.04951371 13.4608967,5.00170898 L7.01066011,11.0034834
L13.4822102,17.0014648 [...]
- .nextMonthButton::after
+ .nextButton::after
background: encodeSVG("<svg viewBox='0 0 8 12'
version='1.1' xmlns='http://www.w3.org/2000/svg'><g stroke='none'
stroke-width='1' fill='none' fill-rule='evenodd'><g
transform='translate(-7.000000, -5.000000)'><rect x='0' y='0' width='22'
height='22'></rect><path d='M14.9911518,6.4116803 C14.9876664,5.88503401
14.7746504,5.53560917 14.5762939,5.35284424 C14.3779375,5.17007931
14.0808684,5.04951371 13.4608967,5.00170898 L7.01066011,11.0034834
L13.4822102,17.0014648 [...]
.jewel.tableitem
