diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 7705393d..ad88a73a 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -4,20 +4,16 @@ * For details, see http://www.apache.org/licenses/LICENSE-2.0. */ @font-face { - font-family: 'Montserrat-Regular'; - src: url('../fonts/Montserrat/Montserrat-Regular.ttf'); + font-family: 'Lato-Regular'; + src: url('../fonts/Lato/Lato-Regular.ttf'); } @font-face { - font-family: 'Montserrat-Bold'; - src: url('../fonts/Montserrat/Montserrat-Bold.ttf'); + font-family: 'Lato-Black'; + src: url('../fonts/Lato/Lato-Black.ttf'); } @font-face { - font-family: 'Montserrat-Medium'; - src: url('../fonts/Montserrat/Montserrat-Medium.ttf'); -} -@font-face { - font-family: 'Montserrat-Light'; - src: url('../fonts/Montserrat/Montserrat-Light.ttf'); + font-family: 'Lato-Light'; + src: url('../fonts/Lato/Lato-Light.ttf'); } body, html { @@ -32,8 +28,8 @@ h3, h4, h5, h6 { - font-family: 'Montserrat-Regular', sans-serif; - font-weight: 700; + font-family: 'Lato-Regular', sans-serif; + font-weight: 300; } /*blue light #5A74AF*/ /*blue dark #29427A*/ @@ -128,6 +124,10 @@ h6 { .navbar-transparent .navbar-nav>li>a:hover { color: #fff; } +.navbar-transparent .navbar-nav>li>a:focus, .navbar-transparent .navbar-nav>li>a:hover { + color: #fff; + background-color: transparent; +} .navbar-default .btn-link { box-shadow: none; } @@ -263,7 +263,7 @@ h6 { margin: 0; font-weight: 400; font-size: 6em; - font-family: 'Montserrat-Medium'; + font-family: 'Lato-Black'; } .intro-divider { @@ -274,7 +274,7 @@ h6 { .intro-message > h3 { font-weight: 300; - font-family: 'Montserrat-Light'; + font-family: 'Lato-Light'; } .intro-pricing{ @@ -327,7 +327,7 @@ h6 { margin-bottom: 25px; } .split-section .split-text .split-title h2{ - font-family: 'Montserrat-Bold'; + font-family: 'Lato-Black'; font-size: 50px; line-height: 50px; padding-bottom: 25px; @@ -405,10 +405,10 @@ h6 { } .pricing-section .card .title{ padding: 15px 40px; - font-family: 'Montserrat-Medium'; + font-family: 'Lato-Black'; } .pricing-section .card .title h3{ - font-family: 'Montserrat-Medium'; + font-family: 'Lato-Black'; } .pricing-section .card .price{ background: #5A74AF; @@ -433,7 +433,7 @@ h6 { text-align: left; } .pricing-section .text .section-heading{ - font-family: 'Montserrat-Bold'; + font-family: 'Lato-Black'; font-size: 50px; line-height: 50px; padding-bottom: 25px; @@ -460,7 +460,7 @@ h6 { padding: 70px 0; } .request-section .title h2{ - font-family: 'Montserrat-Bold'; + font-family: 'Lato-Black'; font-size: 45px; margin: 0; color: #fff; @@ -536,7 +536,7 @@ h6 { .contact-section .card .subtitle h3{ font-size: 30px; margin-bottom: 23px; - font-family: 'Montserrat-Medium'; + font-family: 'Lato-Black'; } .contact-section .card .social a:hover{ text-decoration: none; @@ -547,7 +547,7 @@ h6 { max-width: 468px; } .contact-section .title h2{ - font-family: 'Montserrat-Bold'; + font-family: 'Lato-Black'; font-size: 65px; margin: 0; color: #fff; @@ -577,7 +577,7 @@ h6 { width: 50%; } .price-calc-section .text .section-heading{ - font-family: 'Montserrat-Bold'; + font-family: 'Lato-Black'; font-size: 48px; line-height: 48px; padding-bottom: 25px; @@ -620,10 +620,10 @@ h6 { } .price-calc-section .card .title{ padding: 15px 40px; - font-family: 'Montserrat-Medium'; + font-family: 'Lato-Black'; } .price-calc-section .card .title h3{ - font-family: 'Montserrat-Medium'; + font-family: 'Lato-Black'; } .price-calc-section .card .price{ background: #5A74AF; @@ -771,6 +771,29 @@ h6 { border: 1px solid rgba(119, 119, 119, 0.4); box-shadow: none; } + + .navbar-default .nav-language .drop-language { + background: #fff; + /* border: 1px solid #fff; */ + z-index: 100000; + left: 9px; + border: 1px solid rgba(119, 119, 119, 0.4); + box-shadow: none; + } + .navbar-default .nav-language .select-language { + color: #777; + } + .navbar-default .nav-language .drop-language a { + color: #777; + } + .navbar-transparent .navbar-nav>li>a:focus, .navbar-transparent .navbar-nav>li>a:hover { + color: #333; + background-color: transparent; + } + .navbar-default .navbar-nav>li>a:focus, .navbar-default .navbar-nav>li>a:hover { + color: #333; + background-color: transparent; + } .split-section { padding: 10px 0; } @@ -828,7 +851,7 @@ h6 { margin-top: 20px; } .price-calc-section .text .section-heading { - font-family: 'Montserrat-Bold'; + font-family: 'Lato-Black'; font-size: 35px; line-height: 35px; padding-bottom: 15px; @@ -842,6 +865,8 @@ h6 { font-size: 18px; text-align: center; } + + } @media(max-width:540px) { @@ -887,7 +912,7 @@ h6 { .section-heading { margin-bottom: 30px; - font-family: 'Montserrat-Medium'; + font-family: 'Lato-Black'; } .section-heading-spacer { diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Black.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Black.ttf new file mode 100755 index 00000000..6848db0d Binary files /dev/null and b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Black.ttf differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-BlackItalic.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-BlackItalic.ttf new file mode 100755 index 00000000..5decf129 Binary files /dev/null and b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-BlackItalic.ttf differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Bold.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Bold.ttf new file mode 100755 index 00000000..74343694 Binary files /dev/null and b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Bold.ttf differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-BoldItalic.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-BoldItalic.ttf new file mode 100755 index 00000000..684aacf5 Binary files /dev/null and b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-BoldItalic.ttf differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Hairline.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Hairline.ttf new file mode 100755 index 00000000..288be295 Binary files /dev/null and b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Hairline.ttf differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-HairlineItalic.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-HairlineItalic.ttf new file mode 100755 index 00000000..c2bfd335 Binary files /dev/null and b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-HairlineItalic.ttf differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Italic.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Italic.ttf new file mode 100755 index 00000000..3d3b7a29 Binary files /dev/null and b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Italic.ttf differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Light.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Light.ttf new file mode 100755 index 00000000..a958067a Binary files /dev/null and b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Light.ttf differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-LightItalic.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-LightItalic.ttf new file mode 100755 index 00000000..5e45ad9a Binary files /dev/null and b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-LightItalic.ttf differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Regular.ttf b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Regular.ttf new file mode 100755 index 00000000..04ea8efb Binary files /dev/null and b/datacenterlight/static/datacenterlight/fonts/Lato/Lato-Regular.ttf differ diff --git a/datacenterlight/static/datacenterlight/fonts/Lato/OFL.txt b/datacenterlight/static/datacenterlight/fonts/Lato/OFL.txt new file mode 100755 index 00000000..f8ca7bc3 --- /dev/null +++ b/datacenterlight/static/datacenterlight/fonts/Lato/OFL.txt @@ -0,0 +1,92 @@ +Copyright (c) 2010-2014 by tyPoland Lukasz Dziedzic (team@latofonts.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/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css index 269b687f..c7f85b72 100644 --- a/hosting/static/hosting/css/landing-page.css +++ b/hosting/static/hosting/css/landing-page.css @@ -4,22 +4,20 @@ * For details, see http://www.apache.org/licenses/LICENSE-2.0. */ + @font-face { - font-family: 'Montserrat-Regular'; - src: url('../fonts/Montserrat/Montserrat-Regular.ttf'); + font-family: 'Lato-Regular'; + src: url('../fonts/Lato/Lato-Regular.ttf'); } @font-face { - font-family: 'Montserrat-Bold'; - src: url('../fonts/Montserrat/Montserrat-Bold.ttf'); + font-family: 'Lato-Black'; + src: url('../fonts/Lato/Lato-Black.ttf'); } @font-face { - font-family: 'Montserrat-Medium'; - src: url('../fonts/Montserrat/Montserrat-Medium.ttf'); -} -@font-face { - font-family: 'Montserrat-Light'; - src: url('../fonts/Montserrat/Montserrat-Light.ttf'); + font-family: 'Lato-Light'; + src: url('../fonts/Lato/Lato-Light.ttf'); } + body, html { width: 100%; @@ -33,8 +31,8 @@ h3, h4, h5, h6 { - font-family: 'Montserrat-Regular', sans-serif; - font-weight: 700; + font-family: 'Lato-Regular', sans-serif; + font-weight: 300; } .topnav { font-size: 14px; @@ -229,15 +227,21 @@ h6 { width: 100%; margin: 0 auto; max-width: 390px; - margin-top: 60px; - } +.auth-container .auth-center{ + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%,-50%); + width: 100%; +} + .auth-container .auth-title{ - margin-top: 40px; + margin-bottom: 50px; } .auth-container .auth-title h2{ color: #fff; - font-family: 'Montserrat-Bold'; + font-family: 'Lato-Black'; font-size: 44px; text-align: center; width: 425px; @@ -276,7 +280,7 @@ h6 { font-size: 20px; border-radius: 3px 3px 0px 0px; margin: 0 auto; - font-family: 'Montserrat-Medium'; + font-family: 'Lato-Black'; } .auth-box .form{ padding: 20px; @@ -347,6 +351,11 @@ h6 { width: 90%; margin-bottom: 50px; } + .auth-container.auth-signup .auth-title h2{ + font-size: 20px; + width: 90%; + margin-bottom: 50px; + } .auth-box .form { padding: 15px; width: 90%; diff --git a/hosting/static/hosting/fonts/Lato/Lato-Black.ttf b/hosting/static/hosting/fonts/Lato/Lato-Black.ttf new file mode 100755 index 00000000..6848db0d Binary files /dev/null and b/hosting/static/hosting/fonts/Lato/Lato-Black.ttf differ diff --git a/hosting/static/hosting/fonts/Lato/Lato-BlackItalic.ttf b/hosting/static/hosting/fonts/Lato/Lato-BlackItalic.ttf new file mode 100755 index 00000000..5decf129 Binary files /dev/null and b/hosting/static/hosting/fonts/Lato/Lato-BlackItalic.ttf differ diff --git a/hosting/static/hosting/fonts/Lato/Lato-Bold.ttf b/hosting/static/hosting/fonts/Lato/Lato-Bold.ttf new file mode 100755 index 00000000..74343694 Binary files /dev/null and b/hosting/static/hosting/fonts/Lato/Lato-Bold.ttf differ diff --git a/hosting/static/hosting/fonts/Lato/Lato-BoldItalic.ttf b/hosting/static/hosting/fonts/Lato/Lato-BoldItalic.ttf new file mode 100755 index 00000000..684aacf5 Binary files /dev/null and b/hosting/static/hosting/fonts/Lato/Lato-BoldItalic.ttf differ diff --git a/hosting/static/hosting/fonts/Lato/Lato-Hairline.ttf b/hosting/static/hosting/fonts/Lato/Lato-Hairline.ttf new file mode 100755 index 00000000..288be295 Binary files /dev/null and b/hosting/static/hosting/fonts/Lato/Lato-Hairline.ttf differ diff --git a/hosting/static/hosting/fonts/Lato/Lato-HairlineItalic.ttf b/hosting/static/hosting/fonts/Lato/Lato-HairlineItalic.ttf new file mode 100755 index 00000000..c2bfd335 Binary files /dev/null and b/hosting/static/hosting/fonts/Lato/Lato-HairlineItalic.ttf differ diff --git a/hosting/static/hosting/fonts/Lato/Lato-Italic.ttf b/hosting/static/hosting/fonts/Lato/Lato-Italic.ttf new file mode 100755 index 00000000..3d3b7a29 Binary files /dev/null and b/hosting/static/hosting/fonts/Lato/Lato-Italic.ttf differ diff --git a/hosting/static/hosting/fonts/Lato/Lato-Light.ttf b/hosting/static/hosting/fonts/Lato/Lato-Light.ttf new file mode 100755 index 00000000..a958067a Binary files /dev/null and b/hosting/static/hosting/fonts/Lato/Lato-Light.ttf differ diff --git a/hosting/static/hosting/fonts/Lato/Lato-LightItalic.ttf b/hosting/static/hosting/fonts/Lato/Lato-LightItalic.ttf new file mode 100755 index 00000000..5e45ad9a Binary files /dev/null and b/hosting/static/hosting/fonts/Lato/Lato-LightItalic.ttf differ diff --git a/hosting/static/hosting/fonts/Lato/Lato-Regular.ttf b/hosting/static/hosting/fonts/Lato/Lato-Regular.ttf new file mode 100755 index 00000000..04ea8efb Binary files /dev/null and b/hosting/static/hosting/fonts/Lato/Lato-Regular.ttf differ diff --git a/hosting/static/hosting/fonts/Lato/OFL.txt b/hosting/static/hosting/fonts/Lato/OFL.txt new file mode 100755 index 00000000..f8ca7bc3 --- /dev/null +++ b/hosting/static/hosting/fonts/Lato/OFL.txt @@ -0,0 +1,92 @@ +Copyright (c) 2010-2014 by tyPoland Lukasz Dziedzic (team@latofonts.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/hosting/templates/hosting/login.html b/hosting/templates/hosting/login.html index 49f6f75f..9749b280 100644 --- a/hosting/templates/hosting/login.html +++ b/hosting/templates/hosting/login.html @@ -5,6 +5,9 @@
+ +
+

{% trans "Your VM hosted in Switzerland"%}

@@ -54,6 +57,7 @@
+ diff --git a/hosting/templates/hosting/reset_password.html b/hosting/templates/hosting/reset_password.html index 7f21f79d..1590a5bd 100644 --- a/hosting/templates/hosting/reset_password.html +++ b/hosting/templates/hosting/reset_password.html @@ -5,29 +5,31 @@ {% block content %}
-
-

{% trans "Your VM hosted in Switzerland"%}

-
-
-