amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix conflicts

Browse source
This commit is contained in:
Henry Bravo 2017-06-09 16:18:41 -05:00
commit 7004536a19
1042 changed files with 750 additions and 9769 deletions
Download patch file Download diff file Expand all files Collapse all files

21
datacenterlight/static/datacenterlight/css/landing-page.css
View file

@ -280,6 +280,10 @@ h6 {
align-items: center;
position: relative;
}
.intro-pricing.success-pricing{
height: 100vh;
max-height: 100vh;
}
.intro-pricing::before{
content: "";
position: absolute;
@ -287,7 +291,7 @@ h6 {
bottom: 0;
left: 0;
right: 0;
background: rgba(90, 116, 175, 0.8);
background: rgba(90, 116, 175, 0.7);
}
.intro-pricing .intro-message .section-heading{
font-size: 45px;
@ -507,7 +511,6 @@ h6 {
position: relative;
}
.full-contact-section{
padding-top: 90px;
background-image: -ms-linear-gradient(right, #29427A 50%, #4F6699 100%);
background-image: -moz-linear-gradient(right, #29427A 50%, #4F6699 100%);
background-image: -o-linear-gradient(right, #29427A 50%, #4F6699 100%);
@ -642,7 +645,7 @@ h6 {
}
.price-calc-section .card .description span {
font-size: 18px;
font-size: 16px;
margin-left: 4px;
margin-left: 0px;
/* justify-self: start; */
@ -866,6 +869,11 @@ h6 {
color: #29427A;
font-size: 30px;
}
.intro-pricing .intro-message .section-heading {
font-size: 30px;
}
.price-calc-section{
flex-direction: column;
padding: 60px 10px !important;
@ -900,7 +908,6 @@ h6 {
width: 60px;
}
}
@media(max-width:540px) {
@ -917,7 +924,7 @@ h6 {
.intro-message > h1 {
font-size: 2em;
}
.price-calc-section .text .section-heading {
.price-calc-section .text .section-heading {
font-size: 24px;
line-height: 25px;
}
@ -1018,3 +1025,7 @@ a#forgotpassword {
.form-300{
width: 300px;
}
.error-message-box{
margin-top: 20px;
}

56
datacenterlight/static/datacenterlight/js/main.js
View file

@ -138,59 +138,3 @@
})(jQuery);
// (function($){
// 'use strict'; // Start of use strict
// $(document).ready(function(){
// verifiedUrl();
// init_options_interested();
// init_nav();
// change_values();
// });
// function verifiedUrl(){
// if(window.location.href.indexOf('#success') > -1){
// form_success();
// }
// }
// function init_options_interested(){
// $('.row-vms').click(function(){
// $('.row-vms').removeClass('row-vms__active');
// $(this).addClass('row-vms__active');
// var number = $('.row-vms__active input').val();
// var price = $('.row-vms__active input').data('price');
// _calculate(number, price);
// });
// }
// function init_nav(){
// $('.nav-local').click(function(){
// $('html, body').animate({
// scrollTop: $('#'+$(this).data('href')).offset().top
// });
// });
// }
// function change_values(){
// $('.number-vms').keyup(function () {
// var number = $(this).val();
// var price = $(this).data('price');
// _calculate(number, price);
// });
// }
// function form_success(){
// $('#sucessModal').modal('show');
// }
// function _calculate(numbers, price){
// $('#valueTotal').text(numbers*price*31);
// }
// })(jQuery); // End of use strict