Skip to content
This repository was archived by the owner on Aug 14, 2018. It is now read-only.

Commit 834219c

Browse files
Merge pull request #143 from GoogleDeveloperExperts/2-0-5-fixes
Patch 1 for v2.0.5
2 parents efd1f4c + f4945ef commit 834219c

File tree

7 files changed

+23
-24
lines changed

7 files changed

+23
-24
lines changed

app.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
application: expertstracking
2-
version: 2-0-1
2+
version: 2-0-5
33
runtime: python27
44
api_version: 1
55
threadsafe: yes

src/experts-activities/experts-activity-create.html

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -541,25 +541,19 @@ <h2>
541541
</iron-pages>
542542
</div>
543543
<footer>
544-
<template
545-
is = "dom-if"
546-
if = "{{!_lastStep}}">
547-
<paper-button
548-
id = "continue"
549-
on-tap = "next">
550-
Continue
551-
</paper-button>
552-
</template>
553-
<template
554-
is = "dom-if"
555-
if = "{{_lastStep}}">
556-
<paper-button
557-
id = "continue"
558-
on-tap = "finish"
559-
disabled = "{{!_stepDisabled}}">
560-
Finish
561-
</paper-button>
562-
</template>
544+
<paper-button
545+
id = "continue"
546+
on-tap = "next"
547+
hidden$ = "{{_lastStep}}">
548+
Continue
549+
</paper-button>
550+
<paper-button
551+
id = "continue"
552+
on-tap = "finish"
553+
hidden$ = "{{!_lastStep}}"
554+
disabled = "{{!_stepDisabled}}">
555+
Finish
556+
</paper-button>
563557
<div
564558
class = "progress">
565559
<div

src/experts-activities/experts-activity-edit.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434

3535
<link rel="import" href="experts-activity-detail-list.html">
3636
<link rel="import" href="experts-activity-detail-create.html">
37+
<link rel="import" href="../experts-icons.html">
38+
3739
<!--
3840
====================================
3941
Shady DOM

src/experts-activities/experts-activity-list.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,12 @@
9191
}
9292

9393
.th.col1 {
94-
width: 170px;
94+
width: 400px;
9595
}
96-
.th.col2, .th.col3,{
96+
.th.col2 {
97+
width: 75px;
98+
}
99+
.th.col3 {
97100
width: 100px;
98101
}
99102
.th.col4, .th.col5, .th.col6 {

src/experts-app.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,6 @@ <h1>Welcome!</h1>
398398
},
399399
user : {
400400
type : Object,
401-
observer: "_userChanged",
402401
value: null
403402
},
404403
_userSelected: {

src/experts-icons.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
<g id="add-circle"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm5 11h-4v4h-2v-4H7v-2h4V7h2v4h4v2z"/></g>
5353
<g id="error"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-2h2v2zm0-4h-2V7h2v6z"/></g>
5454
<g id="info"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-6h2v6zm0-8h-2V7h2v2z"/></g>
55+
<g id="create"><path d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z"/></g>
5556
</defs>
5657
</svg>
5758
</iron-iconset-svg>

src/experts-not-logged-in.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<link rel="import" href="../bower_components/polymer/polymer.html">
2222

2323
<link rel="import" href="../bower_components/paper-material/paper-material.html">
24-
<link rel="import" href="../../bower_components/paper-dialog-behavior/paper-dialog-behavior.html">
24+
<link rel="import" href="../bower_components/paper-dialog-behavior/paper-dialog-behavior.html">
2525

2626
<link rel="import" href="experts-signin.html">
2727

0 commit comments

Comments
 (0)