Skip to content
This repository was archived by the owner on Mar 10, 2019. It is now read-only.

Commit 3c06e1e

Browse files
devgianludevgianlu
committed
Merge branch 'develop'
2 parents f4b3d95 + 7ecfbae commit 3c06e1e

31 files changed

+280
-134
lines changed

‎WebContent/cardcast/index.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta name="viewport" content="width=device-width, initial-scale=1.0">
55
<title>Cardcast - PYX-Reloaded</title>
6-
<link rel="stylesheet" href="//unpkg.com/material-components-web@0.30.0/dist/material-components-web.min.css">
6+
<link rel="stylesheet" href="//unpkg.com/material-components-web@0.32.0/dist/material-components-web.min.css">
77
<link rel="stylesheet" href="//fonts.googleapis.com/icon?family=Material+Icons">
88
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:300,400,500">
99
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css">
@@ -18,7 +18,7 @@
1818
</head>
1919
<body class="mdc-typography">
2020
<div class="page-content">
21-
<header class="mdc-toolbar mdc-toolbar--fixed mdc-elevation--z4">
21+
<header class="mdc-toolbar mdc-toolbar--fixed">
2222
<div class="mdc-toolbar__row">
2323
<section class="mdc-toolbar__section mdc-toolbar__section--align-start">
2424
<span class="mdc-toolbar__title">Cardcast - PYX Reloaded</span>
@@ -27,15 +27,15 @@
2727
<section class="mdc-toolbar__section">
2828
<div class="mdc-text-field mdc-text-field--dense" data-mdc-auto-init="MDCTextField">
2929
<input type="text" id="cardcastSearch" class="mdc-text-field__input">
30-
<label class="mdc-text-field__label" for="cardcastSearch">Search</label>
30+
<label class="mdc-floating-label" for="cardcastSearch">Search</label>
3131
<i class="material-icons mdc-text-field__icon" tabindex="0" onclick="submitSearch();">search</i>
3232
<div class="mdc-line-ripple"></div>
3333
</div>
3434
</section>
3535

3636
<section class="mdc-toolbar__section mdc-toolbar__section--align-end">
3737
<div class="mdc-menu-anchor">
38-
<button class="material-icons align-icons mdc-toolbar__icon" onclick="showCardcastMenu();">
38+
<button class="material-icons mdc-toolbar__icon" onclick="showCardcastMenu();">
3939
filter_list
4040
</button>
4141
<div class="mdc-menu" id="cardcastMenu" tabindex="-1">
@@ -184,7 +184,7 @@ <h2 class="mdc-typography mdc-typography--display1 _responses">Responses</h2>
184184

185185
<script src="//code.jquery.com/jquery-latest.min.js"></script>
186186
<script src="//cdnjs.cloudflare.com/ajax/libs/list.js/1.5.0/list.min.js"></script>
187-
<script src="//unpkg.com/material-components-web@0.30.0/dist/material-components-web.min.js"></script>
187+
<script src="//unpkg.com/material-components-web@0.32.0/dist/material-components-web.min.js"></script>
188188
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery-bar-rating/1.2.2/jquery.barrating.min.js"></script>
189189
<script src="//cdnjs.cloudflare.com/ajax/libs/noty/3.1.4/noty.min.js"></script>
190190
<script src="/js/communication.helper.js"></script>

‎WebContent/chat/index.html‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta name="viewport" content="width=device-width, initial-scale=1.0">
55
<title>Global chat - PYX-Reloaded</title>
6-
<link rel="stylesheet" href="//unpkg.com/material-components-web@0.30.0/dist/material-components-web.min.css">
6+
<link rel="stylesheet" href="//unpkg.com/material-components-web@0.32.0/dist/material-components-web.min.css">
77
<link rel="stylesheet" href="//fonts.googleapis.com/icon?family=Material+Icons">
88
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:300,400,500">
99
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/noty/3.1.4/noty.min.css"/>
@@ -15,7 +15,7 @@
1515
</head>
1616
<body class="mdc-typography">
1717
<div class="page-content">
18-
<header class="mdc-toolbar mdc-toolbar--fixed mdc-elevation--z4">
18+
<header class="mdc-toolbar mdc-toolbar--fixed">
1919
<div class="mdc-toolbar__row">
2020
<section class="mdc-toolbar__section mdc-toolbar__section--align-start">
2121
<span class="mdc-toolbar__title">Global chat - PYX Reloaded</span>
@@ -25,12 +25,11 @@
2525

