From 11e0e478d13496eadd250da45d835b9569475b68 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Mon, 4 Nov 2013 21:24:28 -0600
Subject: [PATCH] List item updates

---
 dist/css/ionic-ios7.css                   | 28 +++++++++++----------
 dist/css/ionic-scoped.css                 | 30 ++++++++++++-----------
 dist/css/ionic.css                        | 30 ++++++++++++-----------
 dist/js/ionic-angular.js                  |  3 +++
 js/ext/angular/src/directive/ionicList.js |  3 +++
 js/ext/angular/test/list.html             | 15 ++++++------
 scss/ionic/_list.scss                     |  7 ++++--
 7 files changed, 65 insertions(+), 51 deletions(-)

diff --git a/dist/css/ionic-ios7.css b/dist/css/ionic-ios7.css
index 9e66b263df..b23f88008b 100644
--- a/dist/css/ionic-ios7.css
+++ b/dist/css/ionic-ios7.css
@@ -182,7 +182,7 @@ sub {
 fieldset {
   margin: 0 2px;
   padding: 0.35em 0.625em 0.75em;
-  border: 1px solid #c0c0c0; }
+  border: 1px solid silver; }
 
 /**
  * 1. Correct `color` not being inherited in IE 8/9.
@@ -1465,11 +1465,13 @@ button.item-button-right:after {
  * "edit mode"
  */
 .list-editing .item-content {
-  margin-right: 30px;
-  margin-left: 30px; }
+  margin-right: 50px;
+  margin-left: 50px; }
 .list-editing .item-edit {
   left: 0px;
   opacity: 1; }
+  .list-editing .item-edit i {
+    left: 5px; }
 
 .list-header {
   margin-top: 20px;
@@ -1721,7 +1723,7 @@ input[type="file"] {
   line-height: 34px; }
 
 select {
-  border: 1px solid #ccc;
+  border: 1px solid #cccccc;
   background-color: white; }
 
 select[multiple],
@@ -1793,7 +1795,7 @@ input[type="checkbox"][readonly] {
   right: 20px;
   transition: 0.2s ease;
   transition-property: left, right;
-  transition-delay: 0s, .05s; }
+  transition-delay: 0s, 0.05s; }
 
 .toggle :checked + .track {
   /* When the toggle is "on" */
@@ -1808,7 +1810,7 @@ input[type="checkbox"][readonly] {
     right: 0;
     left: 20px;
     -webkit-transform: none;
-    transition-delay: .05s, 0s; }
+    transition-delay: 0.05s, 0s; }
 
 .item-radio {
   padding: 0; }
@@ -2093,7 +2095,7 @@ input[type="range"] {
     .button.button-icon:active, .button.button-icon.active {
       background: none;
       box-shadow: none;
-      text-shadow: 0px 0px 10px #fff; }
+      text-shadow: 0px 0px 10px white; }
   .button.block, .button.button-full {
     margin-top: 10px;
     margin-bottom: 10px; }
@@ -2437,9 +2439,9 @@ a.button {
   line-height: 1;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -webkit-animation: spin .75s linear infinite;
-  -moz-animation: spin .75s linear infinite;
-  animation: spin .75s linear infinite; }
+  -webkit-animation: spin 0.75s linear infinite;
+  -moz-animation: spin 0.75s linear infinite;
+  animation: spin 0.75s linear infinite; }
   .ion-loading:before {
     content: "\e144"; }
 
@@ -2452,9 +2454,9 @@ a.button {
   line-height: 1;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -webkit-animation: spin .75s linear infinite;
-  -moz-animation: spin .75s linear infinite;
-  animation: spin .75s linear infinite; }
+  -webkit-animation: spin 0.75s linear infinite;
+  -moz-animation: spin 0.75s linear infinite;
+  animation: spin 0.75s linear infinite; }
   .ion-refreshing:before {
     content: "\e144"; }
 
diff --git a/dist/css/ionic-scoped.css b/dist/css/ionic-scoped.css
index 5c007de34d..9c8ea44d93 100644
--- a/dist/css/ionic-scoped.css
+++ b/dist/css/ionic-scoped.css
@@ -210,7 +210,7 @@
       transform: rotate(360deg); } }
  }
   .ionic .ion {
-    font-family: 'Ionicons' !important;
+    font-family: "Ionicons" !important;
     speak: none !important;
     font-style: normal !important;
     font-weight: normal !important;
@@ -1192,7 +1192,7 @@
   .ionic fieldset {
     margin: 0 2px;
     padding: 0.35em 0.625em 0.75em;
-    border: 1px solid #c0c0c0; }
+    border: 1px solid silver; }
   .ionic legend {
     padding: 0;
     /* 2 */
@@ -2311,11 +2311,13 @@
     padding-bottom: 1px;
     padding-left: 0; }
   .ionic .list-editing .item-content {
-    margin-right: 30px;
-    margin-left: 30px; }
+    margin-right: 50px;
+    margin-left: 50px; }
   .ionic .list-editing .item-edit {
     left: 0px;
     opacity: 1; }
