Skip to content

Commit

Permalink
Added 10-01-2019 patch notes
Browse files Browse the repository at this point in the history
  • Loading branch information
Mitcheljager committed Oct 1, 2019
1 parent 89adbab commit 616b21a
Show file tree
Hide file tree
Showing 52 changed files with 579 additions and 36 deletions.
Binary file added app/assets/images/banners/season_3/crypto.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/gradient-bg/lg/crypto.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/gradient-bg/md/crypto.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/gradient-bg/sm/crypto.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/gradient-bg/xl/crypto.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/layout/banner_3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/legends/crypto/banner.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/legends/crypto/banner.webp
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/patch-notes/crypto.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/patch-notes/cutout-caustic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/patch-notes/cutout-crypto.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/patch-notes/cutout-lifeline.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/patch-notes/cutout-mirage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/patch-notes/cutout-wattson.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/patch-notes/cutout-wraith.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/patch-notes/wattson.png
Binary file added app/assets/images/weapons/jpg/charge_rifle.jpg
Binary file added app/assets/images/weapons/webp/charge_rifle.webp
Binary file not shown.
Binary file not shown.
17 changes: 16 additions & 1 deletion app/assets/stylesheets/elements/_banner.scss
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,8 @@
}
}

.banner--season-2 {
.banner--season-2,
.banner--season-3 {
background-image: image_url("layout/banner_2.jpg");
flex-direction: column;
align-items: flex-start;
Expand Down Expand Up @@ -226,3 +227,17 @@
}
}
}

.banner--season-3 {
background-image: image_url("layout/banner_3.jpg");
margin-bottom: $margin * 2;
justify-content: center;

@media screen and (min-width: 1100px) {
justify-content: flex-start;
}

h2 {
color: $black;
}
}
32 changes: 32 additions & 0 deletions app/assets/stylesheets/elements/_item.scss
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,34 @@
}
}

&--patch-notes-banner-season-3 {
background-image: image_url("layout/banner_3.jpg");
background-size: cover;

h2 {
margin: $margin / 2 0;
}

h2,
h3 {
color: $black;
}
}

&--patch-notes-banner-left {
border: 0;

@include media-min(md) {
justify-content: flex-start;
}

img {
position: absolute;
bottom: 0;
right: 0;
}
}

> img {
max-width: 100%;
height: auto;
Expand Down Expand Up @@ -190,6 +218,10 @@
text-transform: none;
text-align: center;

.item--full-width & {
text-align: left;
}

span {
display: block;
font-size: 16px;
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/elements/_legends-banner.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
}

@include media-min(max-width) {
flex: 0 0 calc(100% / 10);
width: calc(100% / 10);
flex: 0 0 calc(100% / 11);
width: calc(100% / 11);
}

&:hover,
Expand Down
10 changes: 9 additions & 1 deletion app/assets/stylesheets/utilities/_position.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
margin-top: 0 !important;
}

.mt-120 {
margin-top: $margin * 3 !important;
}

.mt-80 {
margin-top: $margin * 2 !important;
}
Expand All @@ -39,7 +43,11 @@
}

.mb-40 {
margin-bottom: $margin / 2 !important;
margin-bottom: $margin !important;
}

.mb-80 {
margin-bottom: $margin * 2 !important;
}

.my-40 {
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/content_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def legends
end

def legends_list
["Bangalore", "Bloodhound", "Caustic", "Gibraltar", "Lifeline", "Mirage", "Pathfinder", "Wraith", "Octane", "Wattson"]
["Bangalore", "Bloodhound", "Caustic", "Gibraltar", "Lifeline", "Mirage", "Pathfinder", "Wraith", "Octane", "Wattson", "Crypto"]
end

def legend(name)
Expand Down
1 change: 1 addition & 0 deletions app/views/application/_navigation.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@

<div class="dropdown__content">
<div class="dropdown__inner">
<%= link_to "10.1.2019", page_path("patch-notes/10-1-2019"), class: current_page?("/patch-notes/10-1-2019") ? "active" : "" %>
<%= link_to "9.3.2019", page_path("patch-notes/9-3-2019"), class: current_page?("/patch-notes/9-3-2019") ? "active" : "" %>
<%= link_to "8.13.2019", page_path("patch-notes/8-13-2019"), class: current_page?("/patch-notes/8-13-2019") ? "active" : "" %>
<%= link_to "7.2.2019", page_path("patch-notes/7-2-2019"), class: current_page?("/patch-notes/7-2-2019") ? "active" : "" %>
Expand Down
4 changes: 4 additions & 0 deletions app/views/banners/_season_3.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<%= link_to page_path("patch-notes/10-1-2019"), class: "banner banner--season-3" do %>
<h2>Season 3</h2>
<%= image_tag "banners/season_3/crypto.png", class: "banner__image", alt: "Season 3" %>
<% end %>
2 changes: 2 additions & 0 deletions app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
<%= render "header" %>

<main class="wrapper top-offset">
<div class="alert mb-80">We're still in the process of updating the website with all Season 3 content. There's plenty of updated data already, but more will follow.</div>

<%= yield %>

<%= render "social" %>
Expand Down
2 changes: 2 additions & 0 deletions app/views/pages/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<%= render "banners/season_3" %>

<div class="heading mt-0">
<h2 class="heading__title">Legends</h2>
</div>
Expand Down
3 changes: 2 additions & 1 deletion app/views/pages/patch-notes.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<h2 class="heading__title">Patch Notes Archive</h2>
</div>

<p><%= link_to "9.3.2019 (Latest)", page_path("patch-notes/9-3-2019"), class: "button" %></p>
<p><%= link_to "10.1.2019 (Latest)", page_path("patch-notes/10-1-2019"), class: "button" %></p>
<p><%= link_to "9.3.2019", page_path("patch-notes/9-3-2019"), class: "button button--secondary m-0" %></p>
<p><%= link_to "8.13.2019", page_path("patch-notes/8-13-2019"), class: "button button--secondary m-0" %></p>
<p><%= link_to "7.2.2019", page_path("patch-notes/7-2-2019"), class: "button button--secondary m-0" %></p>
<p><%= link_to "6.11.2019", page_path("patch-notes/6-11-2019"), class: "button button--secondary m-0" %></p>
Expand Down
Loading

0 comments on commit 616b21a

Please sign in to comment.