2626
<main class="mdc-toolbar-fixed-adjust">
2727
<h1 class="mdc-typography--display1 message" style="margin-top: 48px">There are no messages.</h1>
28-
<ul class="mdc-list mdc-list--avatar-list list">
29-
</ul>
28+
<ul class="mdc-list mdc-list--avatar-list list"></ul>
3029
<div class="mdc-text-field mdc-text-field--outlined mdc-text-field--with-trailing-icon"
3130
data-mdc-auto-init="MDCTextField">
3231
<input type="text" id="chatMessage" class="mdc-text-field__input">
33-
<label for="chatMessage" class="mdc-text-field__label">Message</label>
32+
<label for="chatMessage" class="mdc-floating-label">Message</label>
3433
<i class="material-icons mdc-text-field__icon" tabindex="0">send</i>
3534
<div class="mdc-text-field__outline">
3635
<svg>
@@ -54,7 +53,7 @@ <h1 class="mdc-typography--display1 message" style="margin-top: 48px">There are
5453

5554
<script src="//code.jquery.com/jquery-latest.min.js"></script>
5655
<script src="//cdnjs.cloudflare.com/ajax/libs/list.js/1.5.0/list.min.js"></script>
57-
<script src="//unpkg.com/material-components-web@0.30.0/dist/material-components-web.min.js"></script>
56+
<script src="//unpkg.com/material-components-web@0.32.0/dist/material-components-web.min.js"></script>
5857
<script src="//cdnjs.cloudflare.com/ajax/libs/noty/3.1.4/noty.min.js"></script>
5958
<script src="/js/events.helper.js"></script>
6059
<script src="/js/communication.helper.js"></script>

