diff --git a/assets/fonts/Lato-Black.ttf b/assets/fonts/Lato-Black.ttf new file mode 100644 index 0000000000..e2aeb6cc35 Binary files /dev/null and b/assets/fonts/Lato-Black.ttf differ diff --git a/assets/fonts/Lato-BlackItalic.ttf b/assets/fonts/Lato-BlackItalic.ttf new file mode 100644 index 0000000000..8167388669 Binary files /dev/null and b/assets/fonts/Lato-BlackItalic.ttf differ diff --git a/assets/fonts/Lato-Bold.ttf b/assets/fonts/Lato-Bold.ttf new file mode 100644 index 0000000000..ef5ae3b43e Binary files /dev/null and b/assets/fonts/Lato-Bold.ttf differ diff --git a/assets/fonts/Lato-BoldItalic.ttf b/assets/fonts/Lato-BoldItalic.ttf new file mode 100644 index 0000000000..664cd02c15 Binary files /dev/null and b/assets/fonts/Lato-BoldItalic.ttf differ diff --git a/assets/fonts/Lato-Hairline.ttf b/assets/fonts/Lato-Hairline.ttf new file mode 100644 index 0000000000..4c5a8fdd99 Binary files /dev/null and b/assets/fonts/Lato-Hairline.ttf differ diff --git a/assets/fonts/Lato-HairlineItalic.ttf b/assets/fonts/Lato-HairlineItalic.ttf new file mode 100644 index 0000000000..af5ac3dc77 Binary files /dev/null and b/assets/fonts/Lato-HairlineItalic.ttf differ diff --git a/assets/fonts/Lato-Heavy.ttf b/assets/fonts/Lato-Heavy.ttf new file mode 100644 index 0000000000..fc70ab7c35 Binary files /dev/null and b/assets/fonts/Lato-Heavy.ttf differ diff --git a/assets/fonts/Lato-HeavyItalic.ttf b/assets/fonts/Lato-HeavyItalic.ttf new file mode 100644 index 0000000000..823188c379 Binary files /dev/null and b/assets/fonts/Lato-HeavyItalic.ttf differ diff --git a/assets/fonts/Lato-Italic.ttf b/assets/fonts/Lato-Italic.ttf new file mode 100644 index 0000000000..b23256ff53 Binary files /dev/null and b/assets/fonts/Lato-Italic.ttf differ diff --git a/assets/fonts/Lato-Light.ttf b/assets/fonts/Lato-Light.ttf new file mode 100644 index 0000000000..0809b8e6b5 Binary files /dev/null and b/assets/fonts/Lato-Light.ttf differ diff --git a/assets/fonts/Lato-LightItalic.ttf b/assets/fonts/Lato-LightItalic.ttf new file mode 100644 index 0000000000..2d037390dc Binary files /dev/null and b/assets/fonts/Lato-LightItalic.ttf differ diff --git a/assets/fonts/Lato-Medium.ttf b/assets/fonts/Lato-Medium.ttf new file mode 100644 index 0000000000..2c612da2ae Binary files /dev/null and b/assets/fonts/Lato-Medium.ttf differ diff --git a/assets/fonts/Lato-MediumItalic.ttf b/assets/fonts/Lato-MediumItalic.ttf new file mode 100644 index 0000000000..63ecd028c4 Binary files /dev/null and b/assets/fonts/Lato-MediumItalic.ttf differ diff --git a/assets/fonts/Lato-Regular.ttf b/assets/fonts/Lato-Regular.ttf new file mode 100644 index 0000000000..adbfc467d2 Binary files /dev/null and b/assets/fonts/Lato-Regular.ttf differ diff --git a/assets/fonts/Lato-Semibold.ttf b/assets/fonts/Lato-Semibold.ttf new file mode 100644 index 0000000000..60ac82d65b Binary files /dev/null and b/assets/fonts/Lato-Semibold.ttf differ diff --git a/assets/fonts/Lato-SemiboldItalic.ttf b/assets/fonts/Lato-SemiboldItalic.ttf new file mode 100644 index 0000000000..cc23390745 Binary files /dev/null and b/assets/fonts/Lato-SemiboldItalic.ttf differ diff --git a/assets/fonts/Lato-Thin.ttf b/assets/fonts/Lato-Thin.ttf new file mode 100644 index 0000000000..0f84dc1b19 Binary files /dev/null and b/assets/fonts/Lato-Thin.ttf differ diff --git a/assets/fonts/Lato-ThinItalic.ttf b/assets/fonts/Lato-ThinItalic.ttf new file mode 100644 index 0000000000..7fbca2f974 Binary files /dev/null and b/assets/fonts/Lato-ThinItalic.ttf differ diff --git a/assets/fonts/OFL.txt b/assets/fonts/OFL.txt new file mode 100755 index 0000000000..3c5455f2af --- /dev/null +++ b/assets/fonts/OFL.txt @@ -0,0 +1,94 @@ +Copyright (c) 2010-2015, Łukasz Dziedzic (dziedzic@typoland.com), +with Reserved Font Name Lato. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/assets/fonts/SalesforceSans-Bold.ttf b/assets/fonts/SalesforceSans-Bold.ttf deleted file mode 100755 index 12e439f4de..0000000000 Binary files a/assets/fonts/SalesforceSans-Bold.ttf and /dev/null differ diff --git a/assets/fonts/SalesforceSans-BoldItalic.ttf b/assets/fonts/SalesforceSans-BoldItalic.ttf deleted file mode 100755 index 0eb9deb381..0000000000 Binary files a/assets/fonts/SalesforceSans-BoldItalic.ttf and /dev/null differ diff --git a/assets/fonts/SalesforceSans-Book.ttf b/assets/fonts/SalesforceSans-Book.ttf deleted file mode 100755 index acfc1a35c3..0000000000 Binary files a/assets/fonts/SalesforceSans-Book.ttf and /dev/null differ diff --git a/assets/fonts/SalesforceSans-Italic.ttf b/assets/fonts/SalesforceSans-Italic.ttf deleted file mode 100755 index b03fc87e89..0000000000 Binary files a/assets/fonts/SalesforceSans-Italic.ttf and /dev/null differ diff --git a/assets/fonts/SalesforceSans-Light.ttf b/assets/fonts/SalesforceSans-Light.ttf deleted file mode 100755 index b9dcdef415..0000000000 Binary files a/assets/fonts/SalesforceSans-Light.ttf and /dev/null differ diff --git a/assets/fonts/SalesforceSans-LightItalic.ttf b/assets/fonts/SalesforceSans-LightItalic.ttf deleted file mode 100755 index 41463731c2..0000000000 Binary files a/assets/fonts/SalesforceSans-LightItalic.ttf and /dev/null differ diff --git a/assets/fonts/SalesforceSans-Regular.ttf b/assets/fonts/SalesforceSans-Regular.ttf deleted file mode 100755 index f486935a16..0000000000 Binary files a/assets/fonts/SalesforceSans-Regular.ttf and /dev/null differ diff --git a/assets/fonts/SalesforceSans-Semibold.ttf b/assets/fonts/SalesforceSans-Semibold.ttf deleted file mode 100755 index 0330a661d1..0000000000 Binary files a/assets/fonts/SalesforceSans-Semibold.ttf and /dev/null differ diff --git a/assets/fonts/SalesforceSans-Thin.ttf b/assets/fonts/SalesforceSans-Thin.ttf deleted file mode 100755 index 5ad6071701..0000000000 Binary files a/assets/fonts/SalesforceSans-Thin.ttf and /dev/null differ diff --git a/assets/fonts/SalesforceSans-ThinItalic.ttf b/assets/fonts/SalesforceSans-ThinItalic.ttf deleted file mode 100755 index 684965ce97..0000000000 Binary files a/assets/fonts/SalesforceSans-ThinItalic.ttf and /dev/null differ diff --git a/assets/fonts/webfonts/Lato-Black.woff b/assets/fonts/webfonts/Lato-Black.woff new file mode 100644 index 0000000000..a0ab25e9af Binary files /dev/null and b/assets/fonts/webfonts/Lato-Black.woff differ diff --git a/assets/fonts/webfonts/Lato-Black.woff2 b/assets/fonts/webfonts/Lato-Black.woff2 new file mode 100644 index 0000000000..3ee7cd441e Binary files /dev/null and b/assets/fonts/webfonts/Lato-Black.woff2 differ diff --git a/assets/fonts/webfonts/Lato-BlackItalic.woff b/assets/fonts/webfonts/Lato-BlackItalic.woff new file mode 100644 index 0000000000..30f2c71ca3 Binary files /dev/null and b/assets/fonts/webfonts/Lato-BlackItalic.woff differ diff --git a/assets/fonts/webfonts/Lato-BlackItalic.woff2 b/assets/fonts/webfonts/Lato-BlackItalic.woff2 new file mode 100644 index 0000000000..6a59bdbef5 Binary files /dev/null and b/assets/fonts/webfonts/Lato-BlackItalic.woff2 differ diff --git a/assets/fonts/webfonts/Lato-Bold.woff b/assets/fonts/webfonts/Lato-Bold.woff new file mode 100644 index 0000000000..c6dff51f06 Binary files /dev/null and b/assets/fonts/webfonts/Lato-Bold.woff differ diff --git a/assets/fonts/webfonts/Lato-Bold.woff2 b/assets/fonts/webfonts/Lato-Bold.woff2 new file mode 100644 index 0000000000..bb195043cf Binary files /dev/null and b/assets/fonts/webfonts/Lato-Bold.woff2 differ diff --git a/assets/fonts/webfonts/Lato-BoldItalic.woff b/assets/fonts/webfonts/Lato-BoldItalic.woff new file mode 100644 index 0000000000..88ad05b9ff Binary files /dev/null and b/assets/fonts/webfonts/Lato-BoldItalic.woff differ diff --git a/assets/fonts/webfonts/Lato-BoldItalic.woff2 b/assets/fonts/webfonts/Lato-BoldItalic.woff2 new file mode 100644 index 0000000000..c4e3d804b5 Binary files /dev/null and b/assets/fonts/webfonts/Lato-BoldItalic.woff2 differ diff --git a/assets/fonts/webfonts/Lato-Hairline.woff b/assets/fonts/webfonts/Lato-Hairline.woff new file mode 100644 index 0000000000..2297f4369c Binary files /dev/null and b/assets/fonts/webfonts/Lato-Hairline.woff differ diff --git a/assets/fonts/webfonts/Lato-Hairline.woff2 b/assets/fonts/webfonts/Lato-Hairline.woff2 new file mode 100644 index 0000000000..34ca2fad26 Binary files /dev/null and b/assets/fonts/webfonts/Lato-Hairline.woff2 differ diff --git a/assets/fonts/webfonts/Lato-HairlineItalic.woff b/assets/fonts/webfonts/Lato-HairlineItalic.woff new file mode 100644 index 0000000000..7ac0a14656 Binary files /dev/null and b/assets/fonts/webfonts/Lato-HairlineItalic.woff differ diff --git a/assets/fonts/webfonts/Lato-HairlineItalic.woff2 b/assets/fonts/webfonts/Lato-HairlineItalic.woff2 new file mode 100644 index 0000000000..b5fceba0dd Binary files /dev/null and b/assets/fonts/webfonts/Lato-HairlineItalic.woff2 differ diff --git a/assets/fonts/webfonts/Lato-Heavy.woff b/assets/fonts/webfonts/Lato-Heavy.woff new file mode 100644 index 0000000000..43a3c80fba Binary files /dev/null and b/assets/fonts/webfonts/Lato-Heavy.woff differ diff --git a/assets/fonts/webfonts/Lato-Heavy.woff2 b/assets/fonts/webfonts/Lato-Heavy.woff2 new file mode 100644 index 0000000000..8a2436573b Binary files /dev/null and b/assets/fonts/webfonts/Lato-Heavy.woff2 differ diff --git a/assets/fonts/webfonts/Lato-HeavyItalic.woff b/assets/fonts/webfonts/Lato-HeavyItalic.woff new file mode 100644 index 0000000000..dbac8a9f0c Binary files /dev/null and b/assets/fonts/webfonts/Lato-HeavyItalic.woff differ diff --git a/assets/fonts/webfonts/Lato-HeavyItalic.woff2 b/assets/fonts/webfonts/Lato-HeavyItalic.woff2 new file mode 100644 index 0000000000..61989ae09a Binary files /dev/null and b/assets/fonts/webfonts/Lato-HeavyItalic.woff2 differ diff --git a/assets/fonts/webfonts/Lato-Italic.woff b/assets/fonts/webfonts/Lato-Italic.woff new file mode 100644 index 0000000000..76114bc033 Binary files /dev/null and b/assets/fonts/webfonts/Lato-Italic.woff differ diff --git a/assets/fonts/webfonts/Lato-Italic.woff2 b/assets/fonts/webfonts/Lato-Italic.woff2 new file mode 100644 index 0000000000..3404f37e2e Binary files /dev/null and b/assets/fonts/webfonts/Lato-Italic.woff2 differ diff --git a/assets/fonts/webfonts/Lato-Light.woff b/assets/fonts/webfonts/Lato-Light.woff new file mode 100644 index 0000000000..77b4e148f7 Binary files /dev/null and b/assets/fonts/webfonts/Lato-Light.woff differ diff --git a/assets/fonts/webfonts/Lato-Light.woff2 b/assets/fonts/webfonts/Lato-Light.woff2 new file mode 100644 index 0000000000..ce49f82217 Binary files /dev/null and b/assets/fonts/webfonts/Lato-Light.woff2 differ diff --git a/assets/fonts/webfonts/Lato-LightItalic.woff b/assets/fonts/webfonts/Lato-LightItalic.woff new file mode 100644 index 0000000000..da3dfa30a4 Binary files /dev/null and b/assets/fonts/webfonts/Lato-LightItalic.woff differ diff --git a/assets/fonts/webfonts/Lato-LightItalic.woff2 b/assets/fonts/webfonts/Lato-LightItalic.woff2 new file mode 100644 index 0000000000..0c897ce40c Binary files /dev/null and b/assets/fonts/webfonts/Lato-LightItalic.woff2 differ diff --git a/assets/fonts/webfonts/Lato-Medium.woff b/assets/fonts/webfonts/Lato-Medium.woff new file mode 100644 index 0000000000..39d53fdeac Binary files /dev/null and b/assets/fonts/webfonts/Lato-Medium.woff differ diff --git a/assets/fonts/webfonts/Lato-Medium.woff2 b/assets/fonts/webfonts/Lato-Medium.woff2 new file mode 100644 index 0000000000..01792cbd13 Binary files /dev/null and b/assets/fonts/webfonts/Lato-Medium.woff2 differ diff --git a/assets/fonts/webfonts/Lato-MediumItalic.woff b/assets/fonts/webfonts/Lato-MediumItalic.woff new file mode 100644 index 0000000000..724962beee Binary files /dev/null and b/assets/fonts/webfonts/Lato-MediumItalic.woff differ diff --git a/assets/fonts/webfonts/Lato-MediumItalic.woff2 b/assets/fonts/webfonts/Lato-MediumItalic.woff2 new file mode 100644 index 0000000000..1cc79653a6 Binary files /dev/null and b/assets/fonts/webfonts/Lato-MediumItalic.woff2 differ diff --git a/assets/fonts/webfonts/Lato-Regular.woff b/assets/fonts/webfonts/Lato-Regular.woff new file mode 100644 index 0000000000..ae1307ff5f Binary files /dev/null and b/assets/fonts/webfonts/Lato-Regular.woff differ diff --git a/assets/fonts/webfonts/Lato-Regular.woff2 b/assets/fonts/webfonts/Lato-Regular.woff2 new file mode 100644 index 0000000000..3bf9843328 Binary files /dev/null and b/assets/fonts/webfonts/Lato-Regular.woff2 differ diff --git a/assets/fonts/webfonts/Lato-Semibold.woff b/assets/fonts/webfonts/Lato-Semibold.woff new file mode 100644 index 0000000000..794417f6af Binary files /dev/null and b/assets/fonts/webfonts/Lato-Semibold.woff differ diff --git a/assets/fonts/webfonts/Lato-Semibold.woff2 b/assets/fonts/webfonts/Lato-Semibold.woff2 new file mode 100644 index 0000000000..5916925412 Binary files /dev/null and b/assets/fonts/webfonts/Lato-Semibold.woff2 differ diff --git a/assets/fonts/webfonts/Lato-SemiboldItalic.woff b/assets/fonts/webfonts/Lato-SemiboldItalic.woff new file mode 100644 index 0000000000..d1df7676e8 Binary files /dev/null and b/assets/fonts/webfonts/Lato-SemiboldItalic.woff differ diff --git a/assets/fonts/webfonts/Lato-SemiboldItalic.woff2 b/assets/fonts/webfonts/Lato-SemiboldItalic.woff2 new file mode 100644 index 0000000000..5e6ac27192 Binary files /dev/null and b/assets/fonts/webfonts/Lato-SemiboldItalic.woff2 differ diff --git a/assets/fonts/webfonts/Lato-Thin.woff b/assets/fonts/webfonts/Lato-Thin.woff new file mode 100644 index 0000000000..760b12479c Binary files /dev/null and b/assets/fonts/webfonts/Lato-Thin.woff differ diff --git a/assets/fonts/webfonts/Lato-Thin.woff2 b/assets/fonts/webfonts/Lato-Thin.woff2 new file mode 100644 index 0000000000..2c4f52f2bb Binary files /dev/null and b/assets/fonts/webfonts/Lato-Thin.woff2 differ diff --git a/assets/fonts/webfonts/Lato-ThinItalic.woff b/assets/fonts/webfonts/Lato-ThinItalic.woff new file mode 100644 index 0000000000..ef8de9a0da Binary files /dev/null and b/assets/fonts/webfonts/Lato-ThinItalic.woff differ diff --git a/assets/fonts/webfonts/Lato-ThinItalic.woff2 b/assets/fonts/webfonts/Lato-ThinItalic.woff2 new file mode 100644 index 0000000000..e15214fdf9 Binary files /dev/null and b/assets/fonts/webfonts/Lato-ThinItalic.woff2 differ diff --git a/assets/fonts/webfonts/OFL.txt b/assets/fonts/webfonts/OFL.txt new file mode 100755 index 0000000000..3c5455f2af --- /dev/null +++ b/assets/fonts/webfonts/OFL.txt @@ -0,0 +1,94 @@ +Copyright (c) 2010-2015, Łukasz Dziedzic (dziedzic@typoland.com), +with Reserved Font Name Lato. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/assets/fonts/webfonts/SalesforceSans-Bold.woff b/assets/fonts/webfonts/SalesforceSans-Bold.woff deleted file mode 100755 index 6ec23a86eb..0000000000 Binary files a/assets/fonts/webfonts/SalesforceSans-Bold.woff and /dev/null differ diff --git a/assets/fonts/webfonts/SalesforceSans-Bold.woff2 b/assets/fonts/webfonts/SalesforceSans-Bold.woff2 deleted file mode 100755 index 8425952ae7..0000000000 Binary files a/assets/fonts/webfonts/SalesforceSans-Bold.woff2 and /dev/null differ diff --git a/assets/fonts/webfonts/SalesforceSans-BoldItalic.woff b/assets/fonts/webfonts/SalesforceSans-BoldItalic.woff deleted file mode 100755 index bd44622bf7..0000000000 Binary files a/assets/fonts/webfonts/SalesforceSans-BoldItalic.woff and /dev/null differ diff --git a/assets/fonts/webfonts/SalesforceSans-BoldItalic.woff2 b/assets/fonts/webfonts/SalesforceSans-BoldItalic.woff2 deleted file mode 100755 index ce640f2295..0000000000 Binary files a/assets/fonts/webfonts/SalesforceSans-BoldItalic.woff2 and /dev/null differ diff --git a/assets/fonts/webfonts/SalesforceSans-Italic.woff b/assets/fonts/webfonts/SalesforceSans-Italic.woff deleted file mode 100755 index aa6a6b382f..0000000000 Binary files a/assets/fonts/webfonts/SalesforceSans-Italic.woff and /dev/null differ diff --git a/assets/fonts/webfonts/SalesforceSans-Italic.woff2 b/assets/fonts/webfonts/SalesforceSans-Italic.woff2 deleted file mode 100755 index f729b6772e..0000000000 Binary files a/assets/fonts/webfonts/SalesforceSans-Italic.woff2 and /dev/null differ diff --git a/assets/fonts/webfonts/SalesforceSans-Light.woff b/assets/fonts/webfonts/SalesforceSans-Light.woff deleted file mode 100755 index dc25e65cb9..0000000000 Binary files a/assets/fonts/webfonts/SalesforceSans-Light.woff and /dev/null differ diff --git a/assets/fonts/webfonts/SalesforceSans-Light.woff2 b/assets/fonts/webfonts/SalesforceSans-Light.woff2 deleted file mode 100755 index f467a3b0c9..0000000000 Binary files a/assets/fonts/webfonts/SalesforceSans-Light.woff2 and /dev/null differ diff --git a/assets/fonts/webfonts/SalesforceSans-LightItalic.woff b/assets/fonts/webfonts/SalesforceSans-LightItalic.woff deleted file mode 100755 index 15cbe9f147..0000000000 Binary files a/assets/fonts/webfonts/SalesforceSans-LightItalic.woff and /dev/null differ diff --git a/assets/fonts/webfonts/SalesforceSans-LightItalic.woff2 b/assets/fonts/webfonts/SalesforceSans-LightItalic.woff2 deleted file mode 100755 index 6aef54183d..0000000000 Binary files a/assets/fonts/webfonts/SalesforceSans-LightItalic.woff2 and /dev/null differ diff --git a/assets/fonts/webfonts/SalesforceSans-Regular.woff b/assets/fonts/webfonts/SalesforceSans-Regular.woff deleted file mode 100755 index b858d0900e..0000000000 Binary files a/assets/fonts/webfonts/SalesforceSans-Regular.woff and /dev/null differ diff --git a/assets/fonts/webfonts/SalesforceSans-Regular.woff2 b/assets/fonts/webfonts/SalesforceSans-Regular.woff2 deleted file mode 100755 index 37c76713d3..0000000000 Binary files a/assets/fonts/webfonts/SalesforceSans-Regular.woff2 and /dev/null differ diff --git a/assets/fonts/webfonts/SalesforceSans-Thin.woff b/assets/fonts/webfonts/SalesforceSans-Thin.woff deleted file mode 100755 index 3a2285ee7c..0000000000 Binary files a/assets/fonts/webfonts/SalesforceSans-Thin.woff and /dev/null differ diff --git a/assets/fonts/webfonts/SalesforceSans-Thin.woff2 b/assets/fonts/webfonts/SalesforceSans-Thin.woff2 deleted file mode 100755 index 8b2be1c5bb..0000000000 Binary files a/assets/fonts/webfonts/SalesforceSans-Thin.woff2 and /dev/null differ diff --git a/assets/fonts/webfonts/SalesforceSans-ThinItalic.woff b/assets/fonts/webfonts/SalesforceSans-ThinItalic.woff deleted file mode 100755 index cd498ec6f9..0000000000 Binary files a/assets/fonts/webfonts/SalesforceSans-ThinItalic.woff and /dev/null differ diff --git a/assets/fonts/webfonts/SalesforceSans-ThinItalic.woff2 b/assets/fonts/webfonts/SalesforceSans-ThinItalic.woff2 deleted file mode 100755 index a51b2eaa2f..0000000000 Binary files a/assets/fonts/webfonts/SalesforceSans-ThinItalic.woff2 and /dev/null differ diff --git a/design-tokens/vlocity-newport-skin.yml b/design-tokens/vlocity-newport-skin.yml index 8e60f1d12e..1fccf36b1f 100644 --- a/design-tokens/vlocity-newport-skin.yml +++ b/design-tokens/vlocity-newport-skin.yml @@ -4,3 +4,4 @@ imports: - ./force-base-skin.yml - ./vlocity-newport-skin/background-color.yml +- ./vlocity-newport-skin/font-family.yml diff --git a/design-tokens/vlocity-newport-skin/aliases/color.yml b/design-tokens/vlocity-newport-skin/aliases/color.yml index 252b4bd8a3..cb59c7dd9c 100644 --- a/design-tokens/vlocity-newport-skin/aliases/color.yml +++ b/design-tokens/vlocity-newport-skin/aliases/color.yml @@ -4,4 +4,6 @@ aliases: NEWPORT_BACKGROUND_PRIMARY_BLUE: "#1564BF" NEWPORT_COLOR_BRAND_ORANGE: "#FF6D00" - NEWPORT_CARD_BACKGROUND_LIGHT_BLUE: "#f8fbfe" \ No newline at end of file + NEWPORT_COLOR_ERROR: "#c23934" + NEWPORT_CARD_BACKGROUND_LIGHT_BLUE: "#f8fbfe" + NEWPORT_BORDER_GRAY: "#DDDBDA" \ No newline at end of file diff --git a/design-tokens/vlocity-newport-skin/aliases/font-family.yml b/design-tokens/vlocity-newport-skin/aliases/font-family.yml new file mode 100644 index 0000000000..af893a20b8 --- /dev/null +++ b/design-tokens/vlocity-newport-skin/aliases/font-family.yml @@ -0,0 +1,5 @@ +# Copyright (c) 2015-present, salesforce.com, inc. All rights reserved +# Licensed under BSD 3-Clause - see LICENSE.txt or git.io/sfdc-license + +aliases: + SANS_SERIF: "'Lato', sans-serif" diff --git a/design-tokens/vlocity-newport-skin/background-color.yml b/design-tokens/vlocity-newport-skin/background-color.yml index 1a2745fb5f..a15527d140 100644 --- a/design-tokens/vlocity-newport-skin/background-color.yml +++ b/design-tokens/vlocity-newport-skin/background-color.yml @@ -20,5 +20,15 @@ props: comment: Our product brand orange. CARD_COLOR_BACKGROUND: value: '{!NEWPORT_CARD_BACKGROUND_LIGHT_BLUE}' + COLOR_BORDER_INPUT: + value: '{!NEWPORT_BORDER_GRAY}' COLOR_BORDER_INPUT_ACTIVE: + value: '{!NEWPORT_COLOR_BRAND_ORANGE}' + COLOR_BORDER_ERROR: + value: '{!NEWPORT_COLOR_ERROR}' + PROGRESS_BAR_COLOR_BACKGROUND_FILL: + value: '{!NEWPORT_COLOR_BRAND_ORANGE}' + COLOR_BACKGROUND_SUCCESS: + value: '{!NEWPORT_COLOR_BRAND_ORANGE}' + COLOR_BACKGROUND_BUTTON_BRAND_HOVER: value: '{!NEWPORT_COLOR_BRAND_ORANGE}' \ No newline at end of file diff --git a/design-tokens/vlocity-newport-skin/font-family.yml b/design-tokens/vlocity-newport-skin/font-family.yml new file mode 100644 index 0000000000..a58acd1853 --- /dev/null +++ b/design-tokens/vlocity-newport-skin/font-family.yml @@ -0,0 +1,20 @@ +# Copyright (c) 2015-present, salesforce.com, inc. All rights reserved +# Licensed under BSD 3-Clause - see LICENSE.txt or git.io/sfdc-license + +global: + category: font + type: font + cssProperties: + - 'font' + - 'font-family' +imports: +- ./aliases/font-family.yml +props: + FONT_FAMILY: + value: '{!SANS_SERIF}' + deprecated: true + comment: 'Deprecated: use FONT_FAMILY_TEXT instead for regular body text and FONT_FAMILY_HEADING for headings.' + FONT_FAMILY_TEXT: + value: '{!SANS_SERIF}' + FONT_FAMILY_HEADING: + value: '{!SANS_SERIF}' diff --git a/package.json b/package.json index f697a6c368..dcbefcf4b4 100644 --- a/package.json +++ b/package.json @@ -169,7 +169,7 @@ ] }, "scripts": { - "build": "gulp build", + "build": "gulp build -v", "build-prod": "gulp build", "build-server": "babel-node scripts/npm/build-server.js", "build-travis": "babel-node scripts/npm/build-travis.js", diff --git a/scripts/dist.js b/scripts/dist.js index 2fe8ad0b92..265b16b309 100644 --- a/scripts/dist.js +++ b/scripts/dist.js @@ -165,7 +165,7 @@ async.series( */ done => { gulp - .src('fonts/**/*', { + .src(['fonts/**/*', '!**/*.ttf'], { cwd: paths.assets }) .pipe(gulp.dest(distPath('assets/fonts'))) @@ -190,9 +190,9 @@ async.series( // Images // ////////////////////////////////// - /** - * Copy select images directories - */ + // /** + // * Copy select images directories + // */ done => { gulp .src('images/**/*', { @@ -288,8 +288,10 @@ async.series( .pipe(postcss([autoprefixer({ remove: false })])) .pipe( gulprename(function(path) { - path.basename = - MODULE_NAME + path.basename.substring('index'.length); + if (!/slds-fonts/.test(path.basename)) { + path.basename = + MODULE_NAME + path.basename.substring('index'.length); + } path.extname = '.css'; return path; }) @@ -381,6 +383,24 @@ async.series( done => { rimraf(distPath('README-dist.md'), done); }, + done => { + rimraf(distPath('swatches'), done); + }, + done => { + rimraf(distPath('design-tokens'), done); + }, + done => { + rimraf(distPath('ui'), done); + }, + done => { + rimraf(distPath('scss'), done); + }, + done => { + rimraf(distPath('__internal'), done); + }, + done => { + rimraf(distPath('assets/icons/**/*.png'), done); + }, /** * Add ui.json diff --git a/scripts/gulp/styles.js b/scripts/gulp/styles.js index bd294ac20f..c902a26ea7 100644 --- a/scripts/gulp/styles.js +++ b/scripts/gulp/styles.js @@ -67,7 +67,7 @@ gulp.task('stylestats', ['styles'], done => { gulp.task('styles:sass', [], () => gulp - .src(['ui/index.scss', 'ui/index.rtl.scss']) + .src(['ui/slds-fonts.scss', 'ui/index.scss', 'ui/index.rtl.scss']) .pipe(plumber()) .pipe(sourcemaps.init()) .pipe( @@ -79,7 +79,13 @@ gulp.task('styles:sass', [], () => .on('error', sass.logError) ) .pipe(autoprefixer({ remove: false })) - .pipe(minifycss({ advanced: false, roundingPrecision: '-1' })) + .pipe( + minifycss({ + advanced: false, + roundingPrecision: '-1', + processImport: false + }) + ) .pipe(sourcemaps.write('.')) .pipe(gulp.dest('assets/styles')) ); diff --git a/scripts/previewer.js b/scripts/previewer.js index cf3d58f413..96431d2dee 100644 --- a/scripts/previewer.js +++ b/scripts/previewer.js @@ -28,7 +28,7 @@ const previewer = createPreviewer({ '/assets/icons': [paths.icons] }, // where is your css? - cssUrl: '/assets/styles/index.rtl.css', // ignored by git + cssUrl: '/assets/styles/index.css', // ignored by git // get me the js bundle scriptUrl: `/dist/__internal/slds.umd.js` }); diff --git a/ui/_init.scss b/ui/_init.scss index 783d2310d8..9ccaffe63b 100644 --- a/ui/_init.scss +++ b/ui/_init.scss @@ -13,4 +13,3 @@ @import 'vendor/deprecate'; @import 'vendor/directional'; @import 'dependencies/index'; -@import 'core/font'; diff --git a/ui/components/_index.scss b/ui/components/_index.scss index d24c318457..2cf5003acb 100644 --- a/ui/components/_index.scss +++ b/ui/components/_index.scss @@ -48,8 +48,9 @@ // Forms 'form-element/base/index', 'input/base/index', - 'input/newport/index', + 'input/animate/index', 'textarea/base/index', + 'textarea/animate/index', 'radio-group/base/index', 'radio-button-group/base/index', 'checkbox/base/index', @@ -64,6 +65,7 @@ // File selector 'file-selector/base/index', + 'file-selector/newport/index', // Page Headers 'page-headers/base/index', diff --git a/ui/components/checkbox/base/_index.scss b/ui/components/checkbox/base/_index.scss index 09b92f2c51..93ed654085 100644 --- a/ui/components/checkbox/base/_index.scss +++ b/ui/components/checkbox/base/_index.scss @@ -53,7 +53,10 @@ &:checked ~ .slds-checkbox--faux, &:checked + .slds-checkbox__label .slds-checkbox_faux, &:checked + .slds-checkbox__label .slds-checkbox--faux { - + background: $color-brand; + border: none; + outline: unset; + &:after { display: block; content: ''; @@ -63,8 +66,8 @@ top: 50%; left: 50%; transform: translate3d(-50%, -50%, 0) rotate(-45deg); - border-bottom: $border-width-thick solid $color-brand; - border-left: $border-width-thick solid $color-brand; + border-bottom: $border-width-thick solid $color-border-toggle-checked; + border-left: $border-width-thick solid $color-border-toggle-checked; } } @@ -88,7 +91,7 @@ &:checked + .slds-checkbox__label .slds-checkbox_faux, &:checked + .slds-checkbox__label .slds-checkbox--faux { border-color: $color-border-input-active; - background-color: $color-background-input; + background-color: $color-brand; } } @@ -148,10 +151,10 @@ &:checked + .slds-checkbox__label .slds-checkbox_faux, &:checked + .slds-checkbox__label .slds-checkbox--faux { border-color: $color-border-error; - background-color: $color-background-input; + background-color: $color-border-error; &:after { - border-color: $color-background-error; + border-color: $color-background-input; } } } diff --git a/ui/components/combobox/base/_index.scss b/ui/components/combobox/base/_index.scss index a8bc6b6e0e..674ad72816 100644 --- a/ui/components/combobox/base/_index.scss +++ b/ui/components/combobox/base/_index.scss @@ -306,8 +306,8 @@ .slds-has-object-switcher { flex-direction: row; background: $color-background-input; - border: $border-width-thin solid $color-border; - border-radius: $border-radius-medium; + border: 0; + border-bottom: $border-width-thin solid $color-border; /** * Input field within a combobox diff --git a/ui/components/datepickers/base/_index.scss b/ui/components/datepickers/base/_index.scss index f948591d49..c16e1b8dc2 100644 --- a/ui/components/datepickers/base/_index.scss +++ b/ui/components/datepickers/base/_index.scss @@ -92,6 +92,13 @@ */ &__filter { padding: $spacing-xx-small; + + .slds-select { + border: 1px solid $color-border-input; + border-radius: $border-radius-medium; + padding-left: 0.5rem; + padding-right: 1.8rem; + } } /** diff --git a/ui/components/file-selector/newport/_index.scss b/ui/components/file-selector/newport/_index.scss new file mode 100644 index 0000000000..2c1ed11870 --- /dev/null +++ b/ui/components/file-selector/newport/_index.scss @@ -0,0 +1,98 @@ +// Copyright (c) 2015-present, salesforce.com, inc. All rights reserved +// Licensed under BSD 3-Clause - see LICENSE.txt or git.io/sfdc-license + + +/** + * @summary Vlocity Newport branded file selecter + * + * @name newport + * @selector .vlocity-newport-file-selector + * @restrict .slds-file-selector + * @variant + */ + +.vlocity-newport-file-selector { + width: 15rem; + + .slds-file-selector__dropzone { + width: inherit; + padding: 0; + border: 1px solid #dddbda; + border-radius: .25rem; + background-color: #F8FBFE; + } + + .slds-file-selector__body, + .slds-file-selector__button { + width: 100%; + } + + .slds-file-selector__body { + position: relative; + height: inherit; + + .slds-file-selector__button { + height: inherit; + max-height: 2.3rem; + line-height: 2.3rem; + background-color: #F8FBFE; + border: none; + color: #54698D; + font-size: 0.75rem; + } + + span.vlocity-newport-file-icon { + position: absolute; + right: 0.5rem; + padding: 0.3rem; + border-radius: 0.25rem; + border: 1px solid #dddbda; + + svg.slds-button__icon { + fill: #54698D; + width: 1.2rem; + height: 1.2rem; + } + } + } + + .vlocity-newport-file-list { + margin: 0 0.5rem; + + li { + position: relative; + width: 100%; + height: 2.15rem; + margin: 0.5rem 0; + border: 1px solid #dddbda; + background-color: white; + border-radius: 0.25rem; + + .slds-button.slds-button_neutral { + border: none; + color: #061C3F; + font-size: 0.75rem; + } + } + + .slds-file-selector__button { + height: inherit; + max-height: 2rem; + } + + span.vlocity-newport-file-icon { + position: absolute; + right: 0.3rem; + padding: 0.4rem 0; + + svg.slds-button__icon { + fill: #54698D; + width: 1.2rem; + height: 1.2rem; + } + } + } +} + + + diff --git a/ui/components/file-selector/newport/example.jsx b/ui/components/file-selector/newport/example.jsx new file mode 100644 index 0000000000..57b5057ace --- /dev/null +++ b/ui/components/file-selector/newport/example.jsx @@ -0,0 +1,205 @@ +// Copyright (c) 2015-present, salesforce.com, inc. All rights reserved +// Licensed under BSD 3-Clause - see LICENSE.txt or git.io/sfdc-license + +import React from 'react'; +import SvgIcon from '../../../shared/svg-icon'; +import classNames from 'classnames'; + +export let NewportFileSelector = props => ( +
+
+
+
+ + +
+
+
+ + {props.error ? ( +
+ File type not supported +
+ ) : null} +
+); + +export let NewportFileSelectorWithFiles = props => ( +
+
+
+
+ + +
    +
  • + + peel-ux.png + + + + +
    • +
  • + + peel-ux.png + + + + +
    • +
  • + + peel-ux.png + + + + +
    • +
+
+
+
+ + {props.error ? ( +
+ File type not supported +
+ ) : null} +
+); + +export default ( + +); + +export let states = [ + { + id: 'file-selector-files-list', + label: 'Selected Files', + element: ( + + ) + }, + { + id: 'file-selector-files-error', + label: 'Error', + element: ( + + ) + }, + { + id: 'file-selector-files-draggover', + label: 'Dragover', + element: ( + + ) + }, + { + id: 'file-selector-files-draggover-error', + label: 'Dragover with error', + element: ( + + ) + } +]; diff --git a/ui/components/input/animate/_index.scss b/ui/components/input/animate/_index.scss new file mode 100644 index 0000000000..4da27c5b4c --- /dev/null +++ b/ui/components/input/animate/_index.scss @@ -0,0 +1,69 @@ +// Copyright (c) 2015-present, salesforce.com, inc. All rights reserved +// Licensed under BSD 3-Clause - see LICENSE.txt or git.io/sfdc-license + + +/** + * @summary Custom animation with label on input focus + * + * @name animate + * @selector .slds-form-element__control-animated-label + * @restrict .slds-form-element__control + * @variant + */ + +.slds-form-element__control-animated-label { + font-size: .75rem; + + .slds-input { + line-height: 1.5rem; + min-height: calc(1.5rem + (#{$border-width-thin} * 2)); // For IE + } +} + + +.slds-form-element__control.slds-form-element__control-animated-label .slds-form-element__label { + top: 0.25rem; + left: 0; + position: absolute; +} + +.slds-form-element__control.slds-form-element__control-animated-label input:focus ~ label, +.slds-form-element__control.slds-form-element__control-animated-label input.slds-has-value:not(:focus):valid ~ label, +.slds-form-element__control.slds-form-element__control-animated-label input.ng-dirty.ng-not-empty ~ label, +.slds-form-element__control.slds-form-element__control-animated-label input.ng-dirty.ng-not-empty + label, +.slds-form-element__control.slds-form-element__control-animated-label input[cloned='dirty'] + label, +.slds-form-element__control.slds-form-element__control-animated-label input.slds-input[cloned='dirty'] ~ label, +.slds-form-element__control.slds-form-element__control-animated-label input.slds-input.ng-dirty.ng-not-empty.ng-touched[vlc-slds-lookup-control] ~ label, +.slds-form-element__control.slds-form-element__control-animated-label input.ng-touched.ng-not-empty.td-input + label { + -webkit-transform: translate3d(0, -1.2rem, 0); + transform: translate3d(0, -1.2rem, 0); + -webkit-transition-duration: 300ms; + transition-duration: 300ms; + z-index: 0; + top: 0.4rem; + left: 0; + } + + .slds-form-element__control.slds-form-element__control-animated-label input:focus ~ label { + color: $color-border-input-active; + } + + + .slds-form-element__control.slds-input-has-icon.slds-input-has-icon_left.slds-form-element__control-animated-label .slds-form-element__label, + .slds-form-element__control.slds-input-has-icon.slds-input-has-icon_left-right.slds-form-element__control-animated-label .slds-form-element__label { + left: 1.25rem; +} + + +.slds-form-element__control.slds-input-has-icon.slds-input-has-icon_left.slds-form-element__control-animated-label input:focus ~ label, +.slds-form-element__control.slds-input-has-icon.slds-input-has-icon_left-right.slds-form-element__control-animated-label input:focus ~ label, +.slds-form-element__control.slds-input-has-icon.slds-input-has-icon_left.slds-form-element__control-animated-label input:not(:focus):valid ~ label { + left: 0; +} + +.slds-form-element__control.slds-form-element__control-animated-label input[readonly] ~ label { + -webkit-transform: translate3d(0, -1.2rem, 0); + transform: translate3d(0, -1.2rem, 0); + top: 0.4rem; + left: 0; +} diff --git a/ui/components/input/newport/example.jsx b/ui/components/input/animate/example.jsx similarity index 73% rename from ui/components/input/newport/example.jsx rename to ui/components/input/animate/example.jsx index 2e78b63e31..0e9c6bd634 100644 --- a/ui/components/input/newport/example.jsx +++ b/ui/components/input/animate/example.jsx @@ -6,7 +6,7 @@ import SvgIcon from '../../../shared/svg-icon'; import classNames from 'classnames'; import { SpinnerContainer, Spinner } from '../../spinners/base/example'; -let inputId = 'newport-text-input-id-1'; +let inputId = 'text-input-id-1'; /// //////////////////////////////////////// // Partial(s) @@ -29,24 +29,26 @@ export let FormElementLabel = props => ( ); export let FormElementControl = props => ( -
+
{props.children}
); -export let NewportInput = props => { +export let AnimateLabelInput = props => { return ( ); }; @@ -55,39 +57,39 @@ export let NewportInput = props => { // State Constructor(s) /// /////////////////////////////////////////// -let NewportDefault = props => ( +let Default = props => ( - Input Label - + + Input Label ); -let NewportRequired = props => ( +let Required = props => ( - - - * - {' '} - Input Label - - + + + + * + {' '} + Input Label + ); -let NewportErrorState = props => ( +let ErrorState = props => ( - - - * - {' '} - Input Label - - + + + + * + {' '} + Input Label +
This field is required @@ -95,17 +97,17 @@ let NewportErrorState = props => ( ); -let NewportErrorIcon = props => ( +let ErrorIcon = props => ( - - - * - {' '} - Input Label - - + + + + * + {' '} + Input Label +
This field is required @@ -113,20 +115,20 @@ let NewportErrorIcon = props => ( ); -let NewportDisabled = props => ( +let Disabled = props => ( - Input Label - + + Input Label ); -let NewportReadonly = props => ( +let Readonly = props => ( - Input Label - + + Input Label ); @@ -137,47 +139,47 @@ let NewportReadonly = props => ( export default ( - Input Label - + + Input Label ); export let states = [ { - id: 'newport-input-required', + id: 'input-required', label: 'Required', - element: + element: }, { - id: 'newport-input-disabled', + id: 'input-disabled', label: 'Disabled', - element: + element: }, { - id: 'newport-input-error', + id: 'input-error', label: 'Error', - element: + element: }, { - id: 'newport-input-error-icon', + id: 'input-error-icon', label: 'Error with icon', - element: + element: }, { - id: 'newport-read-only', + id: 'read-only', label: 'Readonly', - element: + element: }, { id: 'static', label: 'Static', element: ( - Input Label Read Only + Input Label ) @@ -186,52 +188,51 @@ export let states = [ export let examples = [ { - id: 'newport-left-icon', + id: 'left-icon', label: 'Left Icon', element: ( - Input Label - + + Input Label ) }, { - id: 'newport-right-icon', + id: 'right-icon', label: 'Right Icon', element: ( - Input Label - + + Input Label ) }, { - id: 'newport-double-icon', + id: 'double-icon', label: 'Left & Right Icon', element: ( - Input Label - + + Input Label ) }, { - id: 'newport-double-icon-spinner', + id: 'double-icon-spinner', label: 'Icons with Spinner', element: ( - Input Label - +
+ Input Label ) }, { - id: 'newport-fixed-text', + id: 'fixed-text', label: 'Fixed text', element: ( - Input Label $ - + euro + Input Label ) }, { - id: 'newport-field-level-help', + id: 'field-level-help', label: 'Field level help', element: (
@@ -313,7 +315,7 @@ export let examples = [
+const ListboxDropdown = props => ( > {props.heading ? (
  • - -

    {props.heading}

    + +

    + {props.heading} +

    • ) : null} @@ -59,17 +65,17 @@ const ListboxDropdown = props => selected={props.optionThreeSelected} /> -     ; + +); /* ----------------------------------------------------------------------------- Exports ----------------------------------------------------------------------------- */ // Demo wrapper -export const Context = props => -
    - {props.children} -
    ; +export const Context = props => ( +
    {props.children}
    +); // Default export default ( @@ -77,7 +83,7 @@ export default ( className="slds-combobox-picklist" containerClassName="slds-size_small" inputIcon="right" - inputIconRightSymbol="down" + inputIconRightSymbol="chevrondown" listbox={} readonly /> @@ -88,15 +94,16 @@ export let states = [ { id: 'focused', label: 'Focused', - element: + element: ( } readonly - />, + /> + ), script: ` document.getElementById('combobox-unique-id').focus() ` @@ -104,103 +111,105 @@ export let states = [ { id: 'open-item-focused', label: 'Open - Item Focused', - element: + element: ( } aria-activedescendant={listboxOptionId01} readonly /> + ) }, { id: 'open-option-selected', label: 'Open - Option Selected', - element: + element: ( } readonly /> + ) }, { id: 'open-options-selected', label: 'Open - Options Selected', - element: + element: ( - } + listbox={} readonly /> + ) }, { id: 'closed-option-selected', label: 'Closed - Option Selected', - element: + element: ( } readonly /> + ) }, { id: 'closed-options-selected', label: 'Closed - Options Selected', - element: + element: ( - } + listbox={} readonly > - - - - - - - - - + + + + + + + + + + ) }, { id: 'group-heading', label: 'Group heading label', - element: + element: ( } readonly /> + ) } ]; diff --git a/ui/components/publishers/base/_index.scss b/ui/components/publishers/base/_index.scss index f26c8291c4..5f9a21452d 100644 --- a/ui/components/publishers/base/_index.scss +++ b/ui/components/publishers/base/_index.scss @@ -62,7 +62,7 @@ */ &__input { line-height: $line-height-button; - padding: 0 $spacing-medium; + padding: 0 $spacing-medium 0 0; resize: none; min-height: calc(#{$line-height-button} + 2px); max-height: calc(#{$line-height-button} + 2px); diff --git a/ui/components/select/base/_index.scss b/ui/components/select/base/_index.scss index 12fa8c22a9..132442b571 100644 --- a/ui/components/select/base/_index.scss +++ b/ui/components/select/base/_index.scss @@ -18,12 +18,16 @@ &[multiple] { min-height: calc(#{$height-input} + (#{$border-width-thin} * 2)); height: inherit; + } - option { - padding: $spacing-x-small; - } + &[size] option { + padding: $spacing-x-small; + } + &[multiple] option { + padding: $spacing-x-small 0; } + /** * Initializes select container for custom styling * @@ -39,11 +43,6 @@ // stylelint-disable property-no-vendor-prefix -moz-appearance: none; -webkit-appearance: none; - // stylelint-enable property-no-vendor-prefix - padding: { - #{$left}: $spacing-x-small; - #{$right}: $spacing-large; - } &::-ms-expand { display: none; @@ -58,18 +57,24 @@ #{$right}: $spacing-x-small; width: 0; height: 0; - border-#{$left}: 3px solid transparent; - border-#{$right}: 3px solid transparent; + border-#{$left}: 9px solid transparent; + border-#{$right}: 9px solid transparent; + border-radius: $border-radius-medium; + } + + &:after { + border-top: 8px solid $color-background-inverse; + bottom: calc((#{$line-height-button-small} / 2) - 4px); } &:before { - border-bottom: 5px solid $color-background-inverse; - top: calc((#{$line-height-button-small} / 2) - 6px); + border-top: 8px solid white; + bottom: calc((#{$line-height-button-small} / 2) - 1.5px); + z-index: 1; } - &:after { - border-top: 5px solid $color-background-inverse; - bottom: calc((#{$line-height-button-small} / 2) - 6px); + &[disabled]:before { + border-top-color: $color-background-input-disabled; } } } diff --git a/ui/components/textarea/animate/_index.scss b/ui/components/textarea/animate/_index.scss new file mode 100644 index 0000000000..3765f629a1 --- /dev/null +++ b/ui/components/textarea/animate/_index.scss @@ -0,0 +1,39 @@ +// Copyright (c) 2015-present, salesforce.com, inc. All rights reserved +// Licensed under BSD 3-Clause - see LICENSE.txt or git.io/sfdc-license + + +/** + * @summary Custom animation with label on textarea focus + * + * @name animate + * @selector .slds-form-element__control-animated-label + * @restrict .slds-textarea + * @variant + */ + +.slds-form-element__control-animated-label { + font-size: .75rem; +} + +.slds-form-element__control.slds-form-element__control-animated-label .slds-form-element__label { + top: 0.25rem; + left: 0; + position: absolute; +} + +.slds-form-element__control.slds-form-element__control-animated-label textarea:focus~label, +.slds-form-element__control.slds-form-element__control-animated-label textarea.slds-has-value:not(:focus):valid ~ label, +.slds-form-element__control.slds-form-element__control-animated-label textarea.ng-not-empty.ng-dirty~label, +.slds-form-element__control.slds-form-element__control-animated-label textarea[cloned=dirty]+label { + -webkit-transform: translate3d(0,-1.2rem,0); + transform: translate3d(0,-1.2rem,0); + -webkit-transition-duration: 300ms; + transition-duration: 300ms; + z-index: 0; + top: 0.6rem; + left: 0; + } + + .slds-form-element__control.slds-form-element__control-animated-label textarea:focus ~ label { + color: $color-border-input-active; + } diff --git a/ui/components/textarea/animate/example.jsx b/ui/components/textarea/animate/example.jsx new file mode 100644 index 0000000000..3681385f08 --- /dev/null +++ b/ui/components/textarea/animate/example.jsx @@ -0,0 +1,130 @@ +// Copyright (c) 2015-present, salesforce.com, inc. All rights reserved +// Licensed under BSD 3-Clause - see LICENSE.txt or git.io/sfdc-license + +import React from 'react'; +import classNames from 'classnames'; + +const textareaId = 'textarea-id-01'; + +/// //////////////////////////////////////// +// Partial(s) +/// //////////////////////////////////////// + +export let FormElement = props => ( +
    + {props.children} +
    +); + +export let FormElementLabel = props => ( + +); + +export let FormElementControl = props => ( +
    + {props.children} +
    +); + +export let AnimatedTextarea = props => ( +