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 d2e116c refactor vars
d2e116c is described below
commit d2e116c70992348d5464ab80fcb21fd4b575272a
Author: Carlos Rovira <[email protected]>
AuthorDate: Thu Apr 5 17:39:15 2018 +0200
refactor vars
---
.../{components/_controlbar.sass => _colors.sass} | 22 +++++++++++++---
.../{components/_controlbar.sass => _theme.sass} | 10 ++++----
.../JewelTheme/src/main/sass/_variables.sass | 30 +---------------------
.../src/main/sass/components/_controlbar.sass | 2 +-
.../src/main/sass/components/_titlebar.sass | 2 +-
.../themes/JewelTheme/src/main/sass/defaults.sass | 2 ++
6 files changed, 29 insertions(+), 39 deletions(-)
diff --git
a/frameworks/themes/JewelTheme/src/main/sass/components/_controlbar.sass
b/frameworks/themes/JewelTheme/src/main/sass/_colors.sass
similarity index 70%
copy from frameworks/themes/JewelTheme/src/main/sass/components/_controlbar.sass
copy to frameworks/themes/JewelTheme/src/main/sass/_colors.sass
index 49bc0db..2eedf42 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components/_controlbar.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/_colors.sass
@@ -17,8 +17,24 @@
//
////////////////////////////////////////////////////////////////////////////////
-// Jewel ControlBar
+// CONSTANTS
+// 12 Color Themes (this will go to one separate project each one)
+$red: #EC1C24
+$amethyst: #922590
+$violet: #662C90
+$Sapphire: #2C74BE
+$blue: #3CADF1
+$turquoise: #29A89F
+$green: #3AB549
+$emerald: #8CC63C
+$yellow: #FCEF0A
+$sunflower: #F8B13F
+$orange: #F7941D
+$topaz: #EF5A2A
+$font-theme-color: #FFFFFF
-// ControlBar variables
+$light-color: #d9d9d9
+$font-light-color: #808080
-.jewel.controlbar
\ No newline at end of file
+$dark-color: #595959
+$font-dark-color: #FFFFFF
\ No newline at end of file
diff --git
a/frameworks/themes/JewelTheme/src/main/sass/components/_controlbar.sass
b/frameworks/themes/JewelTheme/src/main/sass/_theme.sass
similarity index 90%
copy from frameworks/themes/JewelTheme/src/main/sass/components/_controlbar.sass
copy to frameworks/themes/JewelTheme/src/main/sass/_theme.sass
index 49bc0db..adbaeb3 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components/_controlbar.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/_theme.sass
@@ -17,8 +17,8 @@
//
////////////////////////////////////////////////////////////////////////////////
-// Jewel ControlBar
-
-// ControlBar variables
-
-.jewel.controlbar
\ No newline at end of file
+//Theme Style (Flat or Gradient)
+$flat: false
+$dark: false
+$primary-color: $blue
+$emphasized-color: $emerald
\ No newline at end of file
diff --git a/frameworks/themes/JewelTheme/src/main/sass/_variables.sass
b/frameworks/themes/JewelTheme/src/main/sass/_variables.sass
index e87c616..8ebb24c 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/_variables.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/_variables.sass
@@ -17,31 +17,7 @@
//
////////////////////////////////////////////////////////////////////////////////
-// CONSTANTS
-// 12 Color Themes (this will go to one separate project each one)
-$red: #EC1C24
-$amethyst: #922590
-$violet: #662C90
-$Sapphire: #2C74BE
-$blue: #3CADF1
-$turquoise: #29A89F
-$green: #3AB549
-$emerald: #8CC63C
-$yellow: #FCEF0A
-$sunflower: #F8B13F
-$orange: #F7941D
-$topaz: #EF5A2A
-$font-theme-color: #FFFFFF
-
-$light-color: #d9d9d9
-$font-light-color: #808080
-
-$dark-color: #595959
-$font-dark-color: #FFFFFF
-
-//Theme Style (Flat or Gradient)
-$flat: false
-$dark: false
+// TRANSITIONS
$transitions-enable: false
$transition-duration: .3s
$transition-timing: easein
@@ -55,10 +31,6 @@ $default-color: $light-color
@if $dark
$default-color: $dark-color
-$primary-color: $blue
-$secondary-color: $topaz
-$emphasized-color: $green
-
$default-font-color: $font-light-color
@if $dark
$default-font-color: $font-dark-color
diff --git
a/frameworks/themes/JewelTheme/src/main/sass/components/_controlbar.sass
b/frameworks/themes/JewelTheme/src/main/sass/components/_controlbar.sass
index 49bc0db..94b2221 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components/_controlbar.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components/_controlbar.sass
@@ -21,4 +21,4 @@
// ControlBar variables
-.jewel.controlbar
\ No newline at end of file
+//.jewel.controlbar
\ No newline at end of file
diff --git
a/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass
b/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass
index 047d4d4..6aed678 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass
@@ -21,4 +21,4 @@
// TitleBar variables
-.jewel.titlebar
\ No newline at end of file
+//.jewel.titlebar
\ No newline at end of file
diff --git a/frameworks/themes/JewelTheme/src/main/sass/defaults.sass
b/frameworks/themes/JewelTheme/src/main/sass/defaults.sass
index b4f6a8f..0ee02ce 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/defaults.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/defaults.sass
@@ -16,6 +16,8 @@
*/
// Variables
+@import "colors"
+@import "theme"
@import "variables"
@import "mixins"
@import "functions"
--
To stop receiving notification emails like this one, please contact
[email protected].
