You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2018/03/14 08:29:04 UTC
[royale-asjs] 07/09: testing Lato font in theme
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
commit 0964f45301589c10dc40d92b64ebf467f8f88510
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Tue Mar 13 17:10:45 2018 +0100
testing Lato font in theme
---
frameworks/themes/JewelTheme/src/main/resources/royale-jewel-blue.css | 4 ++--
frameworks/themes/JewelTheme/src/main/resources/royale-jewel-red.css | 4 ++--
frameworks/themes/JewelTheme/src/main/sass/_textbutton.sass | 2 +-
frameworks/themes/JewelTheme/src/main/sass/_variables.sass | 3 ++-
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/frameworks/themes/JewelTheme/src/main/resources/royale-jewel-blue.css b/frameworks/themes/JewelTheme/src/main/resources/royale-jewel-blue.css
index e642ce7..03d06cb 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/royale-jewel-blue.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/royale-jewel-blue.css
@@ -127,9 +127,9 @@
*/
.jewel.textbutton, .jewel.textbutton:hover {
/* TextField */
- font-family: "Lato-Bold", sans-serif;
+ font-family: "Lato", sans-serif;
font-style: bold;
- font-size: 0.7rem;
+ font-size: 0.75rem;
text-transform: uppercase;
text-decoration: none;
}
diff --git a/frameworks/themes/JewelTheme/src/main/resources/royale-jewel-red.css b/frameworks/themes/JewelTheme/src/main/resources/royale-jewel-red.css
index 60f16ca..ef40149 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/royale-jewel-red.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/royale-jewel-red.css
@@ -127,9 +127,9 @@
*/
.jewel.textbutton, .jewel.textbutton:hover {
/* TextField */
- font-family: "Lato-Bold", sans-serif;
+ font-family: "Lato", sans-serif;
font-style: bold;
- font-size: 0.7rem;
+ font-size: 0.75rem;
text-transform: uppercase;
text-decoration: none;
}
diff --git a/frameworks/themes/JewelTheme/src/main/sass/_textbutton.sass b/frameworks/themes/JewelTheme/src/main/sass/_textbutton.sass
index c24dbec..b02123a 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/_textbutton.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/_textbutton.sass
@@ -26,7 +26,7 @@
font:
family: $font-stack
style: bold
- size: .7rem
+ size: $font-size
//+trans(0.2s ease-in-out)
text:
transform: uppercase
diff --git a/frameworks/themes/JewelTheme/src/main/sass/_variables.sass b/frameworks/themes/JewelTheme/src/main/sass/_variables.sass
index b1f1f39..3a6b64b 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/_variables.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/_variables.sass
@@ -17,7 +17,8 @@
//
////////////////////////////////////////////////////////////////////////////////
-$font-stack: 'Lato-Bold', sans-serif
+$font-stack: 'Lato', sans-serif
+$font-size: 0.75rem
// Common Colors
$white: rgba(white,.9)
--
To stop receiving notification emails like this one, please contact
carlosrovira@apache.org.