Commit f9c73184 by abraham

Merge branch 'abraham' into 'master'

over See merge request !35
parents 5c7a8fe7 38ea65f4
...@@ -204,19 +204,6 @@ ...@@ -204,19 +204,6 @@
width: auto; width: auto;
height: 50px; height: 50px;
} }
h6{
margin-top: 20px;
object-fit: contain;
font-family: Roboto;
font-size: 18px;
font-weight: 300;
font-style: normal;
font-stretch: normal;
line-height: 1.28;
letter-spacing: normal;
text-align: left;
color: #6b6b6b;
}
p{ p{
margin-top: 10px; margin-top: 10px;
object-fit: contain; object-fit: contain;
......
...@@ -12,6 +12,6 @@ export class LandingpageComponent implements OnInit { ...@@ -12,6 +12,6 @@ export class LandingpageComponent implements OnInit {
ngOnInit() { ngOnInit() {
} }
firstConfig = {"slidesToShow": 1, "slidesToScroll": 1,"arrows": false,"dots":true,"autoplay":true,"autoplaySpeed":2000}; firstConfig = {"slidesToShow": 1, "slidesToScroll": 1,"arrows": false,"dots":true,"autoplay":true,"autoplaySpeed":2000};
solutionConfig = {"slidesToShow": 1, "slidesToScroll": 1,"arrows": true,"dots":true,"autoplay":false,"autoplaySpeed":2000,responsive:[{breakpoint:800,settings:"unslick"}]}; solutionConfig = {"slidesToShow": 1, "slidesToScroll": 1,"arrows": true,"dots":true,"autoplay":true,"autoplaySpeed":2000,responsive:[{breakpoint:800,settings:"unslick"}]};
templateConfig = {"slidesToShow": 1, "slidesToScroll": 1,"arrows": true,"dots":true,"autoplay":false,"autoplaySpeed":2000,responsive:[{breakpoint:800,settings:"unslick"}]}; templateConfig = {"slidesToShow": 1, "slidesToScroll": 1,"arrows": true,"dots":true,"autoplay":true,"autoplaySpeed":2000,responsive:[{breakpoint:800,settings:"unslick"}]};
} }
...@@ -8,6 +8,7 @@ nav{ ...@@ -8,6 +8,7 @@ nav{
width: 100%; width: 100%;
z-index: 10; z-index: 10;
.logo{ .logo{
cursor: pointer;
img{ img{
width: 80%; width: 80%;
height: 100%; height: 100%;
......
...@@ -16,7 +16,6 @@ export class HeaderComponent implements OnInit { ...@@ -16,7 +16,6 @@ export class HeaderComponent implements OnInit {
) { ) {
$(window).scroll(function(){ $(window).scroll(function(){
var custom = $('.navbar'), var custom = $('.navbar'),
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
@media only screen and (min-device-width: 320px) and (max-device-width: 480px) { @media only screen and (min-device-width: 320px) and (max-device-width: 480px) {
//navbar scss //navbar scss
nav{ nav{
background-color: #ffff !important;
.logo{ .logo{
max-width: 250px !important; max-width: 250px !important;
img{ img{
...@@ -48,16 +49,23 @@ nav{ ...@@ -48,16 +49,23 @@ nav{
.navbar-collapse{ .navbar-collapse{
margin-left: 0px !important; margin-left: 0px !important;
ul{ ul{
flex-direction: row !important; padding-top: 15px !important;
justify-content: space-between; padding-bottom: 10px !important;
li{ li{
width: 80px !important; width: 80px !important;
margin-bottom: 5px !important;
a{ a{
text-align: center !important; text-align: left !important;
&:hover{
color: rgb(125,181,50) !important;
}
} }
&:hover{
border: 2px solid transparent !important;
}
} }
.icon_box{ .icon_box{
display: none !important; margin-top: 10px !important;
} }
} }
} }
...@@ -129,9 +137,6 @@ nav{ ...@@ -129,9 +137,6 @@ nav{
img{ img{
height: 50px !important; height: 50px !important;
} }
h6{
margin-top: 0px !important;
}
p{ p{
margin-top: 15px !important; margin-top: 15px !important;
} }
...@@ -469,9 +474,6 @@ nav{ ...@@ -469,9 +474,6 @@ nav{
img{ img{
height: 60px !important; height: 60px !important;
} }
h6{
font-size: 32px !important;
}
p{ p{
font-size: 22px !important; font-size: 22px !important;
margin-top: 30px !important; margin-top: 30px !important;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment