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

resolved henry latest conflicts

Browse source
This commit is contained in:
Levi 2017-06-13 01:12:51 -05:00
commit 89dedab8ba
1 changed files with 1 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -595,16 +595,9 @@ h6 {
width: 50%; width: 50%;
} }
.price-calc-section .text .section-heading{ .price-calc-section .text .section-heading{
<<<<<<< HEAD
font-family: 'Lato-Black';
font-size: 48px; font-size: 48px;
line-height: 48px; line-height: 48px;
======= padding-bottom: 27px;
font-family: 'Montserrat-Bold';
font-size: 50px;
line-height: 50px;
>>>>>>> master
padding-bottom: 25px;
color: #3a3a3a; color: #3a3a3a;
letter-spacing: 1px; letter-spacing: 1px;
position: relative; position: relative;
@ -671,11 +664,7 @@ h6 {
} }
.price-calc-section .card .description span { .price-calc-section .card .description span {
<<<<<<< HEAD
font-size: 18px;
=======
font-size: 16px; font-size: 16px;
>>>>>>> master
margin-left: 4px; margin-left: 4px;
margin-left: 0px; margin-left: 0px;
/* justify-self: start; */ /* justify-self: start; */
@ -728,11 +717,7 @@ h6 {
.price-calc-section .card .description.input label{ .price-calc-section .card .description.input label{
font-size: 15px; font-size: 15px;
font-weight: 800; font-weight: 800;
<<<<<<< HEAD
font-family: 'Lato-Regular'; font-family: 'Lato-Regular';
=======
font-family: 'Montserrat-Regular';
>>>>>>> master
margin-bottom: 0; margin-bottom: 0;
width: 40px; width: 40px;
} }
@ -746,10 +731,7 @@ h6 {
background: #fff; background: #fff;
margin-left: 10px; margin-left: 10px;
} }
<<<<<<< HEAD
=======
>>>>>>> master
.price-calc-section .card .check-ip input[type=checkbox]{ .price-calc-section .card .check-ip input[type=checkbox]{
font-size: 17px; font-size: 17px;
margin: 0 8px; margin: 0 8px;