+    .ionic .list-editing .item-edit i {
+      left: 5px; }
   .ionic .list-header {
     margin-top: 20px;
     padding: 5px 15px;
@@ -2538,7 +2540,7 @@
   .ionic input[type="file"] {
     line-height: 34px; }
   .ionic select {
-    border: 1px solid #ccc;
+    border: 1px solid #cccccc;
     background-color: white; }
   .ionic select[multiple],
   .ionic select[size] {
@@ -2587,7 +2589,7 @@
       border-radius: 50%;
       background: white;
       content: ' ';
-      transition: background-color .1s ease-in-out; }
+      transition: background-color 0.1s ease-in-out; }
   .ionic .checkbox input:after {
     position: absolute;
     top: 34%;
@@ -2600,7 +2602,7 @@
     border-right: 0;
     content: ' ';
     opacity: 0;
-    transition: opacity .05s ease-in-out;
+    transition: opacity 0.05s ease-in-out;
     -webkit-transform: rotate(-45deg);
     transform: rotate(-45deg); }
   .ionic .checkbox input:checked:before {
@@ -2952,7 +2954,7 @@
       .ionic .button.button-icon:active, .ionic .button.button-icon.active {
         background: none;
         box-shadow: none;
-        text-shadow: 0px 0px 10px #fff; }
+        text-shadow: 0px 0px 10px white; }
     .ionic .button.block, .ionic .button.button-full {
       margin-top: 10px;
       margin-bottom: 10px; }
@@ -3202,9 +3204,9 @@
     line-height: 1;
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
-    -webkit-animation: spin .75s linear infinite;
-    -moz-animation: spin .75s linear infinite;
-    animation: spin .75s linear infinite; }
+    -webkit-animation: spin 0.75s linear infinite;
+    -moz-animation: spin 0.75s linear infinite;
+    animation: spin 0.75s linear infinite; }
     .ionic .ion-loading:before {
       content: "\e144"; }
   .ionic .ion-refreshing {
@@ -3216,9 +3218,9 @@
     line-height: 1;
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
-    -webkit-animation: spin .75s linear infinite;
-    -moz-animation: spin .75s linear infinite;
-    animation: spin .75s linear infinite; }
+    -webkit-animation: spin 0.75s linear infinite;
+    -moz-animation: spin 0.75s linear infinite;
+    animation: spin 0.75s linear infinite; }
     .ionic .ion-refreshing:before {
       content: "\e144"; }
   .ionic .hidden,
