Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Tom32i
Tom32i committed Apr 3, 2015
2 parents 9acf063 + 0a67919 commit 2910db8
Show file tree
Hide file tree
Showing 17 changed files with 186 additions and 111 deletions.
2 changes: 1 addition & 1 deletion src/client/service/KillLog.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ KillLog.prototype.maxlength = 10;
KillLog.prototype.curvybot = {
name: 'Curvybot',
color: '#ff8069',
icon: 'icon-megaphone'
icon: 'icon-dead'
};

/**
Expand Down
7 changes: 4 additions & 3 deletions src/client/views/game/play.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ <h3 title="{{ game.name }}">{{ game.name }}</h3>
<li ng-repeat="avatar in avatars | orderBy:sortorder" ng-class="{ dead: avatar.alive == false }">
<span class="line-color-preview" style="background-color: {{ avatar.player.color }};"></span>
<span class="local-avatar" style="border-left-color: {{ avatar.player.color }};" ng-if="avatar.local"></span>
<span class="round-points pull-right" ng-if="avatar.roundScore && (!avatar.alive || !game.inRound)">+{{ avatar.roundScore }}</span>
{{ avatar.name }}
<span class="round-points" ng-if="avatar.roundScore && (!avatar.alive || !game.inRound)">+{{ avatar.roundScore }}</span>
<span class="player-name" title="{{ avatar.name }}">{{ avatar.name }}</span>
<span class="score">{{ avatar.score }}</span>
</li>
</ul>
Expand All @@ -38,7 +38,8 @@ <h3 title="{{ game.name }}">{{ game.name }}</h3>
<div class="kill-log-wrapper" ng-include="'js/views/game/kill_log.html'" onload="killLogLoaded()"></div>
</div>
<div class="spectating" ng-if="spectating">
<p><i class="icon-viewer"></i> You are in spectator mode</p>
<h2><i class="icon-viewer"></i> You are in spectator mode</h2>
<p>You must wait the end of the game to join.</p>
</div>
<div class="waiting" ng-if="!game.isReady()">
<p>Waiting for players...</p>
Expand Down
91 changes: 53 additions & 38 deletions src/client/views/profile/profile.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,51 +10,66 @@ <h3 class="title">
<fieldset>
<legend>Player:</legend>

<label for="profile-name">My name:</label>
<input
id="profile-name"
type="text"
ng-blur="profile.persist()"
ng-model="profile.name"
class="form-control"
name="name"
placeholder="Choose a name"
maxlength="{{ nameMaxLength }}"
/>
<div class="form-row">
<div class="col">
<label for="profile-name">My name:</label>
<input
id="profile-name"
type="text"
ng-blur="profile.persist()"
ng-model="profile.name"
class="form-control"
name="name"
placeholder="Choose a name"
maxlength="{{ nameMaxLength }}"
/>
</div>

<label for="profile-color">My color:</label>
<input
id="profile-color"
type="text"
ng-blur="profile.persist()"
colorpicker="hex"
colorpicker-position="right"
ng-model="profile.color"
class="form-control player-color"
name="color"
placeholder="#CCCCCC"
style="border-color: {{ profile.color }};"
maxlength="{{ colorMaxLength }}"
/>
<div class="col">
<label for="profile-color">My color:</label>
<input
id="profile-color"
type="text"
ng-blur="profile.persist()"
colorpicker="hex"
colorpicker-position="bottom"
ng-model="profile.color"
class="form-control player-color"
name="color"
placeholder="#CCCCCC"
style="border-color: {{ profile.color }};"
maxlength="{{ colorMaxLength }}"
/>
</div>
<div class="clearfix"></div>
</div>
</fieldset>

<fieldset>
<legend>Controls:</legend>

<div ng-repeat="control in profile.controls">
<label for="profile-controls-{{ $index }}">{{ control.label }}</label>
<input
id="profile-controls-{{ $index }}"
type="text"
value="{{ control.mapper.view }}"
class="form-control control"
ng-name="control[{{ $index }}]"
ng-focus="control.start()"
ng-blur="control.stop()"
ng-keyup="blurProfile()"
ng-class="{ 'active': control.mapper.listening }"
/>

<div class="form-row">
<div class="col" ng-repeat="control in profile.controls">
<label for="profile-controls-{{ $index }}">{{ control.label }}</label>
<input
id="profile-controls-{{ $index }}"
type="text"
value="{{ control.mapper.view }}"
class="form-control control"
ng-name="control[{{ $index }}]"
ng-focus="control.start()"
ng-blur="control.stop()"
ng-keyup="blurProfile()"
ng-class="{ 'active': control.mapper.listening }"
/>
</div>
<div class="clearfix"></div>
</div>
</fieldset>

<div class="text-center">
<button type="button" class="btn btn-save" ng-click="toggleProfile()"><span>I'm done</span></button>
</div>
</div>
</div>
3 changes: 0 additions & 3 deletions src/client/views/profile/tuto.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
<li class="item final">
You can assign new controls if you're not happy with left and right arrows.
<small>Yep. Console controllers are supported.</small>
<button type="button" class="btn btn-hero" ng-click="closeProfile()">
I'm done!
</button>
</li>
</ul>
</div>
Expand Down
3 changes: 2 additions & 1 deletion src/sass/base/_font.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,5 @@
.icon-megaphone:before { content: '\e811'; } /* '' */
.icon-music:before { content: '\e812'; } /* '' */
.icon-clock:before { content: '\e813'; } /* '' */
.icon-viewer:before { content: '\e815'; } /* '' */
.icon-viewer:before { content: '\e814'; } /* '' */
.icon-dead:before { content: '\e815'; } /* '' */
2 changes: 1 addition & 1 deletion src/sass/base/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,6 @@ $aside-background: $game-background;

