Skip to content

Commit

Permalink
Merge branch '60_release' into stage
Browse files Browse the repository at this point in the history
  • Loading branch information
antongit committed Mar 26, 2024
2 parents 0029f60 + 1f3137f commit 75573a2
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 4 deletions.
11 changes: 9 additions & 2 deletions assets/css/creative.css
Original file line number Diff line number Diff line change
Expand Up @@ -308,15 +308,22 @@ header {
width: 100%;
text-align: center;
color: #fff;
background-image: url(../img/header_6.0.jpg);
background-image: url(../img/header_6.0_1500.jpg);
background-position: 71% 0%;
-webkit-background-size: cover;
-moz-background-size: cover;
background-size: cover;
-o-background-size: cover;
overflow: hidden;
padding: 2em 0 4em;
min-height: 600px;
height: 400px;
}

@media (min-width: 1000px){
header {
background-image: url(../img/header_6.0.jpg);
min-height: 600px;
}
}

@media (min-width: 2250px){
Expand Down
3 changes: 2 additions & 1 deletion assets/scss/_hero.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@

@media(min-width:500px) {
width: 450px;
font-size: 1.3em; //1.5em when not caps
}

p
{
font-size: 1.3em; //1.5em when not caps
font-size: 1em; //1.5em when not caps
font-weight: 100;
text-transform: uppercase;
}
Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/logo.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<a class="js-scroll-trigger noUnderline ml-3 ml-md-5" href="{{ "/#page-top" | relLangURL}}">
<img src="{{ "../img/vvvv-logo.png" | absURL }}" alt="vvvv">
<img src="{{ "../img/vvvvquad.svg" | absURL }}" alt="vvvv">
</a>
3 changes: 3 additions & 0 deletions static/img/header_6.0_1500.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 50 additions & 0 deletions static/img/vvvvquad.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 75573a2

Please sign in to comment.