Skip to content

Commit

Permalink
'aaddd'
Browse files Browse the repository at this point in the history
  • Loading branch information
jerryk1925 committed Jan 5, 2018
1 parent cacc233 commit 286ab45
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 65 deletions.
49 changes: 28 additions & 21 deletions bouncy.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -360,10 +360,11 @@
}

.details {
margin: 90px 30px;
display: flex;
flex-direction: column;
flex-wrap: wrap;
justify-content: space-around;
justify-content: space-between;
align-items: center;
align-content: center;
min-height: 615px;
Expand Down Expand Up @@ -617,7 +618,7 @@
display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: flex-start;
justify-content: center;
align-items: center;
align-content: center;
min-height: 115px;
Expand Down Expand Up @@ -660,12 +661,13 @@
}

.services {
margin: 90px 30px;
min-height: 640px;
width: 100%;
display: flex;
flex-direction: column;
flex-wrap: wrap;
justify-content: space-around;
justify-content: space-between;
align-items: center;
align-content: center;
}
Expand Down Expand Up @@ -706,7 +708,7 @@
}

.services__menu {
width: 80%;
width: 90%;
min-height: 300px;
display: flex;
align-items: center;
Expand All @@ -723,9 +725,10 @@
align-content: center;
}

.services__menu .col-4 {
width: 53px !important;
.services__menu .col-1 {
width: 91px !important;
min-height: 300px;
flex: none;
}

.services__menu .col-123 {
Expand Down Expand Up @@ -756,14 +759,14 @@
display: flex;
flex-direction: column;
flex-wrap: wrap;
justify-content: space-between;
justify-content: center;
align-items: flex-start;
align-content: flex-start;
}

.services__menu .tab-pane-text-name {
font-size: 20px;
font-family: "SourceSansPro";
font-family: "Source Sans Pro";
color: #333b46;
width: 400px;
}
Expand Down Expand Up @@ -879,7 +882,7 @@
display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: space-between;
justify-content: center;
align-items: center;
align-content: center;
}
Expand All @@ -899,22 +902,22 @@
}

.quotes__text {
width: 51%;
width: 100%;
}

.quotes__text_caption {
font-size: 20px;
font-family: "SourceSansPro";
font-family: "Source Sans Pro";
color: #f3f3f3;
}

.quotes__text_about {
width: 40%;
margin-top: 50px;
margin-bottom: 30px;
font-size: 16px;
font-family: "OpenSans";
color: #b2b3b3;
width: 81%;
}

.quotes__text_name {
Expand Down Expand Up @@ -1193,12 +1196,13 @@
}

.team {
margin: 80px 0;
min-height: 770px;
width: 100%;
display: flex;
flex-direction: column;
flex-wrap: wrap;
justify-content: space-around;
justify-content: center;
align-items: center;
align-content: center;
}
Expand Down Expand Up @@ -1642,9 +1646,9 @@
display: flex;
flex-direction: row;
flex-wrap: nowrap;
justify-content: space-between;
align-items: flex-start;
align-content: flex-start;
justify-content: center;
align-items: center;
align-content: center;
width: 100%;
min-height: 693px;
}
Expand Down Expand Up @@ -1843,12 +1847,13 @@
display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: space-between;
align-items: flex-start;
justify-content: center;
align-items: center;
align-content: center;
}

.price__plans_item {
margin: 0 10px;
position: relative;
width: 235px;
min-height: 302px;
Expand Down Expand Up @@ -2071,12 +2076,13 @@
display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: space-between;
align-items: flex-start;
align-content: space-between;
justify-content: center;
align-items: center;
align-content: center;
}

.contact__list_item {
margin: 0 10px;
width: 287px;
min-height: 272px;
}
Expand Down Expand Up @@ -2125,6 +2131,7 @@
font-family: "OpenSans";
color: #81868e;
text-align: center;
min-height: 20px;
}