‎WebContent/chat/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class ChatManager {
4848

4949
sendGameChatMessage(msg) {
5050
Requester.request("c", {"m": msg}, () => {
51-
this._chatMessage.next().removeClass("mdc-text-field__label--float-above");
51+
this._chatMessage.next().removeClass("mdc-floating-label--float-above");
5252
this._chatMessage.val("");
5353
this._chatMessage.blur();
5454
}, (error) => {

‎WebContent/css/pyx-reloaded.css‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,20 @@
2929
vertical-align: -12% !important;
3030
}
3131

32+
/* Margin in drawer in list items */
33+
.mdc-drawer__drawer .mdc-list-item > .mdc-list-item__start-detail {
34+
margin-right: 8px;
35+
}
36+
37+
/* Toolbar icons fix */
38+
button.mdc-toolbar__icon {
39+
box-sizing: content-box;
40+
}
41+
42+
button.mdc-toolbar__menu-icon {
43+
box-sizing: content-box;
44+
}
45+
3246
/* Hide stuff in toolbar on mobile */
3347
.mdc-toolbar ._refresh, .mdc-toolbar ._themingDialog {
3448
display: none;
@@ -42,7 +56,7 @@
4256

4357
/* Text field in toolbar */
4458
/*noinspection CssUnresolvedCustomProperty*/
45-
.mdc-toolbar .mdc-text-field__label {
59+
.mdc-toolbar .mdc-floating-label {
4660
color: var(--mdc-theme-text-primary-on-primary);
4761
}
4862

@@ -63,8 +77,8 @@
6377
}
6478

6579
.mdc-toolbar .mdc-text-field {
66-
margin-top: 0 !important;
67-
margin-bottom: 16px !important;
80+
height: 42px !important;
81+
margin: 0 !important;
6882
}
6983

7084
/* Chip in toolbar */
@@ -353,6 +367,6 @@ body {
353367
}
354368

355369
/*noinspection CssUnresolvedCustomProperty*/
356-
.mdc-toolbar .mdc-text-field .mdc-text-field__label {
370+
.mdc-toolbar .mdc-text-field .mdc-floating-label {
357371
color: var(--mdc-theme-text-secondary-on-dark) !important;
358372
}

‎WebContent/game.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta name="viewport" content="width=device-width, initial-scale=1.0">
55
<title class="_title">{{Game name}} - PYX Reloaded</title>
6-
<link rel="stylesheet" href="//unpkg.com/material-components-web@0.30.0/dist/material-components-web.min.css">
6+
<link rel="stylesheet" href="//unpkg.com/material-components-web@0.32.0/dist/material-components-web.min.css">
77
<link rel="stylesheet" href="//fonts.googleapis.com/icon?family=Material+Icons">
88
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:300,400,500">
99
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/noty/3.1.4/noty.min.css"/>
@@ -31,7 +31,7 @@ <h3 class="mdc-typography mdc-typography--title">Chat</h3>
3131
<div class="mdc-text-field mdc-text-field--outlined mdc-text-field--with-trailing-icon"
3232
data-mdc-auto-init="MDCTextField">
3333
<input type="text" id="chatMessage" class="mdc-text-field__input">
34-
<label for="chatMessage" class="mdc-text-field__label">Message</label>
34+
<label for="chatMessage" class="mdc-floating-label">Message</label>
3535
<i class="material-icons mdc-text-field__icon" tabindex="0">send</i>
3636
<div class="mdc-text-field__outline">
3737
<svg>
@@ -45,7 +45,7 @@ <h3 class="mdc-typography mdc-typography--title">Chat</h3>
4545
</aside>
4646

4747
<div class="page-content">
48-
<header class="mdc-toolbar mdc-toolbar--fixed mdc-elevation--z4">
48+
<header class="mdc-toolbar mdc-toolbar--fixed">
4949
<div class="mdc-toolbar__row">
5050
<section class="mdc-toolbar__section mdc-toolbar__section--align-start">
5151
<button class="material-icons mdc-toolbar__menu-icon">menu</button>
@@ -66,11 +66,11 @@ <h3 class="mdc-typography mdc-typography--title">Chat</h3>
6666
</section>
6767

6868
<section class="mdc-toolbar__section mdc-toolbar__section--align-end">
69-
<button class="material-icons align-icons mdc-toolbar__icon" style="display: none;" id="startGame">
69+
<button class="material-icons mdc-toolbar__icon" style="display: none;" id="startGame">
7070
done
7171
</button>
72-
<button class="material-icons align-icons mdc-toolbar__icon" id="gameOptions">settings</button>
73-
<button class="material-icons align-icons mdc-toolbar__icon" id="leaveGame">close</button>
72+
<button class="material-icons mdc-toolbar__icon" id="gameOptions">settings</button>
73+
<button class="material-icons mdc-toolbar__icon" id="leaveGame">close</button>
7474
</section>
7575
</div>
7676
</header>
@@ -122,7 +122,7 @@ <h1 class="message mdc-typography--headline">No suggested game options.</h1>
122122
</div>
123123
</section>
124124
<section class="mdc-toolbar__section mdc-toolbar__section--align-end">
125-
<button class="material-icons align-icons mdc-toolbar__icon _toggleHand">keyboard_arrow_up</button>
125+
<button class="material-icons mdc-toolbar__icon _toggleHand">keyboard_arrow_up</button>
126126
</section>
127127
</div>
128128
</div>
@@ -180,7 +180,7 @@ <h1 class="_decks mdc-typography--body1"></h1>
180180
</div>
181181

182182
<script src="//code.jquery.com/jquery-latest.min.js"></script>
183-
<script src="//unpkg.com/material-components-web@0.30.0/dist/material-components-web.min.js"></script>
183+
<script src="//unpkg.com/material-components-web@0.32.0/dist/material-components-web.min.js"></script>
184184
<script src="//cdnjs.cloudflare.com/ajax/libs/list.js/1.5.0/list.min.js"></script>
185185
<script src="//unpkg.com/masonry-layout@4/dist/masonry.pkgd.min.js"></script>
186186
<script src="//cdnjs.cloudflare.com/ajax/libs/noty/3.1.4/noty.min.js"></script>

‎WebContent/game_options/dialog.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ <h1 class="mdc-card__title mdc-typography--title">Access</h1>
9696
<section class="mdc-card__supporting-text">
9797
<div class="mdc-text-field mdc-text-field--box" style="width: 100%;">
9898
<input type="password" id="gamePassword" autocomplete="off" class="mdc-text-field__input">
99-
<label for="gamePassword" class="mdc-text-field__label">Password</label>
99+
<label for="gamePassword" class="mdc-floating-label">Password</label>
100100
<div class="mdc-line-ripple"></div>
101101
</div>
102102
</section>
@@ -136,7 +136,7 @@ <h4 class="mdc-typography--body2 mdc-typography--adjust-margin">Add deck</h4>
136136
<input maxlength="5" minlength="5" type="text" id="cardcastAddDeckCode"
137137
class="mdc-text-field__input"
138138
style="text-transform: uppercase">
139-
<label for="cardcastAddDeckCode" class="mdc-text-field__label">Deck code</label>
139+
<label for="cardcastAddDeckCode" class="mdc-floating-label">Deck code</label>
140140
<i class="material-icons mdc-text-field__icon" tabindex="0">add</i>
141141
<div class="mdc-line-ripple"></div>
142142
</div>

‎WebContent/game_options/dialog.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,18 @@ class MDCMultiSelect extends mdc.select.MDCSelect {
6767
const selected = this.selectedItems;
6868

6969
if (selected.length === 0) {
70-
this.label_.classList.remove("mdc-select__label--float-above");
70+
this.foundation_.adapter_.floatLabel(false);
7171
} else {
7272
this.selectedText_.textContent = selected.join(", ");
73-
this.label_.classList.add("mdc-select__label--float-above");
73+
this.foundation_.adapter_.floatLabel(true);
7474
}
7575

7676
this.listener();
7777
}
7878

7979
clear() {
8080
this.selectedText_.textContent = "";
81-
this.label_.classList.remove("mdc-select__label--float-above")
81+
this.foundation_.adapter_.floatLabel(false);
8282
}
8383
}
8484

@@ -280,10 +280,10 @@ class GameOptionsDialog {
280280

281281
// Access
282282
if (go.pw.length > 0) {
283-
this._password.next().addClass("mdc-text-field__label--float-above");
283+
this._password.next().addClass("mdc-floating-label--float-above");
284284
this._password.val(go.pw);
285285
} else {
286-
this._password.next().removeClass("mdc-text-field__label--float-above");
286+
this._password.next().removeClass("mdc-floating-label--float-above");
287287
this._password.val("");
288288
}
289289

@@ -325,7 +325,7 @@ class GameOptionsDialog {
325325

326326
// Access
327327
this._password.val("");
328-
this._password.next().removeClass("mdc-text-field__label--float-above");
328+
this._password.next().removeClass("mdc-floating-label--float-above");
329329

330330
// Cardcast
331331
this.cardcastDecks.clear();
@@ -407,7 +407,7 @@ class GameOptionsDialog {
407407
_resetAddCardcast() {
408408
this.cardcastAddDeckCode.valid = true;
409409
this._cardcastAddDeckCode.val("");
410-
this._cardcastAddDeckCode.next().removeClass("mdc-text-field__label--float-above");
410+
this._cardcastAddDeckCode.next().removeClass("mdc-floating-label--float-above");
411411

412412
this._cardcastAddDeckInfo_loading.hide();
413413
this._cardcastAddDeckInfo_details.hide();

‎WebContent/games/index.html‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
55
<title>Games - PYX-Reloaded</title>
6-
<link rel="stylesheet" href="//unpkg.com/material-components-web@0.30.0/dist/material-components-web.min.css">
6+
<link rel="stylesheet" href="//unpkg.com/material-components-web@0.32.0/dist/material-components-web.min.css">
77
<link rel="stylesheet" href="//fonts.googleapis.com/icon?family=Material+Icons">
88
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:300,400,500">
99
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/noty/3.1.4/noty.min.css"/>
@@ -17,7 +17,7 @@
1717

1818
<body class="mdc-typography">
1919
<div class="page-content">
20-
<header class="mdc-toolbar mdc-toolbar--fixed mdc-elevation--z4">
20+
<header class="mdc-toolbar mdc-toolbar--fixed">
2121
<div class="mdc-toolbar__row">
2222
<section class="mdc-toolbar__section mdc-toolbar__section--align-start">
2323
<button class="material-icons mdc-toolbar__menu-icon">menu</button>
@@ -28,16 +28,16 @@
2828
<div class="mdc-text-field mdc-text-field--dense" data-mdc-auto-init="MDCTextField"
2929
style="margin-left: 16px">
3030
<input type="text" id="gamesSearch" class="mdc-text-field__input search">
31-
<label class="mdc-text-field__label" for="gamesSearch">Search</label>
31+
<label class="mdc-floating-label" for="gamesSearch">Search</label>
3232
<i class="material-icons mdc-text-field__icon" tabindex="0">search</i>
3333
<div class="mdc-line-ripple"></div>
3434
</div>
3535
</section>
3636

3737
<section class="mdc-toolbar__section mdc-toolbar__section--align-end">
38-
<button class="material-icons align-icons mdc-toolbar__icon _refresh">refresh</button>
39-
<button class="material-icons align-icons mdc-toolbar__icon _themingDialog">format_paint</button>
40-
<button class="material-icons align-icons mdc-toolbar__icon _logout">exit_to_app</button>
38+
<button class="material-icons mdc-toolbar__icon _refresh">refresh</button>
39+
<button class="material-icons mdc-toolbar__icon _themingDialog">format_paint</button>
40+
<button class="material-icons mdc-toolbar__icon _logout">exit_to_app</button>
4141
</section>
4242
</div>
4343
</header>
@@ -71,6 +71,10 @@ <h2 class="mdc-typography--body1 details--email mdc-theme--text-secondary-on-pri
7171
</div>
7272
</header>
7373
<nav class="mdc-drawer__content mdc-list">
74+
<a class="mdc-list-item" href="/users/" target="_blank">
75+
<i class="material-icons mdc-list-item__start-detail">people</i>
76+
Users
77+
</a>
7478
<a class="mdc-list-item" href="/chat/" target="_blank">
7579
<i class="material-icons mdc-list-item__start-detail">message</i>
7680
Chat
@@ -121,7 +125,7 @@ <h2 class="mdc-dialog__header__title">Customize Appearance</h2>
121125
</div>
122126
<div id="themingExample" class="mdc-layout-grid__cell mdc-layout-grid__cell--span-6"
123127
style="display: flex; flex-flow: column">
124-
<header class="mdc-toolbar mdc-elevation--z4">
128+
<header class="mdc-toolbar">
125129
<div class="mdc-toolbar__row">
126130
<section class="mdc-toolbar__section mdc-toolbar__section--align-start">
127131
<button class="material-icons mdc-toolbar__menu-icon">menu</button>
@@ -208,7 +212,7 @@ <h1 class="mdc-card__title mdc-typography--body2">Try it out</h1>
208212

209213
<script src="//code.jquery.com/jquery-latest.min.js"></script>
210214
<script src="//cdnjs.cloudflare.com/ajax/libs/list.js/1.5.0/list.min.js"></script>
211-
<script src="//unpkg.com/material-components-web@0.30.0/dist/material-components-web.min.js"></script>
215+
<script src="//unpkg.com/material-components-web@0.32.0/dist/material-components-web.min.js"></script>
212216
<script src="//cdnjs.cloudflare.com/ajax/libs/noty/3.1.4/noty.min.js"></script>
213217
<script src="/js/cardcast.helper.js"></script>
214218
<script src="/js/communication.helper.js"></script>

0 commit comments

Comments
 (0)