Merge pull request #143 from GoogleDeveloperExperts/2-0-5-fixes

Patch 1 for v2.0.5
GoogleDeveloperExperts · Oct 26, 2016 · 834219c · 834219c
2 parents efd1f4c + f4945ef
commit 834219c
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 24 deletions.
diff --git a/app.yaml b/app.yaml
@@ -1,5 +1,5 @@
 application: expertstracking
-version: 2-0-1
+version: 2-0-5
 runtime: python27
 api_version: 1
 threadsafe: yes

diff --git a/src/experts-activities/experts-activity-create.html b/src/experts-activities/experts-activity-create.html
@@ -541,25 +541,19 @@ <h2>
       </iron-pages>  
     </div>
     <footer>
-      <template 
-          is  = "dom-if"
-          if  = "{{!_lastStep}}">
-        <paper-button 
-            id        = "continue" 
-            on-tap    = "next">
-          Continue
-        </paper-button>
-      </template>
-      <template 
-          is  = "dom-if"
-          if  = "{{_lastStep}}">        
-        <paper-button 
-            id        = "continue" 
-            on-tap    = "finish"
-            disabled  = "{{!_stepDisabled}}">
-          Finish
-        </paper-button>
-      </template>
+      <paper-button 
+          id        = "continue" 
+          on-tap    = "next"
+          hidden$   = "{{_lastStep}}">
+        Continue
+      </paper-button>
+      <paper-button 
+          id        = "continue" 
+          on-tap    = "finish"
+          hidden$   = "{{!_lastStep}}"
+          disabled  = "{{!_stepDisabled}}">
+        Finish
+      </paper-button>
       <div
           class = "progress">
         <div 

diff --git a/src/experts-activities/experts-activity-edit.html b/src/experts-activities/experts-activity-edit.html
@@ -34,6 +34,8 @@
 
 <link rel="import" href="experts-activity-detail-list.html">
 <link rel="import" href="experts-activity-detail-create.html">
+<link rel="import" href="../experts-icons.html">
+
 <!--
     ====================================
                   Shady DOM

diff --git a/src/experts-activities/experts-activity-list.html b/src/experts-activities/experts-activity-list.html
@@ -91,9 +91,12 @@
       }
 
       .th.col1  {
-        width: 170px;
+        width: 400px;
       }
-      .th.col2, .th.col3,{
+      .th.col2 {
+        width: 75px;
+      }
+      .th.col3 {
         width: 100px;
       }
       .th.col4, .th.col5, .th.col6 {

diff --git a/src/experts-app.html b/src/experts-app.html
@@ -398,7 +398,6 @@ <h1>Welcome!</h1>
         },
         user : {
           type : Object,
-          observer: "_userChanged",
           value: null
         },
         _userSelected: {

diff --git a/src/experts-icons.html b/src/experts-icons.html
@@ -52,6 +52,7 @@
       <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>
       <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>
       <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>
+      <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>
     </defs>
   </svg>
 </iron-iconset-svg>
diff --git a/src/experts-not-logged-in.html b/src/experts-not-logged-in.html
@@ -21,7 +21,7 @@
 <link rel="import" href="../bower_components/polymer/polymer.html">
 
 <link rel="import" href="../bower_components/paper-material/paper-material.html">
-<link rel="import" href="../../bower_components/paper-dialog-behavior/paper-dialog-behavior.html">
+<link rel="import" href="../bower_components/paper-dialog-behavior/paper-dialog-behavior.html">
 
 <link rel="import" href="experts-signin.html">