.form {
Expand Down
2 changes: 1 addition & 1 deletion bouncy.min.css
View file

Large diffs are not rendered by default.

53 changes: 30 additions & 23 deletions bouncy.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,11 +327,11 @@
}

.details {

margin: 90px 30px;
display: flex;
flex-direction: column;
flex-wrap: wrap;
justify-content: space-around;
justify-content: space-between;
align-items: center;
align-content: center;
min-height: 615px;
Expand Down Expand Up @@ -561,7 +561,7 @@
display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: flex-start;
justify-content: center;
align-items: center;
align-content: center;
min-height: 115px;
Expand Down Expand Up @@ -600,13 +600,13 @@
}

.services {

margin: 90px 30px;
min-height: 640px;
width: 100%;
display: flex;
flex-direction: column;
flex-wrap: wrap;
justify-content: space-around;
justify-content: space-between;
align-items: center;
align-content: center;
&__wrapper {
Expand Down Expand Up @@ -641,7 +641,7 @@
}
}
&__menu {
width: 80%;
width: 90%;
min-height: 300px;
display: flex;
align-items: center;
Expand All @@ -657,9 +657,11 @@
justify-content: center;
align-content: center;
}
&__menu .col-4 {
width: 53px !important;
&__menu .col-1 {
width: 91px !important;
min-height: 300px;
flex: none;

}
&__menu .col-123 {
margin-left: 10px;
Expand All @@ -686,13 +688,13 @@
display: flex;
flex-direction: column;
flex-wrap: wrap;
justify-content: space-between;
justify-content: center;
align-items: flex-start;
align-content: flex-start;
}
&__menu .tab-pane-text-name {
font-size: 20px;
font-family: "SourceSansPro";
font-family: "Source Sans Pro";
color: rgb(51, 59, 70);
width: 400px;
}
Expand Down Expand Up @@ -797,7 +799,7 @@
display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: space-between;
justify-content: center;
align-items: center;
align-content: center;
&__wrapper {
Expand All @@ -814,19 +816,20 @@
align-content: center;
}
&__text {
width: 51%;
width: 100%;
&_caption {
font-size: 20px;
font-family: "SourceSansPro";
font-family: "Source Sans Pro";
color: rgb(243, 243, 243);
}
&_about {
width: 40%;
margin-top: 50px;
margin-bottom: 30px;
font-size: 16px;
font-family: "OpenSans";
color: rgb(178, 179, 179);
width: 81%;

}
&_name {
font-size: 14px;
Expand Down Expand Up @@ -1071,12 +1074,13 @@
}

.team {
margin: 80px 0;
min-height: 770px;
width: 100%;
display: flex;
flex-direction: column;
flex-wrap: wrap;
justify-content: space-around;
justify-content: center;
align-items: center;
align-content: center;
&__wrapper {
Expand Down Expand Up @@ -1471,9 +1475,9 @@
display: flex;
flex-direction: row;
flex-wrap: nowrap;
justify-content: space-between;
align-items: flex-start;
align-content: flex-start;
justify-content: center;
align-items: center;
align-content: center;
width: 100%;
min-height: 693px;
&-indicators {
Expand Down Expand Up @@ -1651,10 +1655,11 @@
display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: space-between;
align-items: flex-start;
justify-content: center;
align-items: center;
align-content: center;
&_item{
margin: 0 10px;
position: relative;
width: 235px;
min-height: 302px;
Expand Down Expand Up @@ -1861,10 +1866,11 @@
display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: space-between;
align-items: flex-start;
align-content: space-between;
justify-content: center;
align-items: center;
align-content: center;
&_item{
margin: 0 10px;
width: 287px;
min-height: 272px;
&_email{
Expand Down Expand Up @@ -1905,6 +1911,7 @@
font-family: "OpenSans";
color: rgb(129, 134, 142);
text-align: center;
min-height: 20px;
}
}
}
Expand Down
Loading

0 comments on commit 286ab45

Please sign in to comment.