Skip to content

Minor styling #73

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

Open
93786 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Minor styling #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
519e742
minor spacing on hi scores
tlantz77 Jun 30, 2016
2ad646a
still on minor styling
tlantz77 Jul 1, 2016
a7820e1
Merge branch 'master' into minor-styling
tlantz77 Jul 1, 2016
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
51 changes: 37 additions & 14 deletions app/assets/stylesheets/customUI.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,43 @@
margin: 5px 5px 0px 0px;
}

#welcome-user-box {
float: left;
margin-right: 5px;
display: inline-block;

}

#logout-button-box {
float:left;
display: inline-block;

}

#logout-button {
height: 18px;
margin: -3px;
}

#instruction-button-box {
margin: -10px 0px 0px 5px;
display: inline-block;
}

#hint_button {
height: 18px;
}

#mute-button-box {
float: right;
display: inline-block;
height
}

#map-mute-button {
height: 10px;
}

#sidebar {
z-index: 1000;
position: fixed;
Expand Down Expand Up @@ -68,17 +105,3 @@
animation-iteration-count: infinite;
animation-direction: alternate;
}

#welcome-user-box {
float: left;
margin-right: 5px;
}

#logout-button-box {
float: right;
}

#logout-button {
height: 18px;
margin: -3px;
}
10 changes: 4 additions & 6 deletions app/assets/stylesheets/splashpage.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@ button, input {
border: none;
}

#mute_button, #hint_button {
float: right;
top: 0;
}

h1 {
color: white;
font-smooth: never;
Expand Down Expand Up @@ -82,12 +77,15 @@ h1 {
}

.high-scores-head {
margin-bottom: 15px;
position: block;
width: 100%;
}

.high-score-container li {
text-align: left;
margin-left: 40%;
width: 50%;
margin-left: 40%;
margin-bottom: 10px;
font-size: 1.1em;
}
14 changes: 11 additions & 3 deletions app/views/layouts/_customUI.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<div id="title-box" class="ui-box">
</div>
</td>

<td>
<div id="user-info-box" class="ui-box">
<% if logged_in? %>
Expand All @@ -15,11 +16,18 @@
<button type="submit" class="minigame-buttons" id="logout-button">LOGOUT</button>
</form>
</div>
<div id="instruction-button-box">
<form><input type="submit" id="hint_button" value="INSTRUCTIONS"></form>
</div>
<div id="mute-button-box">
<form><input type="image" src="<%= asset_path('mute.png') %>" id="map-mute-button" value=""></form>
</div>
<% end %>

<form><input type="image" src="<%= asset_path('mute.png') %>" id="mute_button" value=""></form>
<form><input type="submit" id="hint_button" value="instructions"></form>
</div>
</td>



</tr>
</div>
</table>
Expand Down