Skip to content

Commit

Permalink
Finished with development
Browse files Browse the repository at this point in the history
  • Loading branch information
kornatskyi committed Apr 27, 2021
1 parent 22af945 commit 6649127
Show file tree
Hide file tree
Showing 27 changed files with 186 additions and 107 deletions.
39 changes: 30 additions & 9 deletions assets/css/home.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/css/home.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions assets/css/projects.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/css/projects.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions assets/css/services.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/css/services.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file removed assets/img/arrow2.png
Binary file not shown.
Binary file removed assets/img/bounded.png
Binary file not shown.
Binary file removed assets/img/insured-290x276.png
Binary file not shown.
Binary file removed assets/img/insured-trenspa.png
Binary file not shown.
File renamed without changes
File renamed without changes
File renamed without changes
Binary file removed assets/img/review_img_2.jpeg
Binary file not shown.
File renamed without changes
File renamed without changes
Binary file removed assets/img/tinified.zip
Binary file not shown.
56 changes: 41 additions & 15 deletions assets/sass/home.scss
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ body {
.col {
.content {
padding: 20px;
background-color: rgba($secondary, $alpha: 0.1);

border: 1px solid $secondary;
}
Expand Down Expand Up @@ -273,11 +274,11 @@ body {
#carouselExterior {
.carousel-inner {
.one {
background-image: url("../img/services/exterior/exterior1.jpg");
background-image: url("../img/services/exterior/exterior1.jpeg");
}

.two {
background-image: url("../img/services/exterior/exterior2.jpeg");
background-image: url("../img/services/exterior/exterior2.jpg");
}
}
}
Expand Down Expand Up @@ -331,7 +332,12 @@ body {
.col {
display : flex;
flex-direction: column;
.tab-content {
.tab-pane{

background-color: rgba($secondary, $alpha: 0.1);
}
}
.my-card-header {
display : flex;
justify-content : center;
Expand Down Expand Up @@ -363,15 +369,24 @@ body {
height : 100%;
padding : 20px;
background-color: $white;
box-shadow : $box-shadow;
// box-shadow : $box-shadow;
border: 1px solid $secondary;

.image-container {
img {
width: 100%;
}
}
background-color: rgba($secondary, $alpha: 0.1);


}

.image-container {
display: flex;

img {
margin: auto;
width: auto;
max-height: 180px;

}
}
.nav {
width : 100%;
background-color: $primary;
Expand Down Expand Up @@ -462,21 +477,26 @@ body {
.item-container {
display: flex;

@media only screen and (max-width: 600px) {
@media only screen and (max-width: 800px) {
flex-direction: column;


}
padding: 10px;

.review-container {


background-color: rgba($secondary, $alpha: 0.1);
padding-bottom: 5px;
margin: 10px;
display : flex;
flex-direction: column;
flex-grow : 1;
width: 50%;
border : 1px solid $secondary;
margin : 10px;
padding : 10px;

@media only screen and (max-width: 830px) {
width: 100%;

}

.review-header {
display: flex;
Expand All @@ -497,6 +517,7 @@ body {
.name {
font-weight: $font-weight-bold;
}


.stars {
color : $secondary;
Expand All @@ -508,7 +529,9 @@ body {

.review-body {
padding-left: 10px;

.text {
font-size: $font-size-sm;
}


}
Expand Down Expand Up @@ -536,6 +559,7 @@ body {

.row.map-section {
margin-top: 40px;


.col {
display : flex;
Expand All @@ -544,8 +568,10 @@ body {
#google-maps-container {
height: 100%;
width : 100%;
border: 1px solid $secondary;

iframe {

width: 100%;
}
}
Expand Down
8 changes: 8 additions & 0 deletions assets/sass/projects.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ body {

.project {
max-width: 1000px;
background-color: rgba($secondary, $alpha: 0.1);
padding: 20px;
margin-bottom: 30px;

.gallery {
max-width : 1000px;
Expand All @@ -28,6 +31,8 @@ body {

img {

border: 1px solid $secondary;

width : 100%;
height : 100%;
object-fit: cover;
Expand Down Expand Up @@ -102,6 +107,9 @@ body {
}
}

.project-footer {
margin-top: 15px;
}
}

}
Expand Down
3 changes: 3 additions & 0 deletions assets/sass/services.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@ body {
.col-12.service {
margin: 30px 0px;
.card {
border: 1px solid $secondary;

height: 100%;
.card-body {
background-color: rgba($secondary, $alpha: 0.1);

display: flex;
flex-direction: column;
Expand Down
17 changes: 0 additions & 17 deletions blog.html

This file was deleted.

8 changes: 3 additions & 5 deletions contactus.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,7 @@
>Projects</a
>
</li>
<li class="nav-item">
<a class="nav-link nav-link-custom" href="blog.html">News</a>
</li>

<li class="nav-item">
<a class="nav-link nav-link-custom nav-link-contact active" href="contactus.html"
>Contact</a
Expand Down Expand Up @@ -193,8 +191,8 @@ <h6>Links</h6>
<ul class="list-unstyled">
<li><a href="index.html">Home</a></li>
<li><a href="aboutus.html">About</a></li>
<li><a href="#">Sites</a></li>
<li><a href="#">Contact</a></li>
<li><a href="projects.html">Projects</a></li>
<li><a href="contactus.html">Contact Us</a></li>
</ul>
</div>
<div class="col-8 col-sm-5 text-center">
Expand Down
Loading

0 comments on commit 6649127

Please sign in to comment.