Skip to content

Commit

Permalink
Merge branch 'feature/FD-70-1' into feature/FD-72
Browse files Browse the repository at this point in the history
  • Loading branch information
mgsherry committed Sep 11, 2024
2 parents 10410f9 + f5c6001 commit fc497e0
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 0 deletions.
29 changes: 29 additions & 0 deletions assets/css/styles_ver3.css
Original file line number Diff line number Diff line change
Expand Up @@ -17214,6 +17214,29 @@ tbody tr {
width: max(34px, 5.1%);
animation: reel 4s linear infinite;
}
.home-page #complextopics .container {
margin-top: auto;
}
.home-page .workshop-container {
position: relative;
width: 100%;
}
.home-page .workshop {
position: relative;
width: 100%;
height: 60vw;
min-height: 400px;
max-height: 643px;
background-image: url(../img/home/border-bottom.png), url(../img/home/Workshop_Background.png);
background-size: 25px, cover;
background-repeat: repeat-x, no-repeat;
background-position: bottom, top;
text-align: center;
padding-top: 5em;
display: flex;
justify-content: center;
overflow: hidden;
}
@media (min-width: 576px) {
.home-page .lead .section-img {
margin-top: -8em;
Expand Down Expand Up @@ -17313,6 +17336,12 @@ tbody tr {
background-size: 9px, 9px;
border-bottom: none;
}
.home-page .workshop {
background-image: url(../img/home/border-left.png), url(../img/home/border-right.png), url(../img/home/Workshop_Background.png);
background-size: 9px, 9px, cover;
background-repeat: repeat-y, repeat-y, no-repeat;
background-position: left, right, top;
}
.home-page .modeling-monitor {
top: 205px;
}
Expand Down
Binary file added assets/img/home/Workshop_Background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 29 additions & 0 deletions assets/scss/_home.scss
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,29 @@
animation: reel 4s linear infinite;
}
}
#complextopics .container {
margin-top: auto;
}
.workshop-container {
position: relative;
width: 100%;
}
.workshop {
position: relative;
width: 100%;
height: 60vw;
min-height: 400px;
max-height: 643px;
background-image: url(../img/home/border-bottom.png), url(../img/home/Workshop_Background.png);
background-size: 25px, cover;
background-repeat: repeat-x, no-repeat;
background-position: bottom,top;
text-align: center;
padding-top: 5em;
display: flex;
justify-content: center;
overflow: hidden;
}

@media (min-width: 576px) {
.lead .section-img {
Expand Down Expand Up @@ -277,6 +300,12 @@
background-size: 9px, 9px;
border-bottom: none;
}
.workshop {
background-image: url(../img/home/border-left.png), url(../img/home/border-right.png), url(../img/home/Workshop_Background.png);
background-size: 9px, 9px, cover;
background-repeat: repeat-y, repeat-y, no-repeat;
background-position: left, right, top;
}
.modeling-monitor {
top: 205px;
video {
Expand Down
13 changes: 13 additions & 0 deletions redesign.php
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,19 @@
</div>
</section>
<div class="bottom-frame"></div>
<section id="complextopics" class="lead d-flex flex-col flex-xxl-reverse">
<div class="workshop-container">
<div class="workshop">
</div>
</div>
<div class="container hero-text">
<h4>Games explore complex topics.</h4>
<p>It's hard to communicate super complex topics in a short time frame. Games turn complicated topics into fun,
hands-on experiences that actually reach people. Our games get millions of plays.
</p>
</div>
</section>
<div class="bottom-frame"></div>
<section id="modelingroom" class="lead d-flex flex-col flex-xxl-reverse">
<div class="modeling-container">
<div class="modeling-monitor">
Expand Down

0 comments on commit fc497e0

Please sign in to comment.