BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2366 from cmgustavo/bug/improve-response-01 

Ack!
This commit is contained in:
Matias Pando 2015-02-02 17:17:31 -03:00
parent 846118fe85 b2f6aea281
commit 1b2605463a
5 changed files with 46 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
css/src/mobile.css
View File

@ -280,7 +280,7 @@
border-left: none; border-left: none;
} }
.right-small a { .right-small a, .left-small a {
color: white; color: white;
} }
@ -352,14 +352,14 @@
padding: 0; padding: 0;
} }
a, button, .button, input, textarea, select { a, button, .button, input, textarea, select, .reveal-modal {
-webkit-box-shadow: none !important; -webkit-box-shadow: none !important;
-moz-box-shadow: none !important; -moz-box-shadow: none !important;
box-shadow: none !important; box-shadow: none !important;
-webkit-tap-highlight-color:rgba(0,0,0,0); -webkit-tap-highlight-color:rgba(0,0,0,0);
} }
.modal.fade, .reveal-modal-bg { .modal.fade {
opacity: 1; opacity: 1;
} }
@ -373,6 +373,19 @@
.button.secondary:hover, button.secondary:hover { .button.secondary:hover, button.secondary:hover {
background: #008CC1; background: #008CC1;
color: #fff; color: #fff;
}
.move-right .close-menu {
cursor: pointer;
box-shadow: none;
display: block;
position: absolute;
background: rgba(255,255,255,.2);
top: 0;
bottom: 0;
left: 0;
right: 0;
z-index: 1002;
} }
/*******************************************/ /*******************************************/
@ -426,6 +439,20 @@
margin-top: 10px; margin-top: 10px;
} }
.reveal-modal {
border: none;
}
.reveal-modal-bg {
position: absolute;
height: 0;
width: 0;
background: none;
display: none;
top: 0;
left: 0;
}
/* notifications */ /* notifications */
.dr-notification { .dr-notification {

9
index.html
View File

@ -30,8 +30,8 @@
<body <body
ng-controller="IndexController" ng-controller="IndexController"
ng-swipe-disable-mouse ng-swipe-disable-mouse
ng-swipe-left="swipe()" ng-swipe-left="closeMenu()"
ng-swipe-right="swipe(true)"> ng-swipe-right="openMenu()">
<div id="loading" class="loadingpage"> <div id="loading" class="loadingpage">
<img src="img/ajax-loader.gif" alt="Loading..."> <img src="img/ajax-loader.gif" alt="Loading...">
@ -85,7 +85,8 @@
<div ng-controller="SidebarController" ng-show="$root.iden && !$root.hideNavigation && !$root.wpInputFocused"> <div ng-controller="SidebarController" ng-show="$root.iden && !$root.hideNavigation && !$root.wpInputFocused">
<nav class="tab-bar"> <nav class="tab-bar">
<section class="left-small"> <section class="left-small">
<a class="left-off-canvas-toggle menu-icon" ><span></span></a> <a class="p10"
ng-click="openMenu()"><i class="fi-list size-24"></i></a>
</section> </section>
<section class="right-small" <section class="right-small"
@ -129,7 +130,7 @@
ng-class="{'main':$root.iden && !$root.starting && !$root.hideNavigation && !$root.wpInputFocused}" ng-class="{'main':$root.iden && !$root.starting && !$root.hideNavigation && !$root.wpInputFocused}"
ng-view></section> ng-view></section>
<a class="exit-off-canvas"></a> <a class="close-menu" ng-click="closeMenu()"></a>
</div> </div>
</div> </div>

8
js/controllers/index.js
View File

@ -23,8 +23,12 @@ angular.module('copayApp.controllers').controller('IndexController', function($s
}); });
}; };
$scope.swipe = function(invert) { $scope.openMenu = function() {
go.swipe(invert); go.swipe(true);
};
$scope.closeMenu = function() {
go.swipe();
}; };
}); });

4
js/controllers/sidebar.js
View File

@ -117,4 +117,8 @@ angular.module('copayApp.controllers').controller('SidebarController', function(
}); });
$scope.wallets = _.sortBy(ret, 'name'); $scope.wallets = _.sortBy(ret, 'name');
}; };
$scope.openMenu = function() {
go.swipe(true);
};
}); });

2
views/settings.html
View File

@ -67,7 +67,7 @@
<select class="form-control" ng-model="selectedLogLevel" ng-options="o.name for o in availableLogLevels" required> <select class="form-control" ng-model="selectedLogLevel" ng-options="o.name for o in availableLogLevels" required>
</select> </select>
<div translate class="small text-gray"> <div translate class="small text-gray">
Log level shows information on the console. This is useful to find bugs and to help users. 'debug' is the most verbose level while 'fatal' only shows unexpected errors</a> Log level shows information on the console. This is useful to find bugs and to help users. 'debug' is the most verbose level while 'fatal' only shows unexpected errors
</div> </div>
</fieldset> </fieldset>
<button translate type="submit" class="button primary radius expand m0" ng-disabled="settingsForm.$invalid || loading" ng-click="save()"> <button translate type="submit" class="button primary radius expand m0" ng-disabled="settingsForm.$invalid || loading" ng-click="save()">