diff --git a/dist/css/ionic.css b/dist/css/ionic.css
index d3ca1f4d45..40360946bd 100644
--- a/dist/css/ionic.css
+++ b/dist/css/ionic.css
@@ -7,7 +7,7 @@
   font-style: normal; }
 
 .ion {
-  font-family: 'Ionicons' !important;
+  font-family: "Ionicons" !important;
   speak: none !important;
   font-style: normal !important;
   font-weight: normal !important;
@@ -1521,7 +1521,7 @@ sub {
 fieldset {
   margin: 0 2px;
   padding: 0.35em 0.625em 0.75em;
-  border: 1px solid #c0c0c0; }
+  border: 1px solid silver; }
 
 /**
  * 1. Correct `color` not being inherited in IE 8/9.
@@ -2868,11 +2868,13 @@ button.item-button-right:after {
  * "edit mode"
  */
 .list-editing .item-content {
-  margin-right: 30px;
-  margin-left: 30px; }
+  margin-right: 50px;
+  margin-left: 50px; }
 .list-editing .item-edit {
   left: 0px;
   opacity: 1; }
+  .list-editing .item-edit i {
+    left: 5px; }
 
 .list-header {
   margin-top: 20px;
@@ -3124,7 +3126,7 @@ input[type="file"] {
   line-height: 34px; }
 
 select {
-  border: 1px solid #ccc;
+  border: 1px solid #cccccc;
   background-color: white; }
 
 select[multiple],
@@ -3179,7 +3181,7 @@ input[type="checkbox"][readonly] {
     border-radius: 50%;
     background: white;
     content: ' ';
-    transition: background-color .1s ease-in-out; }
+    transition: background-color 0.1s ease-in-out; }
 
 /* the checkmark within the box */
 .checkbox input:after {
@@ -3194,7 +3196,7 @@ input[type="checkbox"][readonly] {
   border-right: 0;
   content: ' ';
   opacity: 0;
-  transition: opacity .05s ease-in-out;
+  transition: opacity 0.05s ease-in-out;
   -webkit-transform: rotate(-45deg);
   transform: rotate(-45deg); }
 
@@ -3574,7 +3576,7 @@ input[type="range"] {
     .button.button-icon:active, .button.button-icon.active {
       background: none;
       box-shadow: none;
-      text-shadow: 0px 0px 10px #fff; }
+      text-shadow: 0px 0px 10px white; }
   .button.block, .button.button-full {
     margin-top: 10px;
     margin-bottom: 10px; }
@@ -4096,9 +4098,9 @@ a.button {
   line-height: 1;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -webkit-animation: spin .75s linear infinite;
-  -moz-animation: spin .75s linear infinite;
-  animation: spin .75s linear infinite; }
+  -webkit-animation: spin 0.75s linear infinite;
+  -moz-animation: spin 0.75s linear infinite;
+  animation: spin 0.75s linear infinite; }
   .ion-loading:before {
     content: "\e144"; }
 
@@ -4111,9 +4113,9 @@ a.button {
   line-height: 1;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  -webkit-animation: spin .75s linear infinite;
-  -moz-animation: spin .75s linear infinite;
-  animation: spin .75s linear infinite; }
+  -webkit-animation: spin 0.75s linear infinite;
+  -moz-animation: spin 0.75s linear infinite;
+  animation: spin 0.75s linear infinite; }
   .ion-refreshing:before {
     content: "\e144"; }
 
diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js
index cb57ce5804..cc4f8de823 100644
--- a/dist/js/ionic-angular.js
+++ b/dist/js/ionic-angular.js
@@ -411,6 +411,9 @@ angular.module('ionic.ui.list', ['ngAnimate'])
       buttons: '=',
     },
     template: '<a href="#" class="item item-slider">\
+            <div class="item-edit" ng-if="canDelete && isEditing">\
+              <button class="button button-icon" ng-click="onDelete()"><i ng-class="deleteIcon"></i></button>\
+            </div>\
             <div class="item-content slide-left" ng-transclude>\
             </div>\
             <div class="item-options" ng-if="canSwipe && !isEditing">\
diff --git a/js/ext/angular/src/directive/ionicList.js b/js/ext/angular/src/directive/ionicList.js
index d2c43438d8..0b5ebebfb8 100644
--- a/js/ext/angular/src/directive/ionicList.js
+++ b/js/ext/angular/src/directive/ionicList.js
@@ -19,6 +19,9 @@ angular.module('ionic.ui.list', ['ngAnimate'])
       buttons: '=',
     },
     template: '<a href="#" class="item item-slider">\
+            <div class="item-edit" ng-if="canDelete && isEditing">\
+              <button class="button button-icon" ng-click="onDelete()"><i ng-class="deleteIcon"></i></button>\
+            </div>\
             <div class="item-content slide-left" ng-transclude>\
             </div>\
             <div class="item-options" ng-if="canSwipe && !isEditing">\
diff --git a/js/ext/angular/test/list.html b/js/ext/angular/test/list.html
index 39af0decec..c0ebbb5432 100644
--- a/js/ext/angular/test/list.html
+++ b/js/ext/angular/test/list.html
@@ -63,17 +63,16 @@
   <body>
 
     <content ng-controller="TestCtrl" class="reveal-animation">
-      <list is-editing="isEditingItems" on-refresh-holding="almostRefreshing()" on-refresh-opening="almostRefreshProjects(ratio)" on-refresh="refreshProjects()" animation="my-repeat-animation" delete-icon="icon-minus-circled" reorder-icon="icon-navicon">
+      <list is-editing="isEditingItems" on-refresh-holding="almostRefreshing()" on-refresh-opening="almostRefreshProjects(ratio)" on-refresh="refreshProjects()" animation="my-repeat-animation" delete-icon="ion ion-minus-circled" reorder-icon="icon-navicon">
         <list-refresher>
-          <spinner ratio="refreshRatio.ratio"></spinner>
         </list-refresher>
         <list-item ng-repeat="item in items" 
-        buttons="item.buttons"
-        can-delete="true"
-        can-reorder="true"
-        can-swipe="true"
-                 on-delete="deleteProject(project)"
-                 on-select="selectProject(project)">
+            buttons="item.buttons"
+            can-delete="true"
+            can-reorder="true"
+            can-swipe="true"
+           on-delete="deleteProject(project)"
+           on-select="selectProject(project)">
           {{item.text}}
           <i class="{{item.icon}}"></i>
         </list-item>
diff --git a/scss/ionic/_list.scss b/scss/ionic/_list.scss
index 3d36afdde2..a3231692b7 100644
--- a/scss/ionic/_list.scss
+++ b/scss/ionic/_list.scss
@@ -17,12 +17,15 @@
  */
 .list-editing {
   .item-content {
-    margin-right: 30px;
-    margin-left: 30px;
+    margin-right: 50px;
+    margin-left: 50px;
   }
   .item-edit {
     left: 0px;
     opacity: 1;
+    i {
+      left: 5px;
+    }
   }
 }