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 2a50896 First set of themes (blue) 2a50896 is described below commit 2a50896c04ef089f1ca0d9f08bd5371708b55ee0 Author: Carlos Rovira <carlosrov...@apache.org> AuthorDate: Thu Apr 5 19:16:40 2018 +0200 First set of themes (blue) --- examples/royale/JewelExample/pom.xml | 12 +- .../build.xml | 2 +- .../pom.xml | 4 +- .../src/main/resources/assets/empty | 0 .../src/main/resources/defaults.css | 210 +++++++++++++++++++++ .../build.xml | 2 +- .../pom.xml | 4 +- .../src/main/resources/assets/empty | 0 .../src/main/resources/defaults.css | 76 -------- .../build.xml | 2 +- .../pom.xml | 4 +- .../src/main/resources/assets/empty | 0 .../src/main/resources/defaults.css | 74 ++++++-- frameworks/themes/JewelTheme/pom.xml | 30 ++- .../JewelTheme/src/main/resources/defaults.css | 76 -------- .../light-noflat-emphasized-blue/defaults.css | 210 +++++++++++++++++++++ .../themes/light-noflat-primary-blue}/defaults.css | 76 -------- .../light-noflat-secondary-blue}/defaults.css | 74 ++++++-- .../themes/JewelTheme/src/main/sass/_theme.sass | 1 + .../_alert.sass} | 5 +- .../_button.sass | 4 +- .../_checkbox.sass} | 6 +- .../_controlbar.sass | 0 .../_label.sass} | 5 - .../_radiobutton.sass} | 6 +- .../_slider.sass} | 4 - .../_textbutton.sass | 4 +- .../_textfield.sass} | 6 +- .../_titlebar.sass | 0 .../{components => components-primary}/_alert.sass | 0 .../_button.sass | 4 +- .../_checkbox.sass | 0 .../_controlbar.sass | 0 .../{components => components-primary}/_label.sass | 0 .../_radiobutton.sass | 0 .../_slider.sass | 0 .../_textbutton.sass | 4 +- .../_textfield.sass | 0 .../_titlebar.sass | 0 .../_alert.sass} | 5 +- .../_button.sass | 33 +--- .../_checkbox.sass} | 6 +- .../_controlbar.sass | 2 - .../_label.sass} | 4 - .../_radiobutton.sass} | 6 +- .../_slider.sass} | 4 - .../_textbutton.sass | 10 +- .../_textfield.sass} | 6 +- .../_titlebar.sass | 2 - .../themes/JewelTheme/src/main/sass/defaults.sass | 20 +- .../_theme.sass | 3 +- .../defaults.sass | 20 +- .../light-noflat-primary-blue}/_theme.sass | 3 +- .../defaults.sass | 20 +- .../light-noflat-secondary-blue}/_theme.sass | 3 +- .../defaults.sass | 20 +- frameworks/themes/pom.xml | 5 +- 57 files changed, 654 insertions(+), 423 deletions(-) diff --git a/examples/royale/JewelExample/pom.xml b/examples/royale/JewelExample/pom.xml index 964edb5..b95830c 100644 --- a/examples/royale/JewelExample/pom.xml +++ b/examples/royale/JewelExample/pom.xml @@ -115,7 +115,15 @@ </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> - <artifactId>JewelTheme</artifactId> + <artifactId>Jewel-Light-NoFlat-Primary-Blue-Theme</artifactId> + <version>0.9.3-SNAPSHOT</version> + <type>swc</type> + <scope>theme</scope> + <classifier>js</classifier> + </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>Jewel-Light-NoFlat-Secondary-Blue-Theme</artifactId> <version>0.9.3-SNAPSHOT</version> <type>swc</type> <scope>theme</scope> @@ -123,7 +131,7 @@ </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> - <artifactId>JewelBlueTheme</artifactId> + <artifactId>Jewel-Light-NoFlat-Emphasized-Blue-Theme</artifactId> <version>0.9.3-SNAPSHOT</version> <type>swc</type> <scope>theme</scope> diff --git a/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Blue-Theme/build.xml similarity index 98% copy from frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/build.xml copy to frameworks/themes/Jewel-Light-NoFlat-Emphasized-Blue-Theme/build.xml index c21bb37..07605a0 100644 --- a/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/build.xml +++ b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Blue-Theme/build.xml @@ -19,7 +19,7 @@ --> -<project name="Jewel-Light-NoFlat-Blue-Theme" default="main" basedir="."> +<project name="Jewel-Light-NoFlat-Emphasized-Blue-Theme" default="main" basedir="."> <property name="ROYALE_HOME" location="../../.."/> <property file="${ROYALE_HOME}/env.properties"/> diff --git a/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/pom.xml b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Blue-Theme/pom.xml similarity index 92% copy from frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/pom.xml copy to frameworks/themes/Jewel-Light-NoFlat-Emphasized-Blue-Theme/pom.xml index 11067c6..29818df 100644 --- a/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/pom.xml +++ b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Blue-Theme/pom.xml @@ -26,11 +26,11 @@ <version>0.9.3-SNAPSHOT</version> </parent> - <artifactId>Jewel-Light-NoFlat-Blue-Theme</artifactId> + <artifactId>Jewel-Light-NoFlat-Emphasized-Blue-Theme</artifactId> <version>0.9.3-SNAPSHOT</version> <packaging>swc</packaging> - <name>Apache Royale: Framework: Themes: Jewel-Light-NoFlat-Blue-Theme</name> + <name>Apache Royale: Framework: Themes: Jewel-Light-NoFlat-Emphasized-Blue-Theme</name> <build> <sourceDirectory>src/main/royale</sourceDirectory> diff --git a/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/src/main/resources/assets/empty b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Blue-Theme/src/main/resources/assets/empty similarity index 100% copy from frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/src/main/resources/assets/empty copy to frameworks/themes/Jewel-Light-NoFlat-Emphasized-Blue-Theme/src/main/resources/assets/empty diff --git a/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Blue-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Blue-Theme/src/main/resources/defaults.css new file mode 100644 index 0000000..a52a8d1 --- /dev/null +++ b/frameworks/themes/Jewel-Light-NoFlat-Emphasized-Blue-Theme/src/main/resources/defaults.css @@ -0,0 +1,210 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +@namespace j "library://ns.apache.org/royale/jewel"; +@namespace "http://www.w3.org/1999/xhtml"; +.royale *, .royale *:before, .royale *:after { + box-sizing: border-box; +} + +j|Application { + background: white; + font-family: "Lato", sans-serif; + color: #808080; +} + +h1 { + font-size: 2em; +} + +h2 { + font-size: 1.5em; +} + +h3 { + font-size: 1.17em; +} + +h4 { + font-size: 15px; +} + +span { + font-size: 14px; +} + +div { + font-size: 14px; +} + +.container { + background: #ebebeb; + border-radius: 10px; + padding: 20px; +} + +.jewel.button { + cursor: pointer; + display: inline-block; + margin: 0; + padding: 8px; + min-width: 34px; + min-height: 34px; + border: 1px solid #b3b3b3; + background: linear-gradient(#e6e6e6, #cccccc); + box-shadow: inset 0 1px 0 white; + border-radius: 3px; +} +.jewel.button:hover, .jewel.button:hover:focus { + border: 1px solid #a6a6a6; + background: linear-gradient(#d9d9d9, silver); +} +.jewel.button:active, .jewel.button:active:focus { + border: 1px solid #8d8d8d; + background: linear-gradient(silver, #a6a6a6); + box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5); +} +.jewel.button:focus { + outline: none; + border: 1px solid #b3b3b3; + box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0 rgba(255, 255, 255, 0.6); +} +.jewel.button[disabled] { + cursor: unset; + border: 1px solid #d9d9d9; + background: #f3f3f3; + box-shadow: none; +} + +.jewel.button.emphasized { + cursor: pointer; + display: inline-block; + margin: 0; + padding: 8px; + min-width: 34px; + min-height: 34px; + border: 1px solid #0f88d1; + background: linear-gradient(#54b7f3, #24a3ef); + box-shadow: inset 0 1px 0 #9bd5f8; + border-radius: 3px; +} +.jewel.button.emphasized:hover, .jewel.button.emphasized:hover:focus { + border: 1px solid #0d79ba; + background: linear-gradient(#3CADF1, #1198e9); +} +.jewel.button.emphasized:active, .jewel.button.emphasized:active:focus { + border: 1px solid #0a5a8a; + background: linear-gradient(#1198e9, #0d79ba); + box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5); +} +.jewel.button.emphasized:focus { + outline: none; + border: 1px solid #0f88d1; + box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0 rgba(255, 255, 255, 0.6); +} +.jewel.button.emphasized[disabled] { + cursor: unset; + border: 1px solid #d9d9d9; + background: #f3f3f3; + box-shadow: none; +} + +.jewel.textbutton { + cursor: pointer; + display: inline-block; + margin: 0; + padding: 10px 16px; + min-width: 74px; + min-height: 34px; + border: 1px solid #b3b3b3; + background: linear-gradient(#e6e6e6, #cccccc); + box-shadow: inset 0 1px 0 white; + border-radius: 3px; + font-family: "Lato", sans-serif; + font-size: 14px; + font-weight: bold; + color: #808080; + text-transform: uppercase; + text-decoration: none; +} +.jewel.textbutton:hover, .jewel.textbutton:hover:focus { + border: 1px solid #a6a6a6; + background: linear-gradient(#d9d9d9, silver); +} +.jewel.textbutton:active, .jewel.textbutton:active:focus { + border: 1px solid #8d8d8d; + background: linear-gradient(silver, #a6a6a6); + box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5); +} +.jewel.textbutton:focus { + outline: none; + border: 1px solid #b3b3b3; + box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0 rgba(255, 255, 255, 0.6); +} +.jewel.textbutton[disabled] { + cursor: unset; + border: 1px solid #d9d9d9; + background: #f3f3f3; + box-shadow: none; + color: silver; + font-weight: normal; + text-shadow: unset; +} + +.jewel.textbutton.emphasized { + cursor: pointer; + display: inline-block; + margin: 0; + padding: 10px 16px; + min-width: 74px; + min-height: 34px; + border: 1px solid #0f88d1; + background: linear-gradient(#54b7f3, #24a3ef); + box-shadow: inset 0 1px 0 #9bd5f8; + border-radius: 3px; + font-family: "Lato", sans-serif; + font-size: 14px; + font-weight: bold; + color: #FFFFFF; + text-transform: uppercase; + text-decoration: none; + text-shadow: 0 -1px 0 rgba(10, 90, 138, 0.7); +} +.jewel.textbutton.emphasized:hover, .jewel.textbutton.emphasized:hover:focus { + border: 1px solid #0d79ba; + background: linear-gradient(#3CADF1, #1198e9); +} +.jewel.textbutton.emphasized:active, .jewel.textbutton.emphasized:active:focus { + border: 1px solid #0a5a8a; + background: linear-gradient(#1198e9, #0d79ba); + box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5); +} +.jewel.textbutton.emphasized:focus { + outline: none; + border: 1px solid #0f88d1; + box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0 rgba(255, 255, 255, 0.6); +} +.jewel.textbutton.emphasized[disabled] { + cursor: unset; + border: 1px solid #d9d9d9; + background: #f3f3f3; + box-shadow: none; + color: silver; + font-weight: normal; + text-shadow: unset; +} + +/*# sourceMappingURL=defaults.css.map */ diff --git a/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Primary-Blue-Theme/build.xml similarity index 98% copy from frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/build.xml copy to frameworks/themes/Jewel-Light-NoFlat-Primary-Blue-Theme/build.xml index c21bb37..5647177 100644 --- a/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/build.xml +++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Blue-Theme/build.xml @@ -19,7 +19,7 @@ --> -<project name="Jewel-Light-NoFlat-Blue-Theme" default="main" basedir="."> +<project name="Jewel-Light-NoFlat-Primary-Blue-Theme" default="main" basedir="."> <property name="ROYALE_HOME" location="../../.."/> <property file="${ROYALE_HOME}/env.properties"/> diff --git a/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/pom.xml b/frameworks/themes/Jewel-Light-NoFlat-Primary-Blue-Theme/pom.xml similarity index 93% copy from frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/pom.xml copy to frameworks/themes/Jewel-Light-NoFlat-Primary-Blue-Theme/pom.xml index 11067c6..8df238d 100644 --- a/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/pom.xml +++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Blue-Theme/pom.xml @@ -26,11 +26,11 @@ <version>0.9.3-SNAPSHOT</version> </parent> - <artifactId>Jewel-Light-NoFlat-Blue-Theme</artifactId> + <artifactId>Jewel-Light-NoFlat-Primary-Blue-Theme</artifactId> <version>0.9.3-SNAPSHOT</version> <packaging>swc</packaging> - <name>Apache Royale: Framework: Themes: Jewel-Light-NoFlat-Blue-Theme</name> + <name>Apache Royale: Framework: Themes: Jewel-Light-NoFlat-Primary-Blue-Theme</name> <build> <sourceDirectory>src/main/royale</sourceDirectory> diff --git a/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/src/main/resources/assets/empty b/frameworks/themes/Jewel-Light-NoFlat-Primary-Blue-Theme/src/main/resources/assets/empty similarity index 100% copy from frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/src/main/resources/assets/empty copy to frameworks/themes/Jewel-Light-NoFlat-Primary-Blue-Theme/src/main/resources/assets/empty diff --git a/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css similarity index 86% copy from frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/src/main/resources/defaults.css copy to frameworks/themes/Jewel-Light-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css index 04140c2..7056948 100644 --- a/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/src/main/resources/defaults.css +++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css @@ -201,39 +201,6 @@ j|Alert { box-shadow: none; } -.jewel.button.emphasized { - cursor: pointer; - display: inline-block; - margin: 0; - padding: 8px; - min-width: 34px; - min-height: 34px; - border: 1px solid #638c29; - background: linear-gradient(#98cc50, #7eb435); - box-shadow: inset 0 1px 0 #bbdd8b; - border-radius: 3px; -} -.jewel.button.emphasized:hover, .jewel.button.emphasized:hover:focus { - border: 1px solid #557923; - background: linear-gradient(#8CC63C, #71a02f); -} -.jewel.button.emphasized:active, .jewel.button.emphasized:active:focus { - border: 1px solid #395118; - background: linear-gradient(#71a02f, #557923); - box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5); -} -.jewel.button.emphasized:focus { - outline: none; - border: 1px solid #638c29; - box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0 rgba(255, 255, 255, 0.6); -} -.jewel.button.emphasized[disabled] { - cursor: unset; - border: 1px solid #d9d9d9; - background: #f3f3f3; - box-shadow: none; -} - .jewel.checkbox { display: inline-block; margin: 0; @@ -496,49 +463,6 @@ j|Alert { text-shadow: unset; } -.jewel.textbutton.emphasized { - cursor: pointer; - display: inline-block; - margin: 0; - padding: 10px 16px; - min-width: 74px; - min-height: 34px; - border: 1px solid #638c29; - background: linear-gradient(#98cc50, #7eb435); - box-shadow: inset 0 1px 0 #bbdd8b; - border-radius: 3px; - font-family: "Lato", sans-serif; - font-size: 14px; - font-weight: bold; - color: #FFFFFF; - text-transform: uppercase; - text-decoration: none; - text-shadow: 0 -1px 0 rgba(57, 81, 24, 0.7); -} -.jewel.textbutton.emphasized:hover, .jewel.textbutton.emphasized:hover:focus { - border: 1px solid #557923; - background: linear-gradient(#8CC63C, #71a02f); -} -.jewel.textbutton.emphasized:active, .jewel.textbutton.emphasized:active:focus { - border: 1px solid #395118; - background: linear-gradient(#71a02f, #557923); - box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5); -} -.jewel.textbutton.emphasized:focus { - outline: none; - border: 1px solid #638c29; - box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0 rgba(255, 255, 255, 0.6); -} -.jewel.textbutton.emphasized[disabled] { - cursor: unset; - border: 1px solid #d9d9d9; - background: #f3f3f3; - box-shadow: none; - color: silver; - font-weight: normal; - text-shadow: unset; -} - .jewel.textfield { position: relative; display: inline-flex; diff --git a/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/build.xml b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Blue-Theme/build.xml similarity index 98% rename from frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/build.xml rename to frameworks/themes/Jewel-Light-NoFlat-Secondary-Blue-Theme/build.xml index c21bb37..338ae3d 100644 --- a/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/build.xml +++ b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Blue-Theme/build.xml @@ -19,7 +19,7 @@ --> -<project name="Jewel-Light-NoFlat-Blue-Theme" default="main" basedir="."> +<project name="Jewel-Light-NoFlat-Secondary-Blue-Theme" default="main" basedir="."> <property name="ROYALE_HOME" location="../../.."/> <property file="${ROYALE_HOME}/env.properties"/> diff --git a/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/pom.xml b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Blue-Theme/pom.xml similarity index 92% rename from frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/pom.xml rename to frameworks/themes/Jewel-Light-NoFlat-Secondary-Blue-Theme/pom.xml index 11067c6..1d68102 100644 --- a/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/pom.xml +++ b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Blue-Theme/pom.xml @@ -26,11 +26,11 @@ <version>0.9.3-SNAPSHOT</version> </parent> - <artifactId>Jewel-Light-NoFlat-Blue-Theme</artifactId> + <artifactId>Jewel-Light-NoFlat-Secondary-Blue-Theme</artifactId> <version>0.9.3-SNAPSHOT</version> <packaging>swc</packaging> - <name>Apache Royale: Framework: Themes: Jewel-Light-NoFlat-Blue-Theme</name> + <name>Apache Royale: Framework: Themes: Jewel-Light-NoFlat-Secondary-Blue-Theme</name> <build> <sourceDirectory>src/main/royale</sourceDirectory> diff --git a/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/src/main/resources/assets/empty b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Blue-Theme/src/main/resources/assets/empty similarity index 100% rename from frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/src/main/resources/assets/empty rename to frameworks/themes/Jewel-Light-NoFlat-Secondary-Blue-Theme/src/main/resources/assets/empty diff --git a/frameworks/themes/JewelBlueTheme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Blue-Theme/src/main/resources/defaults.css similarity index 70% copy from frameworks/themes/JewelBlueTheme/src/main/resources/defaults.css copy to frameworks/themes/Jewel-Light-NoFlat-Secondary-Blue-Theme/src/main/resources/defaults.css index 1bacd30..4a40045 100644 --- a/frameworks/themes/JewelBlueTheme/src/main/resources/defaults.css +++ b/frameworks/themes/Jewel-Light-NoFlat-Secondary-Blue-Theme/src/main/resources/defaults.css @@ -16,6 +16,46 @@ */ @namespace j "library://ns.apache.org/royale/jewel"; @namespace "http://www.w3.org/1999/xhtml"; +.royale *, .royale *:before, .royale *:after { + box-sizing: border-box; +} + +j|Application { + background: white; + font-family: "Lato", sans-serif; + color: #808080; +} + +h1 { + font-size: 2em; +} + +h2 { + font-size: 1.5em; +} + +h3 { + font-size: 1.17em; +} + +h4 { + font-size: 15px; +} + +span { + font-size: 14px; +} + +div { + font-size: 14px; +} + +.container { + background: #ebebeb; + border-radius: 10px; + padding: 20px; +} + .jewel.button.secondary { cursor: pointer; display: inline-block; @@ -23,23 +63,23 @@ padding: 8px; min-width: 34px; min-height: 34px; - border: 1px solid #be390e; - background: linear-gradient(#f16c42, #ed4812); - box-shadow: inset 0 1px 0 #f6a389; + border: 1px solid #0f88d1; + background: linear-gradient(#54b7f3, #24a3ef); + box-shadow: inset 0 1px 0 #9bd5f8; border-radius: 3px; } .jewel.button.secondary:hover, .jewel.button.secondary:hover:focus { - border: 1px solid #a6320d; - background: linear-gradient(#EF5A2A, #d64010); + border: 1px solid #0d79ba; + background: linear-gradient(#3CADF1, #1198e9); } .jewel.button.secondary:active, .jewel.button.secondary:active:focus { - border: 1px solid #772409; - background: linear-gradient(#d64010, #a6320d); + border: 1px solid #0a5a8a; + background: linear-gradient(#1198e9, #0d79ba); box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5); } .jewel.button.secondary:focus { outline: none; - border: 1px solid #be390e; + border: 1px solid #0f88d1; box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0 rgba(255, 255, 255, 0.6); } .jewel.button.secondary[disabled] { @@ -56,9 +96,9 @@ padding: 10px 16px; min-width: 74px; min-height: 34px; - border: 1px solid #be390e; - background: linear-gradient(#f16c42, #ed4812); - box-shadow: inset 0 1px 0 #f6a389; + border: 1px solid #0f88d1; + background: linear-gradient(#54b7f3, #24a3ef); + box-shadow: inset 0 1px 0 #9bd5f8; border-radius: 3px; font-family: "Lato", sans-serif; font-size: 14px; @@ -66,20 +106,20 @@ color: #FFFFFF; text-transform: uppercase; text-decoration: none; - text-shadow: 0 -1px 0 rgba(119, 36, 9, 0.7); + text-shadow: 0 -1px 0 rgba(10, 90, 138, 0.7); } .jewel.textbutton.secondary:hover, .jewel.textbutton.secondary:hover:focus { - border: 1px solid #a6320d; - background: linear-gradient(#EF5A2A, #d64010); + border: 1px solid #0d79ba; + background: linear-gradient(#3CADF1, #1198e9); } .jewel.textbutton.secondary:active, .jewel.textbutton.secondary:active:focus { - border: 1px solid #772409; - background: linear-gradient(#d64010, #a6320d); + border: 1px solid #0a5a8a; + background: linear-gradient(#1198e9, #0d79ba); box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5); } .jewel.textbutton.secondary:focus { outline: none; - border: 1px solid #be390e; + border: 1px solid #0f88d1; box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0 rgba(255, 255, 255, 0.6); } .jewel.textbutton.secondary[disabled] { diff --git a/frameworks/themes/JewelTheme/pom.xml b/frameworks/themes/JewelTheme/pom.xml index 1ac7235..18b23ef 100644 --- a/frameworks/themes/JewelTheme/pom.xml +++ b/frameworks/themes/JewelTheme/pom.xml @@ -83,18 +83,40 @@ </source> <destination>${basedir}/src/main/resources</destination> </resource> - </resources> - <resources> + + <resource> + <source> + <directory>${basedir}/src/main/sass/themes/light-noflat-emphasized-blue</directory> + <includes> + <include>defaults.sass</include> + </includes> + </source> + <relativeOutputDirectory>../..</relativeOutputDirectory> + <destination>${basedir}/../Jewel-Light-NoFlat-Emphasized-Blue-Theme/src/main/resources</destination> + </resource> + + <resource> + <source> + <directory>${basedir}/src/main/sass/themes/light-noflat-primary-blue</directory> + <includes> + <include>defaults.sass</include> + </includes> + </source> + <relativeOutputDirectory>../..</relativeOutputDirectory> + <destination>${basedir}/../Jewel-Light-NoFlat-Primary-Blue-Theme/src/main/resources</destination> + </resource> + <resource> <source> - <directory>${basedir}/src/main/sass/themes/light-noflat-blue</directory> + <directory>${basedir}/src/main/sass/themes/light-noflat-secondary-blue</directory> <includes> <include>defaults.sass</include> </includes> </source> <relativeOutputDirectory>../..</relativeOutputDirectory> - <destination>${basedir}/../Jewel-Light-NoFlat-Blue-Theme/src/main/resources</destination> + <destination>${basedir}/../Jewel-Light-NoFlat-Secondary-Blue-Theme/src/main/resources</destination> </resource> + </resources> </configuration> <executions> diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css index 04140c2..7056948 100644 --- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css +++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css @@ -201,39 +201,6 @@ j|Alert { box-shadow: none; } -.jewel.button.emphasized { - cursor: pointer; - display: inline-block; - margin: 0; - padding: 8px; - min-width: 34px; - min-height: 34px; - border: 1px solid #638c29; - background: linear-gradient(#98cc50, #7eb435); - box-shadow: inset 0 1px 0 #bbdd8b; - border-radius: 3px; -} -.jewel.button.emphasized:hover, .jewel.button.emphasized:hover:focus { - border: 1px solid #557923; - background: linear-gradient(#8CC63C, #71a02f); -} -.jewel.button.emphasized:active, .jewel.button.emphasized:active:focus { - border: 1px solid #395118; - background: linear-gradient(#71a02f, #557923); - box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5); -} -.jewel.button.emphasized:focus { - outline: none; - border: 1px solid #638c29; - box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0 rgba(255, 255, 255, 0.6); -} -.jewel.button.emphasized[disabled] { - cursor: unset; - border: 1px solid #d9d9d9; - background: #f3f3f3; - box-shadow: none; -} - .jewel.checkbox { display: inline-block; margin: 0; @@ -496,49 +463,6 @@ j|Alert { text-shadow: unset; } -.jewel.textbutton.emphasized { - cursor: pointer; - display: inline-block; - margin: 0; - padding: 10px 16px; - min-width: 74px; - min-height: 34px; - border: 1px solid #638c29; - background: linear-gradient(#98cc50, #7eb435); - box-shadow: inset 0 1px 0 #bbdd8b; - border-radius: 3px; - font-family: "Lato", sans-serif; - font-size: 14px; - font-weight: bold; - color: #FFFFFF; - text-transform: uppercase; - text-decoration: none; - text-shadow: 0 -1px 0 rgba(57, 81, 24, 0.7); -} -.jewel.textbutton.emphasized:hover, .jewel.textbutton.emphasized:hover:focus { - border: 1px solid #557923; - background: linear-gradient(#8CC63C, #71a02f); -} -.jewel.textbutton.emphasized:active, .jewel.textbutton.emphasized:active:focus { - border: 1px solid #395118; - background: linear-gradient(#71a02f, #557923); - box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5); -} -.jewel.textbutton.emphasized:focus { - outline: none; - border: 1px solid #638c29; - box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0 rgba(255, 255, 255, 0.6); -} -.jewel.textbutton.emphasized[disabled] { - cursor: unset; - border: 1px solid #d9d9d9; - background: #f3f3f3; - box-shadow: none; - color: silver; - font-weight: normal; - text-shadow: unset; -} - .jewel.textfield { position: relative; display: inline-flex; diff --git a/frameworks/themes/JewelTheme/src/main/resources/themes/light-noflat-emphasized-blue/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/themes/light-noflat-emphasized-blue/defaults.css new file mode 100644 index 0000000..a52a8d1 --- /dev/null +++ b/frameworks/themes/JewelTheme/src/main/resources/themes/light-noflat-emphasized-blue/defaults.css @@ -0,0 +1,210 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +@namespace j "library://ns.apache.org/royale/jewel"; +@namespace "http://www.w3.org/1999/xhtml"; +.royale *, .royale *:before, .royale *:after { + box-sizing: border-box; +} + +j|Application { + background: white; + font-family: "Lato", sans-serif; + color: #808080; +} + +h1 { + font-size: 2em; +} + +h2 { + font-size: 1.5em; +} + +h3 { + font-size: 1.17em; +} + +h4 { + font-size: 15px; +} + +span { + font-size: 14px; +} + +div { + font-size: 14px; +} + +.container { + background: #ebebeb; + border-radius: 10px; + padding: 20px; +} + +.jewel.button { + cursor: pointer; + display: inline-block; + margin: 0; + padding: 8px; + min-width: 34px; + min-height: 34px; + border: 1px solid #b3b3b3; + background: linear-gradient(#e6e6e6, #cccccc); + box-shadow: inset 0 1px 0 white; + border-radius: 3px; +} +.jewel.button:hover, .jewel.button:hover:focus { + border: 1px solid #a6a6a6; + background: linear-gradient(#d9d9d9, silver); +} +.jewel.button:active, .jewel.button:active:focus { + border: 1px solid #8d8d8d; + background: linear-gradient(silver, #a6a6a6); + box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5); +} +.jewel.button:focus { + outline: none; + border: 1px solid #b3b3b3; + box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0 rgba(255, 255, 255, 0.6); +} +.jewel.button[disabled] { + cursor: unset; + border: 1px solid #d9d9d9; + background: #f3f3f3; + box-shadow: none; +} + +.jewel.button.emphasized { + cursor: pointer; + display: inline-block; + margin: 0; + padding: 8px; + min-width: 34px; + min-height: 34px; + border: 1px solid #0f88d1; + background: linear-gradient(#54b7f3, #24a3ef); + box-shadow: inset 0 1px 0 #9bd5f8; + border-radius: 3px; +} +.jewel.button.emphasized:hover, .jewel.button.emphasized:hover:focus { + border: 1px solid #0d79ba; + background: linear-gradient(#3CADF1, #1198e9); +} +.jewel.button.emphasized:active, .jewel.button.emphasized:active:focus { + border: 1px solid #0a5a8a; + background: linear-gradient(#1198e9, #0d79ba); + box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5); +} +.jewel.button.emphasized:focus { + outline: none; + border: 1px solid #0f88d1; + box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0 rgba(255, 255, 255, 0.6); +} +.jewel.button.emphasized[disabled] { + cursor: unset; + border: 1px solid #d9d9d9; + background: #f3f3f3; + box-shadow: none; +} + +.jewel.textbutton { + cursor: pointer; + display: inline-block; + margin: 0; + padding: 10px 16px; + min-width: 74px; + min-height: 34px; + border: 1px solid #b3b3b3; + background: linear-gradient(#e6e6e6, #cccccc); + box-shadow: inset 0 1px 0 white; + border-radius: 3px; + font-family: "Lato", sans-serif; + font-size: 14px; + font-weight: bold; + color: #808080; + text-transform: uppercase; + text-decoration: none; +} +.jewel.textbutton:hover, .jewel.textbutton:hover:focus { + border: 1px solid #a6a6a6; + background: linear-gradient(#d9d9d9, silver); +} +.jewel.textbutton:active, .jewel.textbutton:active:focus { + border: 1px solid #8d8d8d; + background: linear-gradient(silver, #a6a6a6); + box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5); +} +.jewel.textbutton:focus { + outline: none; + border: 1px solid #b3b3b3; + box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0 rgba(255, 255, 255, 0.6); +} +.jewel.textbutton[disabled] { + cursor: unset; + border: 1px solid #d9d9d9; + background: #f3f3f3; + box-shadow: none; + color: silver; + font-weight: normal; + text-shadow: unset; +} + +.jewel.textbutton.emphasized { + cursor: pointer; + display: inline-block; + margin: 0; + padding: 10px 16px; + min-width: 74px; + min-height: 34px; + border: 1px solid #0f88d1; + background: linear-gradient(#54b7f3, #24a3ef); + box-shadow: inset 0 1px 0 #9bd5f8; + border-radius: 3px; + font-family: "Lato", sans-serif; + font-size: 14px; + font-weight: bold; + color: #FFFFFF; + text-transform: uppercase; + text-decoration: none; + text-shadow: 0 -1px 0 rgba(10, 90, 138, 0.7); +} +.jewel.textbutton.emphasized:hover, .jewel.textbutton.emphasized:hover:focus { + border: 1px solid #0d79ba; + background: linear-gradient(#3CADF1, #1198e9); +} +.jewel.textbutton.emphasized:active, .jewel.textbutton.emphasized:active:focus { + border: 1px solid #0a5a8a; + background: linear-gradient(#1198e9, #0d79ba); + box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5); +} +.jewel.textbutton.emphasized:focus { + outline: none; + border: 1px solid #0f88d1; + box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0 rgba(255, 255, 255, 0.6); +} +.jewel.textbutton.emphasized[disabled] { + cursor: unset; + border: 1px solid #d9d9d9; + background: #f3f3f3; + box-shadow: none; + color: silver; + font-weight: normal; + text-shadow: unset; +} + +/*# sourceMappingURL=defaults.css.map */ diff --git a/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/themes/light-noflat-primary-blue/defaults.css similarity index 86% rename from frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/src/main/resources/defaults.css rename to frameworks/themes/JewelTheme/src/main/resources/themes/light-noflat-primary-blue/defaults.css index 04140c2..7056948 100644 --- a/frameworks/themes/Jewel-Light-NoFlat-Blue-Theme/src/main/resources/defaults.css +++ b/frameworks/themes/JewelTheme/src/main/resources/themes/light-noflat-primary-blue/defaults.css @@ -201,39 +201,6 @@ j|Alert { box-shadow: none; } -.jewel.button.emphasized { - cursor: pointer; - display: inline-block; - margin: 0; - padding: 8px; - min-width: 34px; - min-height: 34px; - border: 1px solid #638c29; - background: linear-gradient(#98cc50, #7eb435); - box-shadow: inset 0 1px 0 #bbdd8b; - border-radius: 3px; -} -.jewel.button.emphasized:hover, .jewel.button.emphasized:hover:focus { - border: 1px solid #557923; - background: linear-gradient(#8CC63C, #71a02f); -} -.jewel.button.emphasized:active, .jewel.button.emphasized:active:focus { - border: 1px solid #395118; - background: linear-gradient(#71a02f, #557923); - box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5); -} -.jewel.button.emphasized:focus { - outline: none; - border: 1px solid #638c29; - box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0 rgba(255, 255, 255, 0.6); -} -.jewel.button.emphasized[disabled] { - cursor: unset; - border: 1px solid #d9d9d9; - background: #f3f3f3; - box-shadow: none; -} - .jewel.checkbox { display: inline-block; margin: 0; @@ -496,49 +463,6 @@ j|Alert { text-shadow: unset; } -.jewel.textbutton.emphasized { - cursor: pointer; - display: inline-block; - margin: 0; - padding: 10px 16px; - min-width: 74px; - min-height: 34px; - border: 1px solid #638c29; - background: linear-gradient(#98cc50, #7eb435); - box-shadow: inset 0 1px 0 #bbdd8b; - border-radius: 3px; - font-family: "Lato", sans-serif; - font-size: 14px; - font-weight: bold; - color: #FFFFFF; - text-transform: uppercase; - text-decoration: none; - text-shadow: 0 -1px 0 rgba(57, 81, 24, 0.7); -} -.jewel.textbutton.emphasized:hover, .jewel.textbutton.emphasized:hover:focus { - border: 1px solid #557923; - background: linear-gradient(#8CC63C, #71a02f); -} -.jewel.textbutton.emphasized:active, .jewel.textbutton.emphasized:active:focus { - border: 1px solid #395118; - background: linear-gradient(#71a02f, #557923); - box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5); -} -.jewel.textbutton.emphasized:focus { - outline: none; - border: 1px solid #638c29; - box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0 rgba(255, 255, 255, 0.6); -} -.jewel.textbutton.emphasized[disabled] { - cursor: unset; - border: 1px solid #d9d9d9; - background: #f3f3f3; - box-shadow: none; - color: silver; - font-weight: normal; - text-shadow: unset; -} - .jewel.textfield { position: relative; display: inline-flex; diff --git a/frameworks/themes/JewelBlueTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/themes/light-noflat-secondary-blue/defaults.css similarity index 70% rename from frameworks/themes/JewelBlueTheme/src/main/resources/defaults.css rename to frameworks/themes/JewelTheme/src/main/resources/themes/light-noflat-secondary-blue/defaults.css index 1bacd30..4a40045 100644 --- a/frameworks/themes/JewelBlueTheme/src/main/resources/defaults.css +++ b/frameworks/themes/JewelTheme/src/main/resources/themes/light-noflat-secondary-blue/defaults.css @@ -16,6 +16,46 @@ */ @namespace j "library://ns.apache.org/royale/jewel"; @namespace "http://www.w3.org/1999/xhtml"; +.royale *, .royale *:before, .royale *:after { + box-sizing: border-box; +} + +j|Application { + background: white; + font-family: "Lato", sans-serif; + color: #808080; +} + +h1 { + font-size: 2em; +} + +h2 { + font-size: 1.5em; +} + +h3 { + font-size: 1.17em; +} + +h4 { + font-size: 15px; +} + +span { + font-size: 14px; +} + +div { + font-size: 14px; +} + +.container { + background: #ebebeb; + border-radius: 10px; + padding: 20px; +} + .jewel.button.secondary { cursor: pointer; display: inline-block; @@ -23,23 +63,23 @@ padding: 8px; min-width: 34px; min-height: 34px; - border: 1px solid #be390e; - background: linear-gradient(#f16c42, #ed4812); - box-shadow: inset 0 1px 0 #f6a389; + border: 1px solid #0f88d1; + background: linear-gradient(#54b7f3, #24a3ef); + box-shadow: inset 0 1px 0 #9bd5f8; border-radius: 3px; } .jewel.button.secondary:hover, .jewel.button.secondary:hover:focus { - border: 1px solid #a6320d; - background: linear-gradient(#EF5A2A, #d64010); + border: 1px solid #0d79ba; + background: linear-gradient(#3CADF1, #1198e9); } .jewel.button.secondary:active, .jewel.button.secondary:active:focus { - border: 1px solid #772409; - background: linear-gradient(#d64010, #a6320d); + border: 1px solid #0a5a8a; + background: linear-gradient(#1198e9, #0d79ba); box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5); } .jewel.button.secondary:focus { outline: none; - border: 1px solid #be390e; + border: 1px solid #0f88d1; box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0 rgba(255, 255, 255, 0.6); } .jewel.button.secondary[disabled] { @@ -56,9 +96,9 @@ padding: 10px 16px; min-width: 74px; min-height: 34px; - border: 1px solid #be390e; - background: linear-gradient(#f16c42, #ed4812); - box-shadow: inset 0 1px 0 #f6a389; + border: 1px solid #0f88d1; + background: linear-gradient(#54b7f3, #24a3ef); + box-shadow: inset 0 1px 0 #9bd5f8; border-radius: 3px; font-family: "Lato", sans-serif; font-size: 14px; @@ -66,20 +106,20 @@ color: #FFFFFF; text-transform: uppercase; text-decoration: none; - text-shadow: 0 -1px 0 rgba(119, 36, 9, 0.7); + text-shadow: 0 -1px 0 rgba(10, 90, 138, 0.7); } .jewel.textbutton.secondary:hover, .jewel.textbutton.secondary:hover:focus { - border: 1px solid #a6320d; - background: linear-gradient(#EF5A2A, #d64010); + border: 1px solid #0d79ba; + background: linear-gradient(#3CADF1, #1198e9); } .jewel.textbutton.secondary:active, .jewel.textbutton.secondary:active:focus { - border: 1px solid #772409; - background: linear-gradient(#d64010, #a6320d); + border: 1px solid #0a5a8a; + background: linear-gradient(#1198e9, #0d79ba); box-shadow: inset 0px 1px 3px 0px rgba(50, 50, 50, 0.5); } .jewel.textbutton.secondary:focus { outline: none; - border: 1px solid #be390e; + border: 1px solid #0f88d1; box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5), inset 0 1px 0 rgba(255, 255, 255, 0.6); } .jewel.textbutton.secondary[disabled] { diff --git a/frameworks/themes/JewelTheme/src/main/sass/_theme.sass b/frameworks/themes/JewelTheme/src/main/sass/_theme.sass index adbaeb3..3070446 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/_theme.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/_theme.sass @@ -21,4 +21,5 @@ $flat: false $dark: false $primary-color: $blue +$secondary-color: $topaz $emphasized-color: $emerald \ 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-emphasized/_alert.sass similarity index 94% copy from frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass copy to frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_alert.sass index 6aed678..1c8d95a 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_alert.sass @@ -17,8 +17,7 @@ // //////////////////////////////////////////////////////////////////////////////// -// Jewel TitleBAr +// Jewel Alert -// TitleBar variables +// Alert variables -//.jewel.titlebar \ No newline at end of file diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_button.sass b/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_button.sass similarity index 96% copy from frameworks/themes/JewelTheme/src/main/sass/components/_button.sass copy to frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_button.sass index 2e15d9c..4115427 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components/_button.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_button.sass @@ -61,8 +61,8 @@ $button-border-radius: 3px .jewel.button +button-theme($default-color) -.jewel.button.primary - +button-theme($primary-color) +//.jewel.button.primary +// +button-theme($primary-color) .jewel.button.emphasized +button-theme($emphasized-color) diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass b/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_checkbox.sass similarity index 94% copy from frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass copy to frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_checkbox.sass index 6aed678..9b0ac58 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_checkbox.sass @@ -17,8 +17,6 @@ // //////////////////////////////////////////////////////////////////////////////// -// Jewel TitleBAr +// Jewel CheckBox -// TitleBar variables - -//.jewel.titlebar \ No newline at end of file +// CheckBox variables diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_controlbar.sass b/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_controlbar.sass similarity index 100% copy from frameworks/themes/JewelTheme/src/main/sass/components/_controlbar.sass copy to frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_controlbar.sass diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass b/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_label.sass similarity index 94% copy from frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass copy to frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_label.sass index 6aed678..15691ca 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_label.sass @@ -17,8 +17,3 @@ // //////////////////////////////////////////////////////////////////////////////// -// Jewel TitleBAr - -// TitleBar variables - -//.jewel.titlebar \ 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-emphasized/_radiobutton.sass similarity index 94% copy from frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass copy to frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_radiobutton.sass index 6aed678..9016e3a 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_radiobutton.sass @@ -17,8 +17,6 @@ // //////////////////////////////////////////////////////////////////////////////// -// Jewel TitleBAr +// Jewel RadioButton -// TitleBar variables - -//.jewel.titlebar \ No newline at end of file +// RadioButton variables diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass b/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_slider.sass similarity index 94% copy from frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass copy to frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_slider.sass index 6aed678..019c818 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_slider.sass @@ -17,8 +17,4 @@ // //////////////////////////////////////////////////////////////////////////////// -// Jewel TitleBAr -// TitleBar variables - -//.jewel.titlebar \ No newline at end of file diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_textbutton.sass b/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_textbutton.sass similarity index 96% copy from frameworks/themes/JewelTheme/src/main/sass/components/_textbutton.sass copy to frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_textbutton.sass index dc4ec6b..7097287 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components/_textbutton.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_textbutton.sass @@ -78,8 +78,8 @@ $textbutton-border-radius: 3px .jewel.textbutton +textbutton-theme($default-color, $default-font-color) -.jewel.textbutton.primary - +textbutton-theme($primary-color, $font-theme-color) +//.jewel.textbutton.primary +// +textbutton-theme($primary-color, $font-theme-color) .jewel.textbutton.emphasized +textbutton-theme($emphasized-color, $font-theme-color) diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass b/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_textfield.sass similarity index 94% copy from frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass copy to frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_textfield.sass index 6aed678..5ac77c9 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_textfield.sass @@ -17,8 +17,6 @@ // //////////////////////////////////////////////////////////////////////////////// -// Jewel TitleBAr +// Jewel Textfield -// TitleBar variables - -//.jewel.titlebar \ No newline at end of file +// Textfield variables diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass b/frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_titlebar.sass similarity index 100% copy from frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass copy to frameworks/themes/JewelTheme/src/main/sass/components-emphasized/_titlebar.sass diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_alert.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_alert.sass similarity index 100% rename from frameworks/themes/JewelTheme/src/main/sass/components/_alert.sass rename to frameworks/themes/JewelTheme/src/main/sass/components-primary/_alert.sass diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_button.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_button.sass similarity index 96% copy from frameworks/themes/JewelTheme/src/main/sass/components/_button.sass copy to frameworks/themes/JewelTheme/src/main/sass/components-primary/_button.sass index 2e15d9c..2289b79 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components/_button.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_button.sass @@ -64,8 +64,8 @@ $button-border-radius: 3px .jewel.button.primary +button-theme($primary-color) -.jewel.button.emphasized - +button-theme($emphasized-color) +//.jewel.button.emphasized +// +button-theme($emphasized-color) //SVGs diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_checkbox.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_checkbox.sass similarity index 100% rename from frameworks/themes/JewelTheme/src/main/sass/components/_checkbox.sass rename to frameworks/themes/JewelTheme/src/main/sass/components-primary/_checkbox.sass diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_controlbar.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_controlbar.sass similarity index 100% copy from frameworks/themes/JewelTheme/src/main/sass/components/_controlbar.sass copy to frameworks/themes/JewelTheme/src/main/sass/components-primary/_controlbar.sass diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_label.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_label.sass similarity index 100% rename from frameworks/themes/JewelTheme/src/main/sass/components/_label.sass rename to frameworks/themes/JewelTheme/src/main/sass/components-primary/_label.sass diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_radiobutton.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_radiobutton.sass similarity index 100% rename from frameworks/themes/JewelTheme/src/main/sass/components/_radiobutton.sass rename to frameworks/themes/JewelTheme/src/main/sass/components-primary/_radiobutton.sass diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_slider.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_slider.sass similarity index 100% rename from frameworks/themes/JewelTheme/src/main/sass/components/_slider.sass rename to frameworks/themes/JewelTheme/src/main/sass/components-primary/_slider.sass diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_textbutton.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_textbutton.sass similarity index 96% copy from frameworks/themes/JewelTheme/src/main/sass/components/_textbutton.sass copy to frameworks/themes/JewelTheme/src/main/sass/components-primary/_textbutton.sass index dc4ec6b..9664995 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components/_textbutton.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_textbutton.sass @@ -81,5 +81,5 @@ $textbutton-border-radius: 3px .jewel.textbutton.primary +textbutton-theme($primary-color, $font-theme-color) -.jewel.textbutton.emphasized - +textbutton-theme($emphasized-color, $font-theme-color) +//.jewel.textbutton.emphasized +// +textbutton-theme($emphasized-color, $font-theme-color) diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_textfield.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_textfield.sass similarity index 100% rename from frameworks/themes/JewelTheme/src/main/sass/components/_textfield.sass rename to frameworks/themes/JewelTheme/src/main/sass/components-primary/_textfield.sass diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_titlebar.sass similarity index 100% copy from frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass copy to frameworks/themes/JewelTheme/src/main/sass/components-primary/_titlebar.sass diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass b/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_alert.sass similarity index 94% copy from frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass copy to frameworks/themes/JewelTheme/src/main/sass/components-secondary/_alert.sass index 6aed678..1c8d95a 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_alert.sass @@ -17,8 +17,7 @@ // //////////////////////////////////////////////////////////////////////////////// -// Jewel TitleBAr +// Jewel Alert -// TitleBar variables +// Alert variables -//.jewel.titlebar \ No newline at end of file diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_button.sass b/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_button.sass similarity index 72% rename from frameworks/themes/JewelTheme/src/main/sass/components/_button.sass rename to frameworks/themes/JewelTheme/src/main/sass/components-secondary/_button.sass index 2e15d9c..674fd65 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components/_button.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_button.sass @@ -58,34 +58,5 @@ $button-border-radius: 3px cursor: unset +jewel-bg-border("disabled", $button-color) -.jewel.button - +button-theme($default-color) - -.jewel.button.primary - +button-theme($primary-color) - -.jewel.button.emphasized - +button-theme($emphasized-color) - - -//SVGs -//border:1px; /*without this svg shows scaled and bigger*/ -//border-image-source: url(assets/jewel-button.svg) ; -//border-image-slice: 4; -//border-image-width: 4; - -//background-image: linear-gradient(#3BB0FF, #1E36FA); - -//background-color: #006CEB; -//background-size: cover; -//background-repeat: no-repeat; -//background-clip: padding-box; - -//background: url(assets/4slicewithpattern.svg); -//background-size: cover; -//width: fit-content; -//height: fit-content; - -//.button:active -//box-shadow: #E6431D 0 1px 0 inset; -//text-shadow: 0 -1px 0 #5F3A29; \ No newline at end of file +.jewel.button.secondary + +button-theme($secondary-color) diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass b/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_checkbox.sass similarity index 94% copy from frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass copy to frameworks/themes/JewelTheme/src/main/sass/components-secondary/_checkbox.sass index 6aed678..9b0ac58 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_checkbox.sass @@ -17,8 +17,6 @@ // //////////////////////////////////////////////////////////////////////////////// -// Jewel TitleBAr +// Jewel CheckBox -// TitleBar variables - -//.jewel.titlebar \ No newline at end of file +// CheckBox variables diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_controlbar.sass b/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_controlbar.sass similarity index 98% rename from frameworks/themes/JewelTheme/src/main/sass/components/_controlbar.sass rename to frameworks/themes/JewelTheme/src/main/sass/components-secondary/_controlbar.sass index 94b2221..5ddca20 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components/_controlbar.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_controlbar.sass @@ -20,5 +20,3 @@ // Jewel ControlBar // ControlBar variables - -//.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-secondary/_label.sass similarity index 94% copy from frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass copy to frameworks/themes/JewelTheme/src/main/sass/components-secondary/_label.sass index 6aed678..019c818 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_label.sass @@ -17,8 +17,4 @@ // //////////////////////////////////////////////////////////////////////////////// -// Jewel TitleBAr -// TitleBar variables - -//.jewel.titlebar \ 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-secondary/_radiobutton.sass similarity index 94% copy from frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass copy to frameworks/themes/JewelTheme/src/main/sass/components-secondary/_radiobutton.sass index 6aed678..9016e3a 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_radiobutton.sass @@ -17,8 +17,6 @@ // //////////////////////////////////////////////////////////////////////////////// -// Jewel TitleBAr +// Jewel RadioButton -// TitleBar variables - -//.jewel.titlebar \ No newline at end of file +// RadioButton variables diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass b/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_slider.sass similarity index 94% copy from frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass copy to frameworks/themes/JewelTheme/src/main/sass/components-secondary/_slider.sass index 6aed678..019c818 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_slider.sass @@ -17,8 +17,4 @@ // //////////////////////////////////////////////////////////////////////////////// -// Jewel TitleBAr -// TitleBar variables - -//.jewel.titlebar \ No newline at end of file diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_textbutton.sass b/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_textbutton.sass similarity index 90% rename from frameworks/themes/JewelTheme/src/main/sass/components/_textbutton.sass rename to frameworks/themes/JewelTheme/src/main/sass/components-secondary/_textbutton.sass index dc4ec6b..12c1939 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components/_textbutton.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_textbutton.sass @@ -75,11 +75,5 @@ $textbutton-border-radius: 3px text: shadow: unset -.jewel.textbutton - +textbutton-theme($default-color, $default-font-color) - -.jewel.textbutton.primary - +textbutton-theme($primary-color, $font-theme-color) - -.jewel.textbutton.emphasized - +textbutton-theme($emphasized-color, $font-theme-color) +.jewel.textbutton.secondary + +textbutton-theme($secondary-color, $font-theme-color) diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass b/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_textfield.sass similarity index 94% copy from frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass copy to frameworks/themes/JewelTheme/src/main/sass/components-secondary/_textfield.sass index 6aed678..5ac77c9 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_textfield.sass @@ -17,8 +17,6 @@ // //////////////////////////////////////////////////////////////////////////////// -// Jewel TitleBAr +// Jewel Textfield -// TitleBar variables - -//.jewel.titlebar \ No newline at end of file +// Textfield variables diff --git a/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass b/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_titlebar.sass similarity index 98% rename from frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass rename to frameworks/themes/JewelTheme/src/main/sass/components-secondary/_titlebar.sass index 6aed678..813c0f0 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components/_titlebar.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components-secondary/_titlebar.sass @@ -20,5 +20,3 @@ // Jewel TitleBAr // TitleBar variables - -//.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 0ee02ce..08dd006 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/defaults.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/defaults.sass @@ -26,13 +26,13 @@ @import "global" // Components -@import "components/alert" -@import "components/button" -@import "components/checkbox" -@import "components/controlbar" -@import "components/label" -@import "components/radiobutton" -@import "components/slider" -@import "components/textbutton" -@import "components/textfield" -@import "components/titlebar" +@import "components-primary/alert" +@import "components-primary/button" +@import "components-primary/checkbox" +@import "components-primary/controlbar" +@import "components-primary/label" +@import "components-primary/radiobutton" +@import "components-primary/slider" +@import "components-primary/textbutton" +@import "components-primary/textfield" +@import "components-primary/titlebar" diff --git a/frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-blue/_theme.sass b/frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-emphasized-blue/_theme.sass similarity index 95% rename from frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-blue/_theme.sass rename to frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-emphasized-blue/_theme.sass index adbaeb3..15a54e9 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-blue/_theme.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-emphasized-blue/_theme.sass @@ -20,5 +20,4 @@ //Theme Style (Flat or Gradient) $flat: false $dark: false -$primary-color: $blue -$emphasized-color: $emerald \ No newline at end of file +$emphasized-color: $blue \ No newline at end of file diff --git a/frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-blue/defaults.sass b/frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-emphasized-blue/defaults.sass similarity index 67% copy from frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-blue/defaults.sass copy to frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-emphasized-blue/defaults.sass index 0e8db40..71fff7c 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-blue/defaults.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-emphasized-blue/defaults.sass @@ -26,13 +26,13 @@ @import "../../global" // Components -@import "../../components/alert" -@import "../../components/button" -@import "../../components/checkbox" -@import "../../components/controlbar" -@import "../../components/label" -@import "../../components/radiobutton" -@import "../../components/slider" -@import "../../components/textbutton" -@import "../../components/textfield" -@import "../../components/titlebar" +@import "../../components-emphasized/alert" +@import "../../components-emphasized/button" +@import "../../components-emphasized/checkbox" +@import "../../components-emphasized/controlbar" +@import "../../components-emphasized/label" +@import "../../components-emphasized/radiobutton" +@import "../../components-emphasized/slider" +@import "../../components-emphasized/textbutton" +@import "../../components-emphasized/textfield" +@import "../../components-emphasized/titlebar" diff --git a/frameworks/themes/JewelTheme/src/main/sass/_theme.sass b/frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-primary-blue/_theme.sass similarity index 95% copy from frameworks/themes/JewelTheme/src/main/sass/_theme.sass copy to frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-primary-blue/_theme.sass index adbaeb3..91fcbc4 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/_theme.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-primary-blue/_theme.sass @@ -20,5 +20,4 @@ //Theme Style (Flat or Gradient) $flat: false $dark: false -$primary-color: $blue -$emphasized-color: $emerald \ No newline at end of file +$primary-color: $blue \ No newline at end of file diff --git a/frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-blue/defaults.sass b/frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-primary-blue/defaults.sass similarity index 69% copy from frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-blue/defaults.sass copy to frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-primary-blue/defaults.sass index 0e8db40..0e69570 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-blue/defaults.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-primary-blue/defaults.sass @@ -26,13 +26,13 @@ @import "../../global" // Components -@import "../../components/alert" -@import "../../components/button" -@import "../../components/checkbox" -@import "../../components/controlbar" -@import "../../components/label" -@import "../../components/radiobutton" -@import "../../components/slider" -@import "../../components/textbutton" -@import "../../components/textfield" -@import "../../components/titlebar" +@import "../../components-primary/alert" +@import "../../components-primary/button" +@import "../../components-primary/checkbox" +@import "../../components-primary/controlbar" +@import "../../components-primary/label" +@import "../../components-primary/radiobutton" +@import "../../components-primary/slider" +@import "../../components-primary/textbutton" +@import "../../components-primary/textfield" +@import "../../components-primary/titlebar" diff --git a/frameworks/themes/JewelTheme/src/main/sass/_theme.sass b/frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-secondary-blue/_theme.sass similarity index 95% copy from frameworks/themes/JewelTheme/src/main/sass/_theme.sass copy to frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-secondary-blue/_theme.sass index adbaeb3..8b35996 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/_theme.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-secondary-blue/_theme.sass @@ -20,5 +20,4 @@ //Theme Style (Flat or Gradient) $flat: false $dark: false -$primary-color: $blue -$emphasized-color: $emerald \ No newline at end of file +$secondary-color: $blue \ No newline at end of file diff --git a/frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-blue/defaults.sass b/frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-secondary-blue/defaults.sass similarity index 68% rename from frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-blue/defaults.sass rename to frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-secondary-blue/defaults.sass index 0e8db40..4bfa1bd 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-blue/defaults.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/themes/light-noflat-secondary-blue/defaults.sass @@ -26,13 +26,13 @@ @import "../../global" // Components -@import "../../components/alert" -@import "../../components/button" -@import "../../components/checkbox" -@import "../../components/controlbar" -@import "../../components/label" -@import "../../components/radiobutton" -@import "../../components/slider" -@import "../../components/textbutton" -@import "../../components/textfield" -@import "../../components/titlebar" +@import "../../components-secondary/alert" +@import "../../components-secondary/button" +@import "../../components-secondary/checkbox" +@import "../../components-secondary/controlbar" +@import "../../components-secondary/label" +@import "../../components-secondary/radiobutton" +@import "../../components-secondary/slider" +@import "../../components-secondary/textbutton" +@import "../../components-secondary/textfield" +@import "../../components-secondary/titlebar" diff --git a/frameworks/themes/pom.xml b/frameworks/themes/pom.xml index 765e468..f04ae64 100644 --- a/frameworks/themes/pom.xml +++ b/frameworks/themes/pom.xml @@ -35,9 +35,10 @@ <modules> <module>Basic</module> <module>JewelTheme</module> - <module>JewelBlueTheme</module> - <module>Jewel-Light-NoFlat-Blue-Theme</module> + <module>Jewel-Light-NoFlat-Primary-Blue-Theme</module> + <module>Jewel-Light-NoFlat-Secondary-Blue-Theme</module> + <module>Jewel-Light-NoFlat-Emphasized-Blue-Theme</module> </modules> <dependencies> -- To stop receiving notification emails like this one, please contact carlosrov...@apache.org.