Move the buttons to create new pockets to the header for the section.

darkwallet · Oct 15, 2014 · 8fc0743 · 8fc0743
1 parent 9bdfe33
commit 8fc0743
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/css/app.css b/css/app.css
@@ -3841,6 +3841,12 @@ ul.off-canvas-list {
     color: rgba(255, 255, 255, 0.7);
     border-bottom: 1px solid #262626;
     transition: background 300ms ease; }
+    ul.off-canvas-list li.active a {
+      color: rgba(30, 170, 80,0.9); }
+    ul.off-canvas-list li a.cornerbutton {
+      color: rgba(30, 170, 80,0.9);
+      padding: 0.0rem 0.3rem;
+      border-bottom: none; }
     ul.off-canvas-list li a:hover {
       background: #838383; }
 

diff --git a/html/wallet/pockets.html b/html/wallet/pockets.html
@@ -4,18 +4,14 @@
 			<a class="fa fa-arrow-left" ng-click="titleClick()"></a>
 		</li>
       	<li ng-class="{active: pocket.isAll}" ng-click="selectPocket()"><a>All</a></li>
-      	<li><label>my pockets</label></li>
+      	<li><label>my pockets <a ng-hide="selectedPocket==='newPocket'" class="cornerbutton right" ng-click="newPocket()"> + </a></label></li>
       	<li ng-show="hdPocket" ng-class="{active: 'hd:'+$index===pocket.type+':'+pocket.lastIndex}" ng-repeat="hdPocket in hdPockets track by $index">
         <a href="" ng-click="selectPocket(hdPocket.name, $index, form)" editable-text="forms.pocketName" e-form="form" blur="submit" onaftersave="finalizeRenamePocket(pocket, forms.pocketName)" buttons="no">{{hdPocket.name}}</a>
       </li>
-      <li ng-hide="selectedPocket==='newPocket'">
-        <a class="button expand nomarginbottom" ng-click="newPocket()">New Pocket</a>
-      </li>
       <li class="divider"></li>
-      <li><label>multisig funds</label></li>
+      <li><label>multisig funds <a class="cornerbutton right" ng-click="newMultiSig()"> + </a></label></li>
       <li ng-class="{active: 'multisig:'+$index===selectedPocket}" ng-click="selectFund(fund, $index)" ng-repeat="fund in allFunds track by $index"><a href="">{{fund.name}}</a></li>
       <li>
-      <a class="button expand nomarginbottom" ng-click="newMultiSig()">New Multisig fund</a>
       </li>
       <li ng-show="forms.readOnlyArray.length"><label>Watch-only pockets</label></li>
       <li ng-class="{active: 'readonly:'+$index===selectedPocket}" ng-repeat="readOnlyPocket in forms.readOnlyArray track by $index"><a ng-click="selectReadOnly(readOnlyPocket, $index)"href="">{{readOnlyPocket.name}}</a></li>

diff --git a/sass/app.scss b/sass/app.scss
@@ -283,7 +283,15 @@ li.colorhead h6 { color: white; margin: 0; }
 	 /* ----------------------- */
 ul.off-canvas-list {
 	li a:hover {  }
-	 li.active, li.active a:hover { font-weight: $font-weight-normal; background: $body-bg; }
+	li a.cornerbutton {
+		color: $primary-color-dark;
+		padding: 0.0rem 0.3rem;
+		border-bottom: none;
+	}
+	li.active a {
+		color: $primary-color-dark;
+	}
+	li.active, li.active a:hover { font-weight: $font-weight-normal; background: $body-bg; }
  }
 
 .fiat:not(:empty) {