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

#156100323 Make font family consistent for all modals #32

Merged
merged 5 commits into from
Apr 27, 2018
Merged

#156100323 Make font family consistent for all modals #32

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5852de1
change font-size and close modal buttons for consistency
Efosaok Apr 26, 2018
b8c1351
Merge branch 'feature/156100323/peer-to-peer-invites' of https://gith…
Efosaok Apr 26, 2018
b9c563a
fix merge conflicts
Efosaok Apr 26, 2018
ed5f728
change font family of modals
Efosaok Apr 26, 2018
231d05e
Merge branch 'develop' into feature/156100323/peer-to-peer-invites
Efosaok Apr 27, 2018
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
46 changes: 15 additions & 31 deletions public/views/app.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h4 id="startH4">Would you like to start the game?</h4>
<div class="modal-content animated rollIn" style="height:280px">
<div style="float: right; color: #2E112D; font-weight: bold; font-size: 28px;margin-top: -20px" ng-click="closeSearchModal()">&times;</div>
<div class="modal-header">
<h4 class="modal-title center-align" style="color: #2E112D; font-family: Allerta Stencil">Invite Friends</h4>
<h4 class="modal-title center-align" style="color: #2E112D">Invite Friends</h4>
</div>
<div class="modal-body" style="text-align: center">
<form class="form-inline">
Expand Down Expand Up @@ -110,61 +110,45 @@ <h4 class="modal-title center-align" style="color: #2E112D; font-family: Allerta
</div>
</div>
</div>
</div>
<div id="game-already-started-modal" class="modal animated rollIn" style="z-index: 1000; margin-top: 0px; height: 300px">
<div class="modal-dialog modal-sm">
</div>
<div id="game-already-started-modal" class="modal animated rollIn" style="z-index: 1000; margin-top: 0px; height: 270px">
<div class="modal-dialog modal-sm">
<!-- Modal content-->
<div class="modal-content animated rollIn" style="background-color: white;">
<div class="modal-header">
<h4 class="modal-title center-align" style="color: #2E112D; font-family: Allerta Stencil">MAXIMUM PLAYERS REACHED</h4>
<h4 class="modal-title center-align" style="color: #2E112D">MAXIMUM PLAYERS REACHED</h4>
</div>
<div class="modal-body" style="text-align: center; margin-top: 10px" style="font-size: 1.8em; padding-left: 30px; padding-right: 20px;">
<p style="font-family: 'Nova Flat'; font-size: 1.2em;">Hi!, The game You want to join has reached it's maximum player
<br>limit,but you can still join the general game,
<br>click join if you want to do just that</p>
<p style="font-size: 1.2em;">Hi!, The game You want to join has reached it's maximum player<br>limit,but you can still join the general game,<br>click join if you want to do just that</p>
</div>
<div class="center-align">
<a class="btn waves-effect" style="background-color: #540032; font-family: 'Nova Flat'" href="/play">JOIN</a>
<a class="btn waves-effect waves-green" style="background-color: #540032; font-family: 'Nova Flat'" href="/play">JOIN</a>
<button type="button" class="btn waves-effect" data-dismiss="modal" style="background-color: #540032" ng-click="abandonGame()">no, THANKS</button>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn waves-effect" data-dismiss="modal" style="background-color: #540032; font-family: Allerta Stencil"
ng-click="abandonGame()">no, THANKS</button>
</div>
</div>
</div>
<div id="cannot-start-game-modal" class="modal animated rollIn" style="z-index: 1000; margin-top: 0px; height: 280px">
<div id="cannot-start-game-modal" class="modal animated rollIn" style="z-index: 1000; margin-top: 0px; height: 250px">
<div class="modal-dialog modal-sm">
<!-- Modal content-->
<div class="modal-content animated rollIn" style="background-color: white;">
<div style="float: right; color: #2E112D; font-weight: bold; font-size: 28px;margin-top: -20px" ng-click="closeCannotStartGameModal()">&times;</div>
<div class="modal-header">
<h4 class="modal-title center-align" style="color: #2E112D; font-family: Allerta Stencil">NOT ENOUGH PLAYERS</h4>
<h4 class="modal-title center-align" style="color: #2E112D">NOT ENOUGH PLAYERS</h4>
</div>
<div class="modal-body" style="text-align: center; margin-top: 10px" style="font-size: 1.8em; padding-left: 30px; padding-right: 20px;">
<p style="font-family: 'Nova Flat'; font-size: 1.2em;">Hi!, The game cannot start now because
<br>the number of players is not yet up to
<br>three, Please wait or invite Friends</p>
</div>
<div class="modal-footer">
<button type="button" class="btn waves-effect" data-dismiss="modal" style="background-color: #540032; font-family: Allerta Stencil"
ng-click="closeCannotStartGameModal()">ok, THANKS</button>
<p style=" font-size: 1.2em;">Hi!, The game cannot start now because<br>the number of players is not yet up to<br>three, Please wait or invite Friends</p>
</div>
</div>
</div>
</div>
</div>
<div class="col s12">
<answers></answers>
</div>
<div class="col s12 l3 ">
<scoreboard></scoreboard>
</div>
</div>
<div class="col s12 l3 ">
<scoreboard></scoreboard>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>