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.

Sign up for GitHub

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

Jump to bottom

Added modifications needed for 24 timetable. #99

Merged
merged 2 commits into from
Mar 28, 2024
Merged

Added modifications needed for 24 timetable. #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa3bb8d
Added modifications needed for 24 timetable.
jiisloth Mar 27, 2024
59a9029
Swap media queries for media-breakpoint mixins
Uular Mar 28, 2024
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
4 changes: 4 additions & 0 deletions static/vauhtijuoksu2024/css/full.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

body{
background: url("../img/fullbg1.png");
}
167 changes: 158 additions & 9 deletions static/vauhtijuoksu2024/css/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ $incentive-closed-text-color: $grey;
$incentive-copy-button-color: $green;
$incentive-copy-button-hover-color: $lightgreen;
$incentive-popup-bg-color: $blue;



@import "static/css/base";


Expand Down Expand Up @@ -116,17 +119,22 @@ input[type='checkbox'] {
width: 20px;
height: 20px;
}

.header-logo-padded{
.widelogoholder{
width: 100%;
padding: 30px;
max-height: 200px;
text-align: center;
}
.header-logo-padded{
max-height: 200px;
max-width: 100%;
}
.header{
width: 100%;
background: url("../img/header.png");
}
.container{
padding: 0;
max-width: 1200px;
}
.timetable .ttplay .playblob .timetable-char {
display: flex;
Expand Down Expand Up @@ -162,7 +170,7 @@ input[type='checkbox'] {
}
.tabletimetable .tttcontent .tttday .tttgame:hover .tttimg > img {
width: 500%;
margin-right: -30px;
margin-right: -20px;
transform: scaleX(1);
}
.tabletimetable .tttcontent .tttday .tttgame > div {
Expand All @@ -174,7 +182,7 @@ input[type='checkbox'] {
width: 100%;
}
.tabletimetable .tttcontent .tttday .tttgame .tttimg {
width: 56px;
width: 64px;
}
.menu-wrapper {
padding-bottom: 20px;
Expand Down Expand Up @@ -213,14 +221,42 @@ h1, h2, h3, h4, .playdate, .playgame{
font-size: 26px;
line-height: 44px;
}
.timetable .ttplay .playblob .timetable-char img.char{
z-index: 0;
width: 110%;
margin-top: -40px;
}
.timetable .ttplay .playright .playgame {
font-size: 1.6rem;
line-height: 1.5rem;
}

.timetable .ttplay .playright {
text-shadow: -1px -1px 0 $blue, 1px -1px 0 $blue, -1px 1px 0 $blue, 1px 1px 0 $blue;
z-index: 10;
}
.timetable .ttplay .playleft {
text-shadow: -1px -1px 0 $blue, 1px -1px 0 $blue, -1px 1px 0 $blue, 1px 1px 0 $blue;
z-index: 10;
}
.timetable .ttplay .playblob {
display: flex;
width: 20%;
}
.timetable .ttplay:nth-child(odd) .playblob .timetable-char img.char {
margin-left: -50px;
}
.timetable .ttplay:nth-child(even) .playblob .timetable-char img.char {
margin-left: 30px;
}

.full > .bar-text{
color: $donate-bar-text-color-full;
}

.overflower {
width: 130%;
margin: 0 -15%;
width: 132%;
margin: 0 -16%;
}
.header-logo{
width: 100%;
Expand All @@ -241,12 +277,125 @@ h1, h2, h3, h4, .playdate, .playgame{
padding: 0 24% 60px 24%;
margin: 0;
}

.twitch-link .twitch-icon {
margin-top: -25px;
margin-left: -5px;
}
body{
overflow-x: hidden;
background-position: top center;
background-repeat: repeat;
}
footer{
margin-top: -60px;
}
}
.tabletimetable .tttcontent .tttday .tttgame {
background-color: $darkblue;
border-color: $darkblue;
}
.tabletimetable .tttcontent .tttday .tttgame:hover > div{
background-color: $blue;
border-color: $darkblue;
}
@include media-breakpoint-down(sm) {
.timetable .ttplay .playright .playgame {
font-size: 1.1rem;
line-height: 1.0rem;
}
.timetable .ttplay .playdate {
font-size: 1.5rem;
}
.timetable .ttplay .playblob {
display: flex;
width: 18%;
}
.timetable .ttplay:nth-child(odd) .playblob .timetable-char img.char {
margin-left: -50px;
}
.timetable .ttplay:nth-child(even) .playblob .timetable-char img.char {
margin-left: -10px;
}
.timetable .ttplay .playblob .timetable-char img.char {
margin-top: 0px;
}

.content{
padding: 0 20% 60px 20% !important;
}
}

@include media-breakpoint-up(sm) {
.timetable .ttplay .playright .playgame {
font-size: 1.1rem;
line-height: 1.0rem;
}
.timetable .ttplay .playdate {
font-size: 1.5rem;
}
.timetable .ttplay .playblob {
display: flex;
width: 18%;
}
.timetable .ttplay:nth-child(odd) .playblob .timetable-char img.char {
margin-left: -50px;
}
.timetable .ttplay:nth-child(even) .playblob .timetable-char img.char {
margin-left: -10px;
}
.timetable .ttplay .playblob .timetable-char img.char {
margin-top: 0px;
}
}
@include media-breakpoint-down(md) {
.menu{
font-size: 28px !important;
}
body{
font-size: 0.8rem !important;
}
.donate-bar .bar-done {
display: none !important;
}
.content{
padding: 0 22% 60px 22% !important;
}
}

@include media-breakpoint-up(md) {
.timetable .ttplay .playright .playgame {
font-size: 1.3rem;
line-height: 1.2rem;
}
.timetable .ttplay .playdate {
font-size: 2.5rem;
}
.timetable .ttplay .playblob {
display: flex;
width: 18%;
}
.timetable .ttplay:nth-child(odd) .playblob .timetable-char img.char {
margin-left: -40px;
}
.timetable .ttplay:nth-child(even) .playblob .timetable-char img.char {
margin-left: 10px;
}
}

@include media-breakpoint-up(lg) {
.timetable .ttplay .playright .playgame {
font-size: 1.5rem;
line-height: 1.4rem;
}
.timetable .ttplay .playdate {
font-size: 3rem;
}
.timetable .ttplay:nth-child(odd) .playblob .timetable-char img.char {
margin-left: -40px;
}
.timetable .ttplay:nth-child(even) .playblob .timetable-char img.char {
margin-left: 20px;
}
.timetable .ttplay .playblob .timetable-char img.char {
margin-top: -25px;
}
}
Binary file added static/vauhtijuoksu2024/img/char/Viuhtiseikailuverr3.png
View file
Open in desktop
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 static/vauhtijuoksu2024/img/char/viuhtitasohyppelyver3.png
View file
Open in desktop
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 static/vauhtijuoksu2024/img/fullbg1.png
View file
Open in desktop
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 static/vauhtijuoksu2024/img/logo_on_line.png
View file
Open in desktop
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 static/vauhtijuoksu2024/img/twitch.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion templates/vauhtijuoksu/plugins/tabletimetable.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
{% for game in day %}
<div class="tttgame {{ game.cut_style }}" style="top: {{ game.start_percent }}%; bottom: {{ game.end_percent }}%">
<div>
<div class="tttimg"><img src="{% static "vauhtijuoksu2023/img/char/"|add:game.img_filename %}"></div>
<div class="tttimg"><img src="{% static "vauhtijuoksu2024/img/char/"|add:game.img_filename %}"></div>
<div>
<p>
{{ game.game }}
Expand Down
2 changes: 1 addition & 1 deletion templates/vauhtijuoksu/plugins/timetable.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</div>
<div class="playblob">
<div class="timetable-char">
<img class="char" src="{% static "vauhtijuoksu2023/img/char/"|add:game.img_filename %}">
<img class="char" src="{% static "vauhtijuoksu2024/img/char/"|add:game.img_filename %}">
</div>
</div>
<div class="playright">
Expand Down
5 changes: 4 additions & 1 deletion templates/vauhtijuoksu/vj2024_fullscreen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@
{% block body %}
{% addtoblock "css" %}<link href='https://fonts.googleapis.com/css?family=Share Tech Mono' rel='stylesheet'>{% endaddtoblock %}
{% addtoblock "css" %}<link href="{% sass_src 'vauhtijuoksu2024/css/style.scss' %}" rel="stylesheet" type="text/css">{% endaddtoblock %}
{% addtoblock "css" %}<link href="{% sass_src 'vauhtijuoksu2024/css/full.scss' %}" rel="stylesheet" type="text/css">{% endaddtoblock %}
{% addtoblock "js" %}<script src="{% static 'bootstrap.min.js' %}"></script>{% endaddtoblock %}
{% addtoblock "js" %}<script src="{% static "vauhtijuoksu2024/js/script.js" %}"></script>{% endaddtoblock %}
<div class="widelogoholder">
<img src="{% static 'vauhtijuoksu2024/img/logo_on_line.png' %}" class="header-logo-padded">

<img src="{% static 'vauhtijuoksu2024/img/logo.png' %}" class="header-logo-padded">
</div>
<div id="fs-container">
<div class="full-content">
<div class="menu-wrapper">
Expand Down
Loading