$profile-width: 500px;
$profile-background: $background-color;
$profile-border-size: 10px;
$profile-border-size: 5px;

$bonus-size: 46px;
11 changes: 5 additions & 6 deletions src/sass/components/_buttons.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
&.active {
outline: 0;
background-image: none;
@include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
@include box-shadow(none);
}

&.disabled,
Expand Down Expand Up @@ -65,19 +65,18 @@
}

.btn-hero {
@include button-variant($btn-default-color, $btn-default-bg, $btn-default-border);
@include button-variant(#999, $btn-default-bg, #999);
font-size: $base-font-size * 1.5;
font-weight: 300;
font-weight: 400;
@include button-size($padding-base-vertical * 1.5, $padding-base-horizontal * 1.5, $base-font-size * 1.5, $base-line-height * 1.5, $border-radius-base * 1.5);
margin: 40px auto;
display: block;
text-transform: uppercase;

&:hover {
border-color: white;
color: white;
text-decoration: none;
@include horizontal-gradient($header-background-from, $header-background-to);
background: #999;
color: #333;
}
}

Expand Down
1 change: 0 additions & 1 deletion src/sass/helpers/_mixins.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,4 +140,3 @@

background-position: $posX $posY;
}

16 changes: 0 additions & 16 deletions src/sass/layout/_layout.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,22 +52,6 @@ header {
position: relative;
@include gradient($header-background-from, $header-background-to);

// &:after {
// position: absolute;
// left: 0;
// right: 0;
// top: 0;
// bottom: 0;
// z-index: 10;
// content: '';
// }

// &:after {
// @include gradient($header-background-to, $header-background-from);
// @include opacity(0);
// @include animation(headerGradient 10s infinite);
// }

.logo {
z-index: 10;
position: relative;
Expand Down
7 changes: 4 additions & 3 deletions src/sass/pages/_chat.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,20 @@
padding: 15px 0;

&::-webkit-scrollbar {
width: $aside-border-size;
width: $aside-border-size*2;
height: 1px;
border-left: 0;
@include gradient($header-background-from, $header-background-to);
background: transparentize(#FFF, 0.8);
}

&::-webkit-scrollbar-track {
background: none;
}

&::-webkit-scrollbar-thumb {
background: #FFF;
@include gradient($header-background-from, $header-background-to);
border-radius: 0;
cursor: pointer;
}

.welcome {
Expand Down
Loading

0 comments on commit 2910db8

Please sign in to comment.