diff --git a/VirtoCommerce.Platform.Web/App_Start/BundleConfig.cs b/VirtoCommerce.Platform.Web/App_Start/BundleConfig.cs index 8cb9da69d88..9d94e5b74d8 100644 --- a/VirtoCommerce.Platform.Web/App_Start/BundleConfig.cs +++ b/VirtoCommerce.Platform.Web/App_Start/BundleConfig.cs @@ -31,6 +31,7 @@ public static void RegisterBundles(BundleCollection bundles) //Theme UI "~/Content/themes/main/css/reset.css", "~/Content/themes/main/css/font-awesome.css", + "~/Content/themes/main/css/google-fonts.css", "~/Content/themes/main/css/base-modules.css", "~/Content/themes/main/css/lang-rtl.css", "~/Content/themes/main/css/project-modules.css", diff --git a/VirtoCommerce.Platform.Web/Content/themes/main/css/google-fonts.css b/VirtoCommerce.Platform.Web/Content/themes/main/css/google-fonts.css new file mode 100644 index 00000000000..23f65b1e5a4 --- /dev/null +++ b/VirtoCommerce.Platform.Web/Content/themes/main/css/google-fonts.css @@ -0,0 +1,70 @@ +@font-face { + font-family: 'Exo 2'; + font-weight: 300; + font-style: normal; + src: url('../fonts/Exo-2-300/Exo-2-300.eot'); + src: url('../fonts/Exo-2-300/Exo-2-300.eot?#iefix') format('embedded-opentype'), + local('Exo 2 Light'), + local('Exo-2-300'), + url('../fonts/Exo-2-300/Exo-2-300.woff2') format('woff2'), + url('../fonts/Exo-2-300/Exo-2-300.woff') format('woff'), + url('../fonts/Exo-2-300/Exo-2-300.ttf') format('truetype'), + url('../fonts/Exo-2-300/Exo-2-300.svg#Exo2') format('svg'); +} + +@font-face { + font-family: 'Exo 2'; + font-weight: 400; + font-style: normal; + src: url('../fonts/Exo-2-regular/Exo-2-regular.eot'); + src: url('../fonts/Exo-2-regular/Exo-2-regular.eot?#iefix') format('embedded-opentype'), + local('Exo 2'), + local('Exo-2-regular'), + url('../fonts/Exo-2-regular/Exo-2-regular.woff2') format('woff2'), + url('../fonts/Exo-2-regular/Exo-2-regular.woff') format('woff'), + url('../fonts/Exo-2-regular/Exo-2-regular.ttf') format('truetype'), + url('../fonts/Exo-2-regular/Exo-2-regular.svg#Exo2') format('svg'); +} + +@font-face { + font-family: 'Exo 2'; + font-weight: 500; + font-style: normal; + src: url('../fonts/Exo-2-500/Exo-2-500.eot'); + src: url('../fonts/Exo-2-500/Exo-2-500.eot?#iefix') format('embedded-opentype'), + local('Exo 2 Medium'), + local('Exo-2-500'), + url('../fonts/Exo-2-500/Exo-2-500.woff2') format('woff2'), + url('../fonts/Exo-2-500/Exo-2-500.woff') format('woff'), + url('../fonts/Exo-2-500/Exo-2-500.ttf') format('truetype'), + url('../fonts/Exo-2-500/Exo-2-500.svg#Exo2') format('svg'); +} + +@font-face { + font-family: 'Exo 2'; + font-weight: 600; + font-style: normal; + src: url('../fonts/Exo-2-600/Exo-2-600.eot'); + src: url('../fonts/Exo-2-600/Exo-2-600.eot?#iefix') format('embedded-opentype'), + local('Exo 2 Semi Bold'), + local('Exo-2-600'), + url('../fonts/Exo-2-600/Exo-2-600.woff2') format('woff2'), + url('../fonts/Exo-2-600/Exo-2-600.woff') format('woff'), + url('../fonts/Exo-2-600/Exo-2-600.ttf') format('truetype'), + url('../fonts/Exo-2-600/Exo-2-600.svg#Exo2') format('svg'); +} + +@font-face { + font-family: 'Exo 2'; + font-weight: 400; + font-style: italic; + src: url('../fonts/Exo-2-italic/Exo-2-italic.eot'); + src: url('../fonts/Exo-2-italic/Exo-2-italic.eot?#iefix') format('embedded-opentype'), + local('Exo 2 Italic'), + local('Exo-2-italic'), + url('../fonts/Exo-2-italic/Exo-2-italic.woff2') format('woff2'), + url('../fonts/Exo-2-italic/Exo-2-italic.woff') format('woff'), + url('../fonts/Exo-2-italic/Exo-2-italic.ttf') format('truetype'), + url('../fonts/Exo-2-italic/Exo-2-italic.svg#Exo2') format('svg'); +} + diff --git a/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-300/Exo-2-300.eot b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-300/Exo-2-300.eot new file mode 100644 index 00000000000..e93b9a1fbb4 Binary files /dev/null and b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-300/Exo-2-300.eot differ diff --git a/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-300/Exo-2-300.svg b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-300/Exo-2-300.svg new file mode 100644 index 00000000000..d8bf8fd1fb6 --- /dev/null +++ b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-300/Exo-2-300.svg @@ -0,0 +1,318 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-300/Exo-2-300.ttf b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-300/Exo-2-300.ttf new file mode 100644 index 00000000000..f46b86032a6 Binary files /dev/null and b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-300/Exo-2-300.ttf differ diff --git a/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-300/Exo-2-300.woff b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-300/Exo-2-300.woff new file mode 100644 index 00000000000..80609cc3f5e Binary files /dev/null and b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-300/Exo-2-300.woff differ diff --git a/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-300/Exo-2-300.woff2 b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-300/Exo-2-300.woff2 new file mode 100644 index 00000000000..35fb8280ff6 Binary files /dev/null and b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-300/Exo-2-300.woff2 differ diff --git a/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-300/LICENSE.txt b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-300/LICENSE.txt new file mode 100644 index 00000000000..4d5027dfda4 --- /dev/null +++ b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-300/LICENSE.txt @@ -0,0 +1,93 @@ +Copyright (c) 2013, Natanael Gama (www.ndiscovered.com . info(at)ndiscovered.com), with Reserved Font Name 'Exo' + +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/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-500/Exo-2-500.eot b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-500/Exo-2-500.eot new file mode 100644 index 00000000000..f21f01d7518 Binary files /dev/null and b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-500/Exo-2-500.eot differ diff --git a/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-500/Exo-2-500.svg b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-500/Exo-2-500.svg new file mode 100644 index 00000000000..ea6f1e442c2 --- /dev/null +++ b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-500/Exo-2-500.svg @@ -0,0 +1,323 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-500/Exo-2-500.ttf b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-500/Exo-2-500.ttf new file mode 100644 index 00000000000..2c42e0ba027 Binary files /dev/null and b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-500/Exo-2-500.ttf differ diff --git a/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-500/Exo-2-500.woff b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-500/Exo-2-500.woff new file mode 100644 index 00000000000..d19d6e5b2a9 Binary files /dev/null and b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-500/Exo-2-500.woff differ diff --git a/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-500/Exo-2-500.woff2 b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-500/Exo-2-500.woff2 new file mode 100644 index 00000000000..7158b8f6edf Binary files /dev/null and b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-500/Exo-2-500.woff2 differ diff --git a/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-500/LICENSE.txt b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-500/LICENSE.txt new file mode 100644 index 00000000000..4d5027dfda4 --- /dev/null +++ b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-500/LICENSE.txt @@ -0,0 +1,93 @@ +Copyright (c) 2013, Natanael Gama (www.ndiscovered.com . info(at)ndiscovered.com), with Reserved Font Name 'Exo' + +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/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-600/Exo-2-600.eot b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-600/Exo-2-600.eot new file mode 100644 index 00000000000..4b6325e469c Binary files /dev/null and b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-600/Exo-2-600.eot differ diff --git a/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-600/Exo-2-600.svg b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-600/Exo-2-600.svg new file mode 100644 index 00000000000..b164006c0d0 --- /dev/null +++ b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-600/Exo-2-600.svg @@ -0,0 +1,321 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-600/Exo-2-600.ttf b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-600/Exo-2-600.ttf new file mode 100644 index 00000000000..2cd95ebae57 Binary files /dev/null and b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-600/Exo-2-600.ttf differ diff --git a/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-600/Exo-2-600.woff b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-600/Exo-2-600.woff new file mode 100644 index 00000000000..52bc921065d Binary files /dev/null and b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-600/Exo-2-600.woff differ diff --git a/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-600/Exo-2-600.woff2 b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-600/Exo-2-600.woff2 new file mode 100644 index 00000000000..962da1ca701 Binary files /dev/null and b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-600/Exo-2-600.woff2 differ diff --git a/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-600/LICENSE.txt b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-600/LICENSE.txt new file mode 100644 index 00000000000..4d5027dfda4 --- /dev/null +++ b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-600/LICENSE.txt @@ -0,0 +1,93 @@ +Copyright (c) 2013, Natanael Gama (www.ndiscovered.com . info(at)ndiscovered.com), with Reserved Font Name 'Exo' + +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/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-italic/Exo-2-italic.eot b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-italic/Exo-2-italic.eot new file mode 100644 index 00000000000..d6ac6072716 Binary files /dev/null and b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-italic/Exo-2-italic.eot differ diff --git a/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-italic/Exo-2-italic.svg b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-italic/Exo-2-italic.svg new file mode 100644 index 00000000000..c77159c4c64 --- /dev/null +++ b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-italic/Exo-2-italic.svg @@ -0,0 +1,330 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-italic/Exo-2-italic.ttf b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-italic/Exo-2-italic.ttf new file mode 100644 index 00000000000..89461e3fd67 Binary files /dev/null and b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-italic/Exo-2-italic.ttf differ diff --git a/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-italic/Exo-2-italic.woff b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-italic/Exo-2-italic.woff new file mode 100644 index 00000000000..7de4afb2375 Binary files /dev/null and b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-italic/Exo-2-italic.woff differ diff --git a/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-italic/Exo-2-italic.woff2 b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-italic/Exo-2-italic.woff2 new file mode 100644 index 00000000000..20515589e0c Binary files /dev/null and b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-italic/Exo-2-italic.woff2 differ diff --git a/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-italic/LICENSE.txt b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-italic/LICENSE.txt new file mode 100644 index 00000000000..4d5027dfda4 --- /dev/null +++ b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-italic/LICENSE.txt @@ -0,0 +1,93 @@ +Copyright (c) 2013, Natanael Gama (www.ndiscovered.com . info(at)ndiscovered.com), with Reserved Font Name 'Exo' + +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/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-regular/Exo-2-regular.eot b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-regular/Exo-2-regular.eot new file mode 100644 index 00000000000..20b381e4c48 Binary files /dev/null and b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-regular/Exo-2-regular.eot differ diff --git a/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-regular/Exo-2-regular.svg b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-regular/Exo-2-regular.svg new file mode 100644 index 00000000000..3027fdad040 --- /dev/null +++ b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-regular/Exo-2-regular.svg @@ -0,0 +1,319 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-regular/Exo-2-regular.ttf b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-regular/Exo-2-regular.ttf new file mode 100644 index 00000000000..3953ab5f831 Binary files /dev/null and b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-regular/Exo-2-regular.ttf differ diff --git a/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-regular/Exo-2-regular.woff b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-regular/Exo-2-regular.woff new file mode 100644 index 00000000000..e635c84b7f4 Binary files /dev/null and b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-regular/Exo-2-regular.woff differ diff --git a/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-regular/Exo-2-regular.woff2 b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-regular/Exo-2-regular.woff2 new file mode 100644 index 00000000000..ed9c8fb3315 Binary files /dev/null and b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-regular/Exo-2-regular.woff2 differ diff --git a/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-regular/LICENSE.txt b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-regular/LICENSE.txt new file mode 100644 index 00000000000..4d5027dfda4 --- /dev/null +++ b/VirtoCommerce.Platform.Web/Content/themes/main/fonts/Exo-2-regular/LICENSE.txt @@ -0,0 +1,93 @@ +Copyright (c) 2013, Natanael Gama (www.ndiscovered.com . info(at)ndiscovered.com), with Reserved Font Name 'Exo' + +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/VirtoCommerce.Platform.Web/Modularity/ExternalManifestModuleCatalog.cs b/VirtoCommerce.Platform.Web/Modularity/ExternalManifestModuleCatalog.cs index 99dc74aa0f3..94efa4d5816 100644 --- a/VirtoCommerce.Platform.Web/Modularity/ExternalManifestModuleCatalog.cs +++ b/VirtoCommerce.Platform.Web/Modularity/ExternalManifestModuleCatalog.cs @@ -50,12 +50,12 @@ protected override void InnerLoad() } } } + } - // Add already installed module not presenting in external modules list - foreach (var installedModuleNotFoundInExternal in _installedModules.Except(Modules)) - { - AddModule(installedModuleNotFoundInExternal); - } + // Add already installed module not presenting in external modules list + foreach (var installedModuleNotFoundInExternal in _installedModules.Except(Modules)) + { + AddModule(installedModuleNotFoundInExternal); } } } diff --git a/VirtoCommerce.Platform.Web/Scripts/app/modularity/blades/modules-main.js b/VirtoCommerce.Platform.Web/Scripts/app/modularity/blades/modules-main.js index 258dd9a83ef..9e81c0b7a4c 100644 --- a/VirtoCommerce.Platform.Web/Scripts/app/modularity/blades/modules-main.js +++ b/VirtoCommerce.Platform.Web/Scripts/app/modularity/blades/modules-main.js @@ -5,8 +5,7 @@ $scope.selectedNodeId = null; blade.reload = function () { - modules.reload(); - blade.refresh(); + modules.reload().$promise.then(blade.refresh); }; blade.refresh = function () { diff --git a/VirtoCommerce.Platform.Web/Views/Shared/_Layout.cshtml b/VirtoCommerce.Platform.Web/Views/Shared/_Layout.cshtml index 85a65449dc2..c86cca36ce1 100644 --- a/VirtoCommerce.Platform.Web/Views/Shared/_Layout.cshtml +++ b/VirtoCommerce.Platform.Web/Views/Shared/_Layout.cshtml @@ -7,8 +7,6 @@ - - @{var google_tag_container_id = System.Configuration.ConfigurationManager.AppSettings["GoogleTagManager:ContainerId"];} @if(google_tag_container_id != null) { @@ -35,13 +33,13 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= @if(google_tag_container_id != null) { - + } - @RenderBody() + @RenderBody() @Scripts.Render(Startup.VirtualRoot + "/scripts/angular") @Scripts.Render(Startup.VirtualRoot + "/scripts/modules") diff --git a/VirtoCommerce.Platform.Web/VirtoCommerce.Platform.Web.csproj b/VirtoCommerce.Platform.Web/VirtoCommerce.Platform.Web.csproj index 9a16237146e..ba2d3b6699a 100644 --- a/VirtoCommerce.Platform.Web/VirtoCommerce.Platform.Web.csproj +++ b/VirtoCommerce.Platform.Web/VirtoCommerce.Platform.Web.csproj @@ -372,6 +372,17 @@ + + + + + + + + + + + @@ -470,6 +481,26 @@ PreserveNewest + + + + + + + + + + + + + + + + + + + +