This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a commit to branch jewel-ui in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit d1f34775b9929cde7a3b177a05035059c0649a05 Author: Carlos Rovira <[email protected]> AuthorDate: Thu Mar 8 19:22:39 2018 +0100 end transforming actual files to sass syntax --- frameworks/themes/JewelTheme/pom.xml | 8 --- .../JewelTheme/src/main/resources/Button.css | 51 --------------- .../JewelTheme/src/main/resources/TextField.css | 75 ---------------------- .../JewelTheme/src/main/resources/defaults.css | 67 ++++++++++++++++++- .../themes/JewelTheme/src/main/sass/_button.sass | 43 +++++++++++++ .../JewelTheme/src/main/sass/_textfield.sass | 67 +++++++++++++++++++ .../themes/JewelTheme/src/main/sass/defaults.sass | 4 +- 7 files changed, 178 insertions(+), 137 deletions(-) diff --git a/frameworks/themes/JewelTheme/pom.xml b/frameworks/themes/JewelTheme/pom.xml index c431c4b..f74dd9c 100644 --- a/frameworks/themes/JewelTheme/pom.xml +++ b/frameworks/themes/JewelTheme/pom.xml @@ -64,14 +64,6 @@ <name>defaults.css</name> <path>../src/main/resources/defaults.css</path> </include-file> - <include-file> - <name>Button.css</name> - <path>../src/main/resources/Button.css</path> - </include-file> - <include-file> - <name>TextField.css</name> - <path>../src/main/resources/TextField.css</path> - </include-file> </includeFiles> </configuration> </plugin> diff --git a/frameworks/themes/JewelTheme/src/main/resources/Button.css b/frameworks/themes/JewelTheme/src/main/resources/Button.css deleted file mode 100644 index c341bde..0000000 --- a/frameworks/themes/JewelTheme/src/main/resources/Button.css +++ /dev/null @@ -1,51 +0,0 @@ -/* - * - * 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 "library://ns.apache.org/royale/jewel"; -/*@namespace svg "library://ns.apache.org/royale/svg";*/ - -/* -* Jewel Button -*/ -.button, .button:hover { - - cursor:pointer; - - /* Background: */ - border:1px; /*without this svg shows scaled and bigger*/ - border-image-source: url(assets/JewelButton2.svg) ; - border-image-slice: 4; - border-image-width: 4; - - background-image: linear-gradient(#3BB0FF, #1E36FA); - background-size: cover; - background-repeat: no-repeat; - background-clip: padding-box; -} - -.button:hover { - -} - -.button:active { - -} -.button:focus { - outline:0; -} \ No newline at end of file diff --git a/frameworks/themes/JewelTheme/src/main/resources/TextField.css b/frameworks/themes/JewelTheme/src/main/resources/TextField.css deleted file mode 100644 index d7a1b85..0000000 --- a/frameworks/themes/JewelTheme/src/main/resources/TextField.css +++ /dev/null @@ -1,75 +0,0 @@ -/* - * - * 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 "library://ns.apache.org/royale/jewel"; -/*@namespace svg "library://ns.apache.org/royale/svg";*/ - -/* -* Jewel TextField -*/ -TextField { - position: relative; - display: inline-block; - box-sizing: border-box; - width: 300px; - max-width: 100%; - margin: 0; -} - -.vTextField--input { - font-size: 16px; - font-family: 'Lato', sans-serif; - - border: none; - border-bottom: 2px solid; - border-bottom-color: #ff0000; - display: block; - margin: 0; - padding: 4 0; - width: 100px; - background: transparent; - text-align: left; - color: inherit; - outline: none; -} - -.vTextField--label { - bottom: 0; - color: #ff0000; - font-size: 13px; - left: 0; - right: 0; - pointer-events: none; - position: absolute; - display: block; - width: 100%; - overflow: hidden; - white-space: nowrap; - text-align: left; -} - -/* - padding: 5px; - border: solid 1px #666666; - border-radius: 6px; - color: #333333; -:hover - padding: 5px; - background-color: #DFDFDF; -*/ \ No newline at end of file diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css index 3a2634f..ef0706e 100644 --- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css +++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css @@ -30,7 +30,27 @@ body { font: 100% "Lato-Bold", sans-serif; - color: red; + color: #006CEB; +} + +/** + * Jewel Button + */ +.button, .button:hover { + cursor: pointer; + /* Background: */ + border: 1px; + border-image-source: url(assets/JewelButton2.svg); + border-image-slice: 4; + border-image-width: 4; + background-image: linear-gradient(#3BB0FF, #1E36FA); + background-size: cover; + background-repeat: no-repeat; + background-clip: padding-box; +} + +.button:focus { + outline: 0; } /** @@ -53,7 +73,7 @@ body { } .textbutton { - background-color: red; + background-color: #006CEB; transition-duration: 0.4s; } @@ -76,4 +96,47 @@ body { cursor: unset; } +/** + * Jewel TextField + */ +TextField { + position: relative; + display: inline-block; + box-sizing: border-box; + width: 300px; + max-width: 100%; + margin: 0; +} + +.vTextField--input { + font-size: 16px; + font-family: "Lato", sans-serif; + border: none; + border-bottom: 2px solid; + border-bottom-color: #ff0000; + display: block; + margin: 0; + padding: 4 0; + width: 100px; + background: transparent; + text-align: left; + color: inherit; + outline: none; +} + +.vTextField--label { + bottom: 0; + color: #ff0000; + font-size: 13px; + left: 0; + right: 0; + pointer-events: none; + position: absolute; + display: block; + width: 100%; + overflow: hidden; + white-space: nowrap; + text-align: left; +} + /*# sourceMappingURL=defaults.css.map */ diff --git a/frameworks/themes/JewelTheme/src/main/sass/_button.sass b/frameworks/themes/JewelTheme/src/main/sass/_button.sass new file mode 100644 index 0000000..1ea71ab --- /dev/null +++ b/frameworks/themes/JewelTheme/src/main/sass/_button.sass @@ -0,0 +1,43 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// 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. +// +//////////////////////////////////////////////////////////////////////////////// + +/** + * Jewel Button + */ +.button, .button:hover + + cursor: pointer + + /* Background: */ + border: 1px // without this svg shows scaled and bigger + border-image-source: url(assets/JewelButton2.svg) + border-image-slice: 4 + border-image-width: 4 + + background-image: linear-gradient(#3BB0FF, #1E36FA) + background-size: cover + background-repeat: no-repeat + background-clip: padding-box + +//.button:hover + +//.button:active + +.button:focus + outline: 0 diff --git a/frameworks/themes/JewelTheme/src/main/sass/_textfield.sass b/frameworks/themes/JewelTheme/src/main/sass/_textfield.sass new file mode 100644 index 0000000..84b696c --- /dev/null +++ b/frameworks/themes/JewelTheme/src/main/sass/_textfield.sass @@ -0,0 +1,67 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// 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. +// +//////////////////////////////////////////////////////////////////////////////// + +/** + * Jewel TextField + */ +TextField + position: relative + display: inline-block + box-sizing: border-box + width: 300px + max-width: 100% + margin: 0 + +.vTextField--input + font-size: 16px + font-family: 'Lato', sans-serif + + border: none + border-bottom: 2px solid + border-bottom-color: #ff0000 + display: block + margin: 0 + padding: 4 0 + width: 100px + background: transparent + text-align: left + color: inherit + outline: none + +.vTextField--label + bottom: 0 + color: #ff0000 + font-size: 13px + left: 0 + right: 0 + pointer-events: none + position: absolute + display: block + width: 100% + overflow: hidden + white-space: nowrap + text-align: left + +// padding: 5px; +// border: solid 1px #666666; +// border-radius: 6px; +// color: #333333; +//:hover +// padding: 5px; +// background-color: #DFDFDF; diff --git a/frameworks/themes/JewelTheme/src/main/sass/defaults.sass b/frameworks/themes/JewelTheme/src/main/sass/defaults.sass index aa62d14..8fae5e5 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/defaults.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/defaults.sass @@ -35,4 +35,6 @@ body color: $primary-color // Components -@import "textbutton" \ No newline at end of file +@import "button" +@import "textbutton" +@import "textfield" \ No newline at end of file -- To stop receiving notification emails like this one, please contact [email protected].
