Skip to content
This repository was archived by the owner on Sep 7, 2025. It is now read-only.

Merge #22

Open
svovik1 wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Merge #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6e9c9bd
Merge pull request #8 from dimasmith/master
svovik1 Jan 16, 2014
bcce75a
Mini update
svovik1 Jan 16, 2014
62ca1e2
Add Coma ))
svovik1 Jan 16, 2014
77ab5c3
Добавил отступы между колонками
svovik1 Jan 17, 2014
97167d8
Update
svovik1 Jan 17, 2014
ae6342c
Fix Dropdowns
svovik1 Jan 17, 2014
6cfe863
Format Rules Text
svovik1 Jan 20, 2014
7cc24a9
RC1
svovik1 Mar 18, 2014
3dfc6f5
fix notification on game won
dimasmith Mar 18, 2014
d942b46
Show disasters message on BT Modal
ptrizna Mar 18, 2014
a70c3e7
Fix modal
ptrizna Mar 18, 2014
0bebd8a
gh-9: Game history tracker class
dimasmith Mar 20, 2014
f537bca
gh-9: history refreshed in onGameOver callback
dimasmith Mar 20, 2014
ff5c995
gh-9: History data passed. History propagated to onGameOver method of…
dimasmith Mar 20, 2014
b18944d
Merge with latest changes
dimasmith Mar 20, 2014
d9e0da9
Add simple statictic-view on Front page
ptrizna Mar 23, 2014
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
72 changes: 70 additions & 2 deletions public_html/css/game.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ body {
}
/* line 34, C:\Users\Dmytro\Documents\NetBeansProjects\GameProto\public_html\less\game.less */
@media -sass-debug-info{filename{font-family:file\:\/\/C\:\/Users\/Dmytro\/Documents\/NetBeansProjects\/GameProto\/public_html\/less\/game\.less}line{font-family:\0000334}}
.score-bar ul li {
.score-bar ul li.score-item {
border: 1px solid #a9a9a9;
padding: 10px;
padding: 7px;
border-radius: 5px;
display: inline-block;
font-weight: bold;
Expand Down Expand Up @@ -116,6 +116,7 @@ body {
.controls {
/*clear: both;*/
text-align: center;
margin-bottom: 5px;
}
.game-state-dioxide.badge {
background-color: #000;
Expand Down Expand Up @@ -163,8 +164,75 @@ body {
.rating-desc .progress .progress-bar { width: 100%;}
/* End Of NewCards */

.game-move-number.badge.active {
background-color: #428BCA;
}

/*Temporary hide description, until delete it from function*/
.card-description {
display: none;
}

.game-screen {display:none;}
.avatar {
width: 141px;
height: 141px;
margin: 0 auto 20px auto;
}
.avatar.active {
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 8px rgba(102, 175, 233, 0.6);
border-color: #66AFE9;
}
.user-info .avatar {
margin-bottom: 0;
width: 70px;
height: 70px;
background-size: 100% 100% !important;
}
.avatar.av-1 {
background: url(../static/images/av1.png) no-repeat center center;
}
.avatar.av-2 {
background: url(../static/images/av2.png) no-repeat center center;
}
.avatar.av-3 {
background: url(../static/images/av3.png) no-repeat center center;
}
.avatar.av-4 {
background: url(../static/images/av4.png) no-repeat center center;
}
.avatar.av-5 {
background: url(../static/images/av5.png) no-repeat center center;
}
.avatar.av-6 {
background: url(../static/images/av6.png) no-repeat center center;
}
.select-country {
display: inline-block;
}
.dropdown ul li {
text-align: left;
}

.input-group.username {
margin-bottom: 10px;
}

#starting.preload {
background-image: url(../static/images/preload.gif);
background-repeat: no-repeat;
background-position: center center;
}
#starting.preload > .row {
visibility: hidden;
}
.game-move-complete {
position: relative;
z-index: 1;
}
.foot-logo {
max-height: 50px;
}
.foot-logos {
max-width: 480px;
}
183 changes: 163 additions & 20 deletions public_html/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,59 +10,200 @@

<script data-main="js/config.js" src="js/libs/require.js"></script>
</head>
<body>
<div class="game-screen">
<body>
<div class="welcome-screen clearfix col-xs-12">
<div class="well preload" id="starting">

<div class="row">
<div class="select-avatar col-sm-6">
<div class="row">
<div class="col-xs-12 controls"><h4 class="i18n">Start Game</h4></div>
</div>
<div class="row">
<div class="col-xs-6 col-sm-6 col-md-4 col-lg-4"><div class="avatar av-1" data-avatar="av-1"></div></div>
<div class="col-xs-6 col-sm-6 col-md-4 col-lg-4"><div class="avatar av-2" data-avatar="av-2"></div></div>
<div class="col-xs-6 col-sm-6 col-md-4 col-lg-4"><div class="avatar av-3" data-avatar="av-3"></div></div>
<div class="col-xs-6 col-sm-6 col-md-4 col-lg-4"><div class="avatar av-4" data-avatar="av-4"></div></div>
<div class="col-xs-6 col-sm-6 col-md-4 col-lg-4"><div class="avatar av-5" data-avatar="av-5"></div></div>
<div class="col-xs-6 col-sm-6 col-md-4 col-lg-4"><div class="avatar av-6" data-avatar="av-6"></div></div>
</div>

<div class="row">

<div class="col-md-4 col-sm-12">
<div class="input-group username">
<span class="input-group-addon">@</span>
<input type="text" class="form-control" placeholder="Ім'я">
</div>
</div>
<div class="col-md-4 col-xs-6">
<div class="controls">
<div class="dropdown select-country controls">
<button class="btn dropdown-toggle btn-default" type="button" id="dropdownMenu1" data-toggle="dropdown">
<span class="i18n">Select region</span>
<span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu1">
<li role="presentation"><a role="menuitem" tabindex="-1" href="#"><span class="i18n">Australia</span></a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#"><span class="i18n">Asia</span></a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#"><span class="i18n">Africa</span></a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#"><span class="i18n">Europe</span></a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#"><span class="i18n">North America</span></a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="#"><span class="i18n">South America</span></a></li>
</ul>
</div>
</div>
</div>

<div class="col-md-4 col-xs-6">
<div class="controls">
<button type="button" class="btn btn-primary start-game i18n disabled">Start Game</button>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<div class="controls">
<a href="static/resources/rules_uk.htm" data-toggle="modal" data-target="#modalWindowrules" class="i18n btn btn-default">Rules of Game</a>
</div>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="row">
<div class="col-xs-12"><img src="static/images/logo.jpg" class="center-block img-responsive" width="390" height="390" /></div>
</div>
<div class="row">
<div class="col-xs-6">
<div class="controls">
<a href="static/resources/climat_uk.htm" data-toggle="modal" data-target="#modalWindowclimate" class="i18n btn btn-default">Сlimate Change</a>
</div>
</div>
<div class="col-xs-6">
<div class="controls">
<a href="static/resources/vocabulary_uk.htm" data-toggle="modal" data-target="#modalWindowvoc" class="i18n btn btn-default">Vocabulary</a>
</div>
</div>
</div>
</div>
</div>


</div>


</div>
<div class="game-screen clearfix">
<div class="score-bar well">
<div class="col-lg-5 col-md-6 col-sm-8 col-xs-9">
<div class="col-lg-5 col-md-5 col-sm-8 col-xs-9">
<span class="i18n">Step: </span>
<span class="game-move-number badge"></span>
<span class="game-move-number badge">1</span>
<span class="game-move-number badge">2</span>
<span class="game-move-number badge">3</span>
<span class="game-move-number badge">4</span>
<span class="game-move-number badge">5</span>

<ul>
<li title="Money" class="i18n-title"><span class="glyphicon glyphicon-usd"></span>
<li title="Money" class="i18n-title score-item"><span class="glyphicon glyphicon-usd"></span>
<span class="game-state-money badge"></span></li>
<li title="Energy" class="i18n-title"><span class="glyphicon glyphicon-flash"></span>
<li title="Energy" class="i18n-title score-item"><span class="glyphicon glyphicon-flash"></span>
<span class="game-state-energy badge"></span></li>
<li title="Water" class="i18n-title"><span class="glyphicon glyphicon-tint"></span>
<li title="Water" class="i18n-title score-item"><span class="glyphicon glyphicon-tint"></span>
<span class="game-state-water badge"></span></li>
<li title="Food" class="i18n-title"><span class="glyphicon glyphicon-cutlery"></span>
<li title="Food" class="i18n-title score-item"><span class="glyphicon glyphicon-cutlery"></span>
<span class="game-state-food badge"></span></li>
<li title="Dioxide" class="i18n-title"><span class="glyphicon glyphicon-cloud"></span>
<li title="Dioxide" class="i18n-title score-item"><span class="glyphicon glyphicon-cloud"></span>
<span class="game-state-dioxide badge"></span></li>
</ul>
</div>
<div class="controls col-lg-2 col-md-6 col-sm-4 col-xs-3">
<div class="controls col-lg-2 col-md-2 col-sm-4 col-xs-3">
<button class="game-move-complete btn btn-primary btn-lg i18n">Complete move</button>
</div>
<div class="col-lg-5 col-md-12 col-sm-12"></div>
<div class="col-lg-5 col-md-5 col-sm-12">
<div class="row user-info">
<div class="col-xs-9">
<div class="row">
<nav class="col-xs-12">
<ul class="nav nav-pills pull-right">
<li><a href="index.html" class="i18n">Home</a></li>
<li><a href="static/resources/rules_uk.htm" data-toggle="modal" data-target="#modalWindowrules" class="i18n">Rules</a></li>
</ul>
</nav>
</div>
<div class="row">
<div class="user-info col-xs-12">
<div class="user-name pull-right">
<span class="glyphicon glyphicon-user"></span>
<span class="name"></span>
</div>
</div>

</div>
</div>
<div class="col-xs-3"><div class="avatar"></div></div>
</div>

</div>
<div class="clear"></div>
</div>

<div class="game-alert notification"></div>
<div class="game-alert notification alert container"></div>

<div class="game-disaster notification alert">
<h2 class="game-disaster-name"></h2>
<span class="game-disaster-description"></span>
</div>

<div class="well col-md-6 col-sm-6">
<h3 class="i18n">Available cards</h3>
<div class="game-available-cards"></div>
<div class="col-md-6 col-sm-6">
<div class="well clearfix">
<h3 class="i18n">Available cards</h3>
<div class="game-available-cards"></div>
</div>
</div>

<div class="well col-md-6 col-sm-6">
<h3 class="i18n">Cards in use</h3>
<div class="game-cards-on-hands"></div>
<div class="col-md-6 col-sm-6">
<div class="well clearfix">
<h3 class="i18n">Cards in use</h3>
<div class="game-cards-on-hands"></div>
</div>
</div>

</div>

<div class="hidden game-result-screen">
<div class="game-over jumbotron">
<h1 class="i18n">Game Over</h1>
<h1 class="game-result alert"></h1>
<h1 class="game-result alert i18n"></h1>
<p class="game-result-reason alert"></p>
<button class="game-restart btn btn-primary btn-large i18n" onclick="javascript:document.location.reload();">Restart Game</button>
</div>
</div>

<footer class="col-xs-12"><div class="well"><div class="center-block foot-logos">
<div class="row">
<div class="col-xs-3"><div class="row">
<div class="col-xs-6"><img src="static/images/logo_01.jpg" class="img-responsive foot-logo center-block" /></div>
<div class="col-xs-6"><img src="static/images/logo_02.jpg" class="img-responsive foot-logo center-block" /></div>
</div></div>
<div class="col-xs-3"><div class="row">
<div class="col-xs-6"><img src="static/images/logo_03.jpg" class="img-responsive foot-logo center-block" /></div>
<div class="col-xs-6"><img src="static/images/logo_04.jpg" class="img-responsive foot-logo center-block" /></div>
</div></div>
<div class="col-xs-3"><div class="row">
<div class="col-xs-6"><img src="static/images/logo_05.jpg" class="img-responsive foot-logo center-block" /></div>
<div class="col-xs-6"><img src="static/images/logo_06.jpg" class="img-responsive foot-logo center-block" /></div>
</div></div>
<div class="col-xs-3"><div class="row">
<div class="col-xs-6"><img src="static/images/logo_07.jpg" class="img-responsive foot-logo center-block" /></div>
<div class="col-xs-6"><img src="static/images/logo_08.jpg" class="img-responsive foot-logo center-block" /></div>
</div></div>
</div>
<div class="row copyright">
<div class="col-xs-12 controls">
<span class="i18n">Created by</span> <a href="http://divilon.com" target="_blank" title="IT-Studio Divilon">Divilon</a>
</div>
</div>
</div></div></footer>

<script id="card-template" type="text/html">
<div class="card col-xs-12 col-md-12 col-lg-6 well well-sm">
Expand Down Expand Up @@ -125,6 +266,8 @@ <h1 class="game-result alert"></h1>
</div>
</div>
</script>

<div class="modal fade" id="modalWindowrules" role="dialog" aria-labelledby="ModalLabel" aria-hidden="true"></div>
<div class="modal fade" id="modalWindowclimate" role="dialog" aria-labelledby="ModalLabel" aria-hidden="true"></div>
<div class="modal fade" id="modalWindowvoc" role="dialog" aria-labelledby="ModalLabel" aria-hidden="true"></div>
</body>
</html>
Loading