Merge branch 'master' into bugfix/hover_on_mobile_device_#3588
This commit is contained in:
		
				commit
				
					
						72ece2ec29
					
				
			
		
					 5 changed files with 14 additions and 6 deletions
				
			
		| 
						 | 
				
			
			@ -130,7 +130,7 @@
 | 
			
		|||
            <div class="row text-center">
 | 
			
		||||
                <div class="col-xs-12 col-md-6 text">
 | 
			
		||||
                    <h2 class="section-heading">{% trans "Simple and affordable: Try our virtual machine with featherlight price." %}</h2>
 | 
			
		||||
                    <p class="lead">{% trans "Affordable VM hosting based in Switzerland" %}</p>
 | 
			
		||||
                    <p class="lead new-lead">{% trans "Affordable VM hosting based in Switzerland" %}</p>
 | 
			
		||||
                </div>
 | 
			
		||||
 | 
			
		||||
                <div class="col-xs-12 col-md-6 hero-feature">
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -35,7 +35,7 @@
 | 
			
		|||
                            <address>
 | 
			
		||||
                            <h3><b>{% trans "Billed To:"%}</b></h3>
 | 
			
		||||
                            {% with request.session.billing_address_data as billing_address %}
 | 
			
		||||
                                {{request.session.user.name}}<br> {{billing_address|get_value_from_dict:'street_address'}}, {{billing_address|get_value_from_dict:'postal_code'}}<br>
 | 
			
		||||
                                {{billing_address|get_value_from_dict:'cardholder_name'}}<br> {{billing_address|get_value_from_dict:'street_address'}}, {{billing_address|get_value_from_dict:'postal_code'}}<br>
 | 
			
		||||
                                {{billing_address|get_value_from_dict:'city'}}, {{billing_address|get_value_from_dict:'country'}}.
 | 
			
		||||
                            {% endwith %}
 | 
			
		||||
                            </address>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -88,7 +88,7 @@
 | 
			
		|||
                <div class="col-xs-12 col-sm-8 col-md-7 text-right">
 | 
			
		||||
                        <div class="tech-sub-sec">
 | 
			
		||||
                            <h2>{% trans "We believe in giving back to the FOSS community." %}</h2>
 | 
			
		||||
                            <p class="lead">{% blocktrans %}Data Center Light is the child of free and open source software (FOSS) movement. <br>We grew up with it, live by it, and believe in it.<br> The more we work on our data center,<br> the more we contribute back to the FOSS community.{% endblocktrans %}</p>
 | 
			
		||||
                            <p class="lead new-lead">{% blocktrans %}Data Center Light is the child of free and open source software (FOSS) movement. <br>We grew up with it, live by it, and believe in it.<br> The more we work on our data center,<br> the more we contribute back to the FOSS community.{% endblocktrans %}</p>
 | 
			
		||||
                        </div>
 | 
			
		||||
                </div>
 | 
			
		||||
            </div>
 | 
			
		||||
| 
						 | 
				
			
			@ -104,7 +104,7 @@
 | 
			
		|||
                        <h2>{% trans "We bring the future to you." %}</h2>
 | 
			
		||||
                    </div>
 | 
			
		||||
                    <div class="col-xs-12 col-sm-7 col-md-8 col-lg-8 text-left tech-sub-sec landscape-xs-6">
 | 
			
		||||
                            <p class="lead">{% blocktrans %} Data Center Light uses the most modern technologies out there.<br>
 | 
			
		||||
                            <p class="lead new-lead">{% blocktrans %} Data Center Light uses the most modern technologies out there.<br>
 | 
			
		||||
                            Your VM needs only IPv6. Data Center Light provides<br> transparent two-way IPv6/IPv4 translation.
 | 
			
		||||
                            {% endblocktrans %}</p>
 | 
			
		||||
                    </div>
 | 
			
		||||
| 
						 | 
				
			
			@ -119,7 +119,7 @@
 | 
			
		|||
                    </div>
 | 
			
		||||
                    <div class="col-xs-12 col-sm-5 col-md-4 col-lg-4 text-right tech-sub-sec  padding-vertical landscape-xs-4">
 | 
			
		||||
                        <div>
 | 
			
		||||
                            <p class="lead">{% blocktrans %} No more spinning metal plates! Data Center Light uses only SSDs. We keep things faster and lighter. {% endblocktrans %}</p>
 | 
			
		||||
                            <p class="lead new-lead">{% blocktrans %} No more spinning metal plates! Data Center Light uses only SSDs. We keep things faster and lighter. {% endblocktrans %}</p>
 | 
			
		||||
                        </div>
 | 
			
		||||
                    </div>
 | 
			
		||||
                </div>
 | 
			
		||||
| 
						 | 
				
			
			@ -136,7 +136,7 @@
 | 
			
		|||
            <div class="row text-center">
 | 
			
		||||
                <div class="col-xs-12 col-md-6 text">
 | 
			
		||||
                    <h2 class="section-heading">{% trans "Starting from only 15CHF per month. Try now." %}</h2>
 | 
			
		||||
                    <p class="lead">{% trans "Actions speak louder than words. Let's do it, try our VM now." %}</p>
 | 
			
		||||
                    <p class="lead new-lead">{% trans "Actions speak louder than words. Let's do it, try our VM now." %}</p>
 | 
			
		||||
                </div>
 | 
			
		||||
 | 
			
		||||
                <div class="col-xs-12 col-md-6 hero-feature">
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue