diff --git a/datacenterlight/templates/datacenterlight/pricing.html b/datacenterlight/templates/datacenterlight/pricing.html index 71fe13f6..d4360f16 100644 --- a/datacenterlight/templates/datacenterlight/pricing.html +++ b/datacenterlight/templates/datacenterlight/pricing.html @@ -128,7 +128,7 @@
- 2 GiB RAM + 2 GB RAM
diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css index 166a8241..84650ab4 100644 --- a/hosting/static/hosting/css/landing-page.css +++ b/hosting/static/hosting/css/landing-page.css @@ -4,6 +4,22 @@ * 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-face { + font-family: 'Montserrat-Bold'; + src: url('../fonts/Montserrat/Montserrat-Bold.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'); +} body, html { width: 100%; @@ -17,10 +33,9 @@ h3, h4, h5, h6 { - font-family: 'Raleway', "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: 'Montserrat-Regular', sans-serif; font-weight: 700; } - .topnav { font-size: 14px; } diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-Black.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-Black.ttf new file mode 100755 index 00000000..bf5443c5 Binary files /dev/null and b/hosting/static/hosting/fonts/Montserrat/Montserrat-Black.ttf differ diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-BlackItalic.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-BlackItalic.ttf new file mode 100755 index 00000000..3eee3a76 Binary files /dev/null and b/hosting/static/hosting/fonts/Montserrat/Montserrat-BlackItalic.ttf differ diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-Bold.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-Bold.ttf new file mode 100755 index 00000000..8e9a5f3f Binary files /dev/null and b/hosting/static/hosting/fonts/Montserrat/Montserrat-Bold.ttf differ diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-BoldItalic.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-BoldItalic.ttf new file mode 100755 index 00000000..2c336300 Binary files /dev/null and b/hosting/static/hosting/fonts/Montserrat/Montserrat-BoldItalic.ttf differ diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-ExtraBold.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-ExtraBold.ttf new file mode 100755 index 00000000..1e3692d6 Binary files /dev/null and b/hosting/static/hosting/fonts/Montserrat/Montserrat-ExtraBold.ttf differ diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-ExtraBoldItalic.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-ExtraBoldItalic.ttf new file mode 100755 index 00000000..5f6c3824 Binary files /dev/null and b/hosting/static/hosting/fonts/Montserrat/Montserrat-ExtraBoldItalic.ttf differ diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-ExtraLight.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-ExtraLight.ttf new file mode 100755 index 00000000..7490dc73 Binary files /dev/null and b/hosting/static/hosting/fonts/Montserrat/Montserrat-ExtraLight.ttf differ diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-ExtraLightItalic.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-ExtraLightItalic.ttf new file mode 100755 index 00000000..24e13547 Binary files /dev/null and b/hosting/static/hosting/fonts/Montserrat/Montserrat-ExtraLightItalic.ttf differ diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-Italic.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-Italic.ttf new file mode 100755 index 00000000..c5a36e58 Binary files /dev/null and b/hosting/static/hosting/fonts/Montserrat/Montserrat-Italic.ttf differ diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-Light.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-Light.ttf new file mode 100755 index 00000000..e66dc5bf Binary files /dev/null and b/hosting/static/hosting/fonts/Montserrat/Montserrat-Light.ttf differ diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-LightItalic.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-LightItalic.ttf new file mode 100755 index 00000000..b78b8b73 Binary files /dev/null and b/hosting/static/hosting/fonts/Montserrat/Montserrat-LightItalic.ttf differ diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-Medium.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-Medium.ttf new file mode 100755 index 00000000..88d70b89 Binary files /dev/null and b/hosting/static/hosting/fonts/Montserrat/Montserrat-Medium.ttf differ diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-MediumItalic.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-MediumItalic.ttf new file mode 100755 index 00000000..225fd18f Binary files /dev/null and b/hosting/static/hosting/fonts/Montserrat/Montserrat-MediumItalic.ttf differ diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-Regular.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-Regular.ttf new file mode 100755 index 00000000..626355a2 Binary files /dev/null and b/hosting/static/hosting/fonts/Montserrat/Montserrat-Regular.ttf differ diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-SemiBold.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-SemiBold.ttf new file mode 100755 index 00000000..61570450 Binary files /dev/null and b/hosting/static/hosting/fonts/Montserrat/Montserrat-SemiBold.ttf differ diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-SemiBoldItalic.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-SemiBoldItalic.ttf new file mode 100755 index 00000000..c6dd9773 Binary files /dev/null and b/hosting/static/hosting/fonts/Montserrat/Montserrat-SemiBoldItalic.ttf differ diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-Thin.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-Thin.ttf new file mode 100755 index 00000000..dc16a022 Binary files /dev/null and b/hosting/static/hosting/fonts/Montserrat/Montserrat-Thin.ttf differ diff --git a/hosting/static/hosting/fonts/Montserrat/Montserrat-ThinItalic.ttf b/hosting/static/hosting/fonts/Montserrat/Montserrat-ThinItalic.ttf new file mode 100755 index 00000000..b9e12f4a Binary files /dev/null and b/hosting/static/hosting/fonts/Montserrat/Montserrat-ThinItalic.ttf differ diff --git a/hosting/static/hosting/fonts/Montserrat/OFL.txt b/hosting/static/hosting/fonts/Montserrat/OFL.txt new file mode 100755 index 00000000..90ed8151 --- /dev/null +++ b/hosting/static/hosting/fonts/Montserrat/OFL.txt @@ -0,0 +1,92 @@ +Copyright 2011 The Montserrat Project Authors (julieta.ulanovsky@gmail.com) +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/payment.html b/hosting/templates/hosting/payment.html index 459dcf0b..33e44afe 100644 --- a/hosting/templates/hosting/payment.html +++ b/hosting/templates/hosting/payment.html @@ -5,7 +5,33 @@
-
+
+
+
+
+

Billing Amount

+
+
+ + +

Cores {{request.session.specs.cpu|floatformat}}

+
+

Memory {{request.session.specs.memory|floatformat}} GiB

+
+

Disk space {{request.session.specs.disk_size|floatformat}} GiB

+
+

Total

{{request.session.specs.price }} CHF

+
+
+
+
+ +
+

Billing Address

@@ -18,7 +44,8 @@
-
+
+

Payment Details

@@ -91,32 +118,7 @@
-
- -
-
-

Billing Amount

-
-
- - -

Cores {{request.session.specs.cpu|floatformat}}

-
-

Memory {{request.session.specs.memory|floatformat}} GiB

-
-

Disk space {{request.session.specs.disk_size|floatformat}} GiB

-
-

Total

{{request.session.specs.price }} CHF

-
-
-
- - -
+