mirror of
https://github.com/moparisthebest/mail
synced 2024-11-26 19:02:20 -05:00
refactor files for transform transition for mobile
use prototypical inheritance by invoking parent functions in child scopes
This commit is contained in:
parent
281fc95ab8
commit
b20ab9790c
@ -65,6 +65,7 @@ define(function(require) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// development... display dummy mail objects
|
// development... display dummy mail objects
|
||||||
|
firstSelect = true;
|
||||||
updateStatus('Last update: ', new Date());
|
updateStatus('Last update: ', new Date());
|
||||||
$scope.$parent.emails = $scope.emails = createDummyMails();
|
$scope.$parent.emails = $scope.emails = createDummyMails();
|
||||||
$scope.select($scope.emails[0]);
|
$scope.select($scope.emails[0]);
|
||||||
@ -167,6 +168,11 @@ define(function(require) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$scope.openReadMode();
|
||||||
|
if (!window.chrome || !chrome.socket) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (!email.unread) {
|
if (!email.unread) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -50,6 +50,13 @@ define(function(require) {
|
|||||||
$scope.accountOpen = false;
|
$scope.accountOpen = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
$scope.openReadMode = function() {
|
||||||
|
$scope.readingMode = true;
|
||||||
|
};
|
||||||
|
$scope.closeReadMode = function() {
|
||||||
|
$scope.readingMode = false;
|
||||||
|
};
|
||||||
|
|
||||||
$scope.remove = function(email) {
|
$scope.remove = function(email) {
|
||||||
if (!email) {
|
if (!email) {
|
||||||
return;
|
return;
|
||||||
|
@ -114,10 +114,9 @@ define(function(require) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var ps = $scope.$parent.$parent;
|
$scope.closeWriter();
|
||||||
ps.closeWriter();
|
$scope.$apply();
|
||||||
ps.$apply();
|
$scope.emptyOutbox();
|
||||||
ps.emptyOutbox();
|
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -2,7 +2,10 @@
|
|||||||
// -------------------------
|
// -------------------------
|
||||||
|
|
||||||
@mixin respond-to($media) {
|
@mixin respond-to($media) {
|
||||||
@if $media == desktop {
|
@if $media == mobile {
|
||||||
|
@media only screen and (max-width: $respond-size-desktop - 1) { @content; }
|
||||||
|
}
|
||||||
|
@else if $media == desktop {
|
||||||
@media only screen and (min-width: $respond-size-desktop) { @content; }
|
@media only screen and (min-width: $respond-size-desktop) { @content; }
|
||||||
}
|
}
|
||||||
@else if $media == retina {
|
@else if $media == retina {
|
||||||
|
@ -46,4 +46,9 @@ textarea {
|
|||||||
::-webkit-scrollbar {
|
::-webkit-scrollbar {
|
||||||
width: 0px;
|
width: 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// remove flickering on item touch selection in ios
|
||||||
|
* {
|
||||||
|
-webkit-tap-highlight-color: transparent !important;
|
||||||
|
}
|
||||||
}
|
}
|
@ -2,9 +2,35 @@
|
|||||||
@include clearfix();
|
@include clearfix();
|
||||||
height: 100%;
|
height: 100%;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|
||||||
|
// double in modile to allow slide transition
|
||||||
|
@include respond-to(mobile) {
|
||||||
|
width: 200%; // this currently causes a smear effect bug on mail-list header in safari
|
||||||
|
transition: transform $time-nav-animation ease-in-out;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.column {
|
.column {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|
||||||
|
// half of main-content in mobile mode to allow slide transition
|
||||||
|
@include respond-to(mobile) {
|
||||||
|
width: 50%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.column-left {
|
||||||
|
float: left;
|
||||||
|
|
||||||
|
@include respond-to(desktop) {
|
||||||
|
width: $content-nav-width;
|
||||||
|
border-right: 1px solid $color-grey-light;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.shift-right {
|
||||||
|
@include respond-to(mobile) {
|
||||||
|
transform: translateX(-50%);
|
||||||
|
}
|
||||||
}
|
}
|
@ -49,13 +49,6 @@
|
|||||||
border-right: 1px solid $color-grey-light;
|
border-right: 1px solid $color-grey-light;
|
||||||
}
|
}
|
||||||
|
|
||||||
.nav-menu-open .nav-pusher::after {
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
opacity: 1;
|
|
||||||
transition: opacity $time-nav-animation;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav-effect.nav-menu-open .nav-pusher {
|
.nav-effect.nav-menu-open .nav-pusher {
|
||||||
transform: translate3d($nav-max-width, 0, 0);
|
transform: translate3d($nav-max-width, 0, 0);
|
||||||
}
|
}
|
||||||
@ -65,7 +58,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.nav-effect.nav-menu {
|
.nav-effect.nav-menu {
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
transform: translate3d(-50%, 0, 0);
|
transform: translate3d(-50%, 0, 0);
|
||||||
|
@ -1,22 +1,11 @@
|
|||||||
.view-mail-list {
|
.view-mail-list {
|
||||||
$padding-horizontal: 15px;
|
$padding-horizontal: 15px;
|
||||||
$padding-vertical: 10px;
|
$padding-vertical: 10px;
|
||||||
|
height: 100%;
|
||||||
|
|
||||||
background: $color-grey-lightest;
|
background: $color-grey-lightest;
|
||||||
background-image: linear-gradient(to right ,$color-grey-lightest 98%, darken($color-grey-lightest, 1%) 100%);
|
background-image: linear-gradient(to right ,$color-grey-lightest 98%, darken($color-grey-lightest, 1%) 100%);
|
||||||
|
|
||||||
// remove flickering on item touch selection in ios
|
|
||||||
* {
|
|
||||||
-webkit-tap-highlight-color: transparent !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
width: 100%;
|
|
||||||
@include respond-to(desktop) {
|
|
||||||
float: left;
|
|
||||||
width: $content-nav-width;
|
|
||||||
border-right: 1px solid $color-grey-light;
|
|
||||||
}
|
|
||||||
|
|
||||||
header {
|
header {
|
||||||
|
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
@ -5,10 +5,10 @@
|
|||||||
|
|
||||||
<!-- content wrapper pushed right -->
|
<!-- content wrapper pushed right -->
|
||||||
<div class="nav-pusher" ng-click="closeNav()">
|
<div class="nav-pusher" ng-click="closeNav()">
|
||||||
<section class="content main-content">
|
<section class="content main-content" ng-class="{'shift-right': readingMode}">
|
||||||
|
|
||||||
<!-- left column: containing list view and navigation header -->
|
<!-- left column: containing list view and navigation header -->
|
||||||
<div class="column view-mail-list" ng-include="'tpl/mail-list.html'" ng-controller="MailListCtrl"></div>
|
<div class="column column-left" ng-include="'tpl/mail-list.html'" ng-controller="MailListCtrl"></div>
|
||||||
|
|
||||||
<!-- right column: containing list read view -->
|
<!-- right column: containing list read view -->
|
||||||
<div class="column" ng-include="'tpl/read.html'" ng-controller="ReadCtrl"></div>
|
<div class="column" ng-include="'tpl/read.html'" ng-controller="ReadCtrl"></div>
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
<div class="view-mail-list">
|
||||||
<!-- nav controll and section headline -->
|
<!-- nav controll and section headline -->
|
||||||
<header data-icon="" ng-click="openNav(); $event.stopPropagation()">
|
<header data-icon="" ng-click="openNav(); $event.stopPropagation()">
|
||||||
<h2>{{currentFolder.type}}</h2>
|
<h2>{{currentFolder.type}}</h2>
|
||||||
@ -19,3 +20,4 @@
|
|||||||
<footer ng-click="synchronize()">
|
<footer ng-click="synchronize()">
|
||||||
{{lastUpdateLbl}} {{lastUpdate | date:'shortTime'}}
|
{{lastUpdateLbl}} {{lastUpdate | date:'shortTime'}}
|
||||||
</footer>
|
</footer>
|
||||||
|
</div><!--/.view-mail-list-->
|
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<div class="view-read">
|
<div class="view-read">
|
||||||
<div class="headers">
|
<div class="headers">
|
||||||
<p class="subject">{{selected.subject || 'No subject'}}</p>
|
<p class="subject" ng-click="closeReadMode()">{{selected.subject || 'No subject'}}</p>
|
||||||
<p class="date">{{selected.sentDate | date:'EEEE, MMM d, yyyy h:mm a'}}</p>
|
<p class="date">{{selected.sentDate | date:'EEEE, MMM d, yyyy h:mm a'}}</p>
|
||||||
<p class="address">From: <span class="label">{{selected.from[0].name || selected.from[0].address}}</span></p>
|
<p class="address">From: <span class="label">{{selected.from[0].name || selected.from[0].address}}</span></p>
|
||||||
<p class="address">To: <span class="label" ng-repeat="t in selected.to">{{t.address}} </span></p>
|
<p class="address">To: <span class="label" ng-repeat="t in selected.to">{{t.address}} </span></p>
|
||||||
|
Loading…
Reference in New Issue
Block a user