Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Style fixes for bugs #26 #28 #31 #36

Merged
merged 9 commits into from
Oct 7, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 35 additions & 46 deletions css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ input:focus:-ms-input-placeholder { color:transparent; } /* IE 10+ */
margin-left: 2%;
margin-right: 2%;
padding-bottom: 1em;
width: 10em;
width: 160px;
transition: transform cubic-bezier(0.25, 0.1, 0.25, 1.25) 600ms;
}

Expand Down Expand Up @@ -230,15 +230,26 @@ input:focus:-ms-input-placeholder { color:transparent; } /* IE 10+ */

/* WHO WE ARE */
.who-we-are {
background-image: url(../images/WhoWeAre/who-we-are.svg);
background-image: url(../images/WhoWeAre/who-we-are-no-belt.svg);
background-position: right;
background-repeat: no-repeat;
background-size: cover;
background-size: 1415px;
color: #F8AC45;
font-family: 'Avenir Heavy', sans-serif;
min-height: 910px;
min-height: 795px;
position: relative;
}

.belt {
background-image: url(../images/WhoWeAre/belt.svg);
background-size: cover;
bottom: 0;
display: block;
height: 47px;
position: absolute;
width: 100%;
}

.who-we-are-top-bar {
background-color: #002939;
height: 90px;
Expand Down Expand Up @@ -335,7 +346,7 @@ input:focus:-ms-input-placeholder { color:transparent; } /* IE 10+ */

.who-we-are-text {
padding: 40px;
padding-top: 3em;
padding-top: 18px;
text-align: left;
width: 40%;
}
Expand All @@ -347,7 +358,7 @@ input:focus:-ms-input-placeholder { color:transparent; } /* IE 10+ */

.who-we-are-text p {
font-family: "Avenir Light", sans-serif;
font-size: 18px;
font-size: 17px;
line-height: 27px;
padding: 15px 0;
text-align: right;
Expand Down Expand Up @@ -379,10 +390,6 @@ input:focus:-ms-input-placeholder { color:transparent; } /* IE 10+ */
width: 100%;
}

.belt {
display: none;
}

@font-face {
font-family: Avenir-Light;
src: url(../assets/Avenir-Light.ttf);
Expand Down Expand Up @@ -1031,32 +1038,18 @@ input:focus:-ms-input-placeholder { color:transparent; } /* IE 10+ */
}
}

/* Who we are background support for very large screens */
@media only screen and (min-width: 1620px) {
@media only screen and (max-width: 1415px) {
.who-we-are {
background-image: url(../images/WhoWeAre/who-we-are-no-belt.svg);
background-position: right;
background-size: 1620px;
}

.belt {
background-image: url(../images/WhoWeAre/belt.svg);
background-size: cover;
bottom: 0;
display: block;
height: 47px;
position: absolute;
width: 100%;
background-image: url(../images/WhoWeAre/who-we-are.svg);
background-position: left;
}
}

@media only screen and (max-width: 1620px) {
.who-we-are {
background-size: 1620px;
.who-we-are-text {
width: 560px;
}

.who-we-are-text {
width: 595px;
.belt {
display: none;
}
}

Expand Down Expand Up @@ -1333,16 +1326,6 @@ input:focus:-ms-input-placeholder { color:transparent; } /* IE 10+ */
}
}

@media only screen and (max-height: 650px) {
.logo {
padding-top: 10%;
}

.top {
height: auto;
}
}

@media only screen and (max-width: 600px) {
.logo {
width: 80%;
Expand Down Expand Up @@ -1433,6 +1416,7 @@ input:focus:-ms-input-placeholder { color:transparent; } /* IE 10+ */
letter-spacing: 1px;
line-height: 45px;
margin: 15px 0;
text-align: center;
}

.who-we-are-welcome {
Expand Down Expand Up @@ -1722,14 +1706,19 @@ input:focus:-ms-input-placeholder { color:transparent; } /* IE 10+ */
min-height: 400px;
}

.logo {
max-width: 400px;
padding-top: 10%;
}

.date {
font-size: 1.3em;
}

.register {
font-size: 30px;
font-size: 20px;
padding: 3px;
width: 200px;
width: 160px;
}

.robots > img {
Expand Down Expand Up @@ -1783,13 +1772,13 @@ input:focus:-ms-input-placeholder { color:transparent; } /* IE 10+ */

@media (max-device-height:700px) {
.top {
height: 38em;
height: 500px;
}
}

@media (max-device-height:500px) {
@media (max-device-width:450px) {
.top {
height: 450px;
height: 300px;
}
}
}
Expand Down
Loading