Skip to content

Commit

Permalink
styling ad place holder, adding smasher.ml placeholder, addint meta d…
Browse files Browse the repository at this point in the history
…ata, adding logo
  • Loading branch information
YannickGibson committed Jul 26, 2020
1 parent 5ec8bc6 commit cd29053
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 17 deletions.
4 changes: 2 additions & 2 deletions app.py
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@ def on_join(data):
car['x'] = (-MAP_SIDE + (MAP_SIDE*2) * random.random())/2
car['y'] = (-MAP_SIDE + (MAP_SIDE*2) * random.random())/2

if data['name'] == "":
car['name'] = "Glidester"
if data['name'] == "": # If name is not defined
car['name'] = "Smasher.ml"
else:
car['name'] = data['name']

Expand Down
49 changes: 36 additions & 13 deletions static/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -21,32 +21,48 @@ body{
display:flex;
align-items: center;
justify-content: center;
flex-direction: column;
}
.imgLogo{
transform: scale(0.5);
}

.menuDiv{
width: 600px;
height: 550px;
background-color: #afafafb0;
border-radius: 10px;
border: 5px #e7e7e7b0 solid;
}
height: 500px;

._adDiv{
background-color:white !important;
width:600px !important;
height:250px !important;
display: block !important;
border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px;

display:flex;
align-items: center;
justify-content: center;
flex-direction: column;
}


.inputDiv{
width:600px;
height:300px;
height:250px;
display:flex;
align-items:center;
justify-content: center;
flex-direction: column;
background-color: #afafafb0;
border-top: 5px #e7e7e7b0 solid;
border-left: 5px #e7e7e7b0 solid;
border-right: 5px #e7e7e7b0 solid;
border-bottom: 5px #e7e7e7b0 solid;
border-radius: 10px;
}

._adDiv{
width:300px ;
height:250px !important;
background-color: #afafafb0;
border-left: 5px #e7e7e7b0 solid;
border-bottom: 5px #e7e7e7b0 solid;
border-right: 5px #e7e7e7b0 solid;
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
}

#name-input{
Expand Down Expand Up @@ -85,6 +101,13 @@ body{

/* Mouse Option */
.mouseOptionDiv{

/* */
/* HIDING THE GODAMN THING*/
visibility: hidden;
/* */
/* */

position: fixed;
right: 0px;
top: 0px;
Expand Down
Binary file added static/images/background/basic_black.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 static/images/gui/smasherml.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 static/images/gui/smasherml_back_white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="Smashr.io is a CRAZY online game, where you can slice enemies in half by your weapon."/>
<meta name="keywords" content="smasherml, smasherio, brutalio, black hole, io, game, games, web game, html5, fun, flash">
<meta name="title" content="Smasher.ml">
<meta name="description" content="Smasher.ml is a CRAZY online game, where you can slice enemies in half by your weapon."/>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@500&display=swap" rel="stylesheet">
<link rel="stylesheet" href="{{ url_for('static', filename='css/main.css') }}">
Expand Down
3 changes: 2 additions & 1 deletion templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@

{% block body %}
<div id='overlay'>
<img class="imgLogo" src="{{ url_for('static', filename='images/gui/smasherml.png') }}"/>
<div class='menuDiv'>
<div class='inputDiv'>
<input id='name-input' name="savenick" type='username' maxlength="10">
<input id='name-input' name="savenick" type='username' maxlength="10" placeholder="Smasher.ml">
<input id='nameButton' value='Start' type='button'>
</div>
<div class='_adDiv'>
Expand Down

0 comments on commit cd29053

Please sign in to comment.