Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Clean up after removed header/logo animations #2851

Merged
merged 1 commit into from
Mar 30, 2018
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
Binary file removed public/images/layout/nav-backgrounds/triangles-1.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed public/images/layout/nav-backgrounds/triangles-3.png
Binary file not shown.
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 1 addition & 8 deletions resources/assets/less/bem/bg.less
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,6 @@
position: absolute;
background-size: 640px 360px;

._n(@i) {
.at2x-simple("/images/layout/nav-backgrounds/triangles-@{i}.png");
// animation: bg-triangles-scroll ((@i + 1) * 5s) infinite linear;
}

&--1 { ._n(1) }
&--2 { ._n(2) }
&--3 { ._n(3) }
.at2x-simple("/images/layout/nav-backgrounds/triangles-combined.png");
}
}
29 changes: 0 additions & 29 deletions resources/assets/less/bem/logo.less
Original file line number Diff line number Diff line change
Expand Up @@ -29,34 +29,5 @@
position: absolute;
width: 100%;
height: 100%;

animation-iteration-count: 0;

.@{_top}:hover & {
// FIXME: disabled until someone fixes the blurriness.
// animation-iteration-count: infinite;
}

&--bounce {
animation-name: logo-bounce;
animation-duration: 0.6s;
}

&--delayed {
animation-delay: 0.9s;
}

&--glow {
.at2x-simple("/images/layout/osu-logo-glow.png");
animation-name: logo-glow;
animation-duration: 1.2s;
animation-timing-function: ease-out;
animation-delay: 0.3s;
opacity: 0;
}

&--overlay {
opacity: 0.15;
}
}
}
16 changes: 0 additions & 16 deletions resources/assets/less/keyframes.less
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@
* along with osu!web. If not, see <http://www.gnu.org/licenses/>.
*/

@keyframes bg-triangles-scroll {
0% { transform: translateY(0); }
100% { transform: translateY(-360px); }
}

@keyframes spinner-sk-cubemove {
25% {
transform: translateX(42px) rotate(-90deg) scale(0.5);
Expand All @@ -35,17 +30,6 @@
}
}

@keyframes logo-bounce {
0% { width: 100%; height: 100%; }
90% { transform: scale(1.05,1.05); }
}

@keyframes logo-glow {
0% { width: 100%; height: 100%; }
5% { opacity: 1; }
100% { transform: scale(1.63,1.63); opacity: 0; }
}

@keyframes spin-w-easing {
100% { transform:rotate(360deg); }
}
Expand Down
4 changes: 1 addition & 3 deletions resources/views/layout/header.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@

<nav class="osu-layout__section osu-layout__section--minimum no-print js-header--main hidden-xs">
<div class="bg u-section-bg">
<div class="bg__triangles bg__triangles--1"></div>
<div class="bg__triangles bg__triangles--2"></div>
<div class="bg__triangles bg__triangles--3"></div>
<div class="bg__triangles"></div>
<div class="bg__gradient-overlay u-section--gradient-down"></div>
</div>

Expand Down
7 changes: 2 additions & 5 deletions resources/views/objects/_logo.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
You should have received a copy of the GNU Affero General Public License
along with osu!web. If not, see <http://www.gnu.org/licenses/>.
--}}
<div href="#" class="logo">
<span class="logo__main logo__main--glow"></span>
<span class="logo__main logo__main--glow logo__main--delayed"></span>
<span class="logo__main logo__main--bounce"></span>
<span class="logo__main logo__main--overlay"></span>
<div class="logo">
<span class="logo__main"></span